rpms/kernel/devel linux-2.6.9-xen-compile.patch,1.45,1.46

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10521

Modified Files:
	linux-2.6.9-xen-compile.patch 
Log Message:
fix xen


linux-2.6.9-xen-compile.patch:
 linux-2.6.10/arch/xen/i386/pci/irq.c                              |    1 
 linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c             |    3 
 linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/hypervisor.c           |    3 
 linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h |    2 
 linux-2.6.11/arch/xen/Kconfig                                     |    2 
 linux-2.6.11/arch/xen/i386/kernel/Makefile                        |   29 ++-
 linux-2.6.11/arch/xen/i386/kernel/i386_ksyms.c                    |    9 -
 linux-2.6.11/arch/xen/i386/kernel/irq.c                           |    5 
 linux-2.6.11/arch/xen/i386/kernel/process.c                       |    9 -
 linux-2.6.11/arch/xen/i386/kernel/putuser.S                       |   87 ++++++++++
 linux-2.6.11/arch/xen/i386/kernel/smpboot.c                       |    2 
 linux-2.6.11/arch/xen/i386/kernel/time.c                          |   45 ++++-
 linux-2.6.11/arch/xen/i386/pci/irq.c                              |    4 
 linux-2.6.11/arch/xen/kernel/fixup.c                              |    3 
 linux-2.6.11/drivers/char/mem.c                                   |    2 
 linux-2.6.11/drivers/char/tty_io.c                                |    2 
 linux-2.6.11/include/asm-generic/pgtable.h                        |    1 
 linux-2.6.11/include/asm-xen/asm-i386/pgtable.h                   |   21 +-
 linux-2.6.11/include/asm-xen/asm-i386/processor.h                 |   21 ++
 linux-2.6.11/mm/memory.c                                          |    4 
 linux-2.6.12/arch/xen/i386/kernel/setup.c                         |    2 
 linux-2.6.12/include/asm-xen/asm-i386/page.h                      |    1 
 linux-2.6.12/include/asm-xen/asm-i386/pgtable.h                   |    2 
 linux-2.6.8/arch/xen/i386/kernel/time.c                           |    2 
 linux-2.6.9/Makefile                                              |    2 
 linux-2.6.9/arch/xen/Makefile                                     |    3 
 linux-2.6.9/arch/xen/boot/Makefile                                |    3 
 linux-2.6.9/kernel/profile.c                                      |    1 
 28 files changed, 220 insertions(+), 51 deletions(-)

Index: linux-2.6.9-xen-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-xen-compile.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- linux-2.6.9-xen-compile.patch	21 Jun 2005 21:03:04 -0000	1.45
+++ linux-2.6.9-xen-compile.patch	22 Jun 2005 22:22:16 -0000	1.46
@@ -685,3 +685,33 @@
  
  #ifdef CONFIG_X86_LOCAL_APIC
  	if (smp_found_config)
+--- linux-2.6.12/include/asm-xen/asm-i386/pgtable.h~	2005-06-22 18:19:13.000000000 -0400
++++ linux-2.6.12/include/asm-xen/asm-i386/pgtable.h	2005-06-22 18:19:32.000000000 -0400
+@@ -243,6 +243,7 @@ static inline pte_t pte_mkexec(pte_t pte
+ static inline pte_t pte_mkdirty(pte_t pte)	{ (pte).pte_low |= _PAGE_DIRTY; return pte; }
+ static inline pte_t pte_mkyoung(pte_t pte)	{ (pte).pte_low |= _PAGE_ACCESSED; return pte; }
+ static inline pte_t pte_mkwrite(pte_t pte)	{ (pte).pte_low |= _PAGE_RW; return pte; }
++static inline pte_t pte_mkhuge(pte_t pte)	{ (pte).pte_low |= _PAGE_PRESENT | _PAGE_PSE; return pte; }
+ 
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level.h>
+--- linux-2.6.12/include/asm-xen/asm-i386/pgtable.h~	2005-06-22 18:19:41.000000000 -0400
++++ linux-2.6.12/include/asm-xen/asm-i386/pgtable.h	2005-06-22 18:20:01.000000000 -0400
+@@ -290,7 +290,6 @@ static inline void ptep_mkdirty(pte_t *p
+  */
+ 
+ #define mk_pte(page, pgprot)	pfn_pte(page_to_pfn(page), (pgprot))
+-#define mk_pte_huge(entry) ((entry).pte_low |= _PAGE_PRESENT | _PAGE_PSE)
+ 
+ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+ {
+--- linux-2.6.12/include/asm-xen/asm-i386/page.h~	2005-06-22 18:20:11.000000000 -0400
++++ linux-2.6.12/include/asm-xen/asm-i386/page.h	2005-06-22 18:20:21.000000000 -0400
+@@ -105,6 +105,7 @@ typedef struct { unsigned long pgprot; }
+ #define HPAGE_MASK	(~(HPAGE_SIZE - 1))
+ #define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)
+ #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
++#define ARCH_HAS_HUGETLB_CLEAN_STALE_PGTABLE
+ #endif
+ 
+