[kernel] r11846 - dists/trunk/linux-2.6/debian/patches/features/all/xen

[Ian Campbell]

Author: ijc-guest
Date: Wed Jul 16 11:10:14 2008
New Revision: 11846

Log:
Fix s390 build by adding upstream commit 9789db08c020193ae18826c3aa48bd24296f7848


Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/xen/tip-x86.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/all/xen/tip-x86.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/xen/tip-x86.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/xen/tip-x86.patch	Wed Jul 16 11:10:14 2008
@@ -933,6 +933,22 @@
     Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
     Signed-off-by: Ingo Molnar <mingo at elte.hu>
     Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
+
+commit 9789db08c020193ae18826c3aa48bd24296f7848
+Author: Heiko Carstens <heiko.carstens at de.ibm.com>
+Date:   Mon Jul 14 09:59:11 2008 +0200
+
+    [S390] Add sched.h include to asm-s390/pgtable.h.
+    
+    Some macros in pgtable.h access members from struct task_struct.
+    Currently always works since sched.h seems always to be included
+    before asm/pgtable.h. Unfortunately that is not anymore true with
+    Jeremy Fitzhardinge's ptep_modify_prot transaction abstraction patch.
+    So fix this.
+    
+    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
+    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
+
 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
 index 74f0c5e..f1ab0f7 100644
 --- a/arch/x86/kernel/paravirt.c
@@ -3840,3 +3856,15 @@
  #ifdef CONFIG_MIGRATION
  		} else if (!pte_file(oldpte)) {
  			swp_entry_t entry = pte_to_swp_entry(oldpte);
+diff --git a/include/asm-s390/pgtable.h b/include/asm-s390/pgtable.h
+index bd0ea19..0bdb704 100644
+--- a/include/asm-s390/pgtable.h
++++ b/include/asm-s390/pgtable.h
+@@ -29,6 +29,7 @@
+  * the S390 page table tree.
+  */
+ #ifndef __ASSEMBLY__
++#include <linux/sched.h>
+ #include <linux/mm_types.h>
+ #include <asm/bitops.h>
+ #include <asm/bug.h>