rpms/kernel/devel linux-2.6.9-xen-compile.patch,1.28,1.29

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	linux-2.6.9-xen-compile.patch 
Log Message:
some more page table handling, and a minor pci fixup

linux-2.6.9-xen-compile.patch:
 linux-2.6.10/arch/xen/i386/pci/irq.c                              |    1 
 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/pci/irq.c                              |    4 -
 linux-2.6.11/drivers/char/mem.c                                   |    4 +
 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                   |   22 +++++++---
 linux-2.6.11/mm/memory.c                                          |    4 -
 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/include/asm-i386/irq.h                                |    4 +
 linux-2.6.9/kernel/profile.c                                      |    1 
 15 files changed, 43 insertions(+), 14 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- linux-2.6.9-xen-compile.patch	29 Mar 2005 19:29:10 -0000	1.28
+++ linux-2.6.9-xen-compile.patch	30 Mar 2005 16:48:14 -0000	1.29
@@ -125,6 +125,48 @@
  #ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
 --- linux-2.6.11/include/asm-xen/asm-i386/pgtable.h.xen	2005-03-22 13:02:50.000000000 -0500
 +++ linux-2.6.11/include/asm-xen/asm-i386/pgtable.h	2005-03-22 13:05:30.000000000 -0500
+@@ -208,7 +208,8 @@ extern unsigned long long __PAGE_KERNEL,
+ extern unsigned long pg0[];
+ 
+ #define pte_present(x)	((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))
+-#define pte_clear(xp)	do { set_pte(xp, __pte(0)); } while (0)
++#define set_pte_at(mm,addr,xp,entry)  set_pte(xp,entry)
++#define pte_clear(mm,addr,xp)	do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
+ 
+ #define pmd_none(x)	(!pmd_val(x))
+ /* pmd_present doesn't just test the _PAGE_PRESENT bit since wr.p.t.
+@@ -252,7 +252,7 @@ static inline pte_t pte_mkwrite(pte_t pt
+ # include <asm/pgtable-2level.h>
+ #endif
+ 
+-static inline int ptep_test_and_clear_dirty(pte_t *ptep)
++static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
+ {
+ 	pte_t pte = *ptep;
+ 	int ret = pte_dirty(pte);
+@@ -261,7 +261,7 @@ static inline int ptep_test_and_clear_di
+ 	return ret;
+ }
+ 
+-static inline int ptep_test_and_clear_young(pte_t *ptep)
++static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
+ {
+ 	pte_t pte = *ptep;
+ 	int ret = pte_young(pte);
+@@ -270,11 +270,11 @@ static inline int ptep_test_and_clear_yo
+ 	return ret;
+ }
+ 
+-static inline void ptep_set_wrprotect(pte_t *ptep)
++static inline void ptep_set_wrprotect(struct mm_struct * mm, unsigned long addr, pte_t *ptep)
+ {
+ 	pte_t pte = *ptep;
+ 	if (pte_write(pte))
+-		set_pte(ptep, pte_wrprotect(pte));
++		xen_l1_entry_update(ptep, pte_wrprotect(pte).pte_low);
+ }
+ static inline void ptep_mkdirty(pte_t *ptep)
+ {
 @@ -448,6 +448,17 @@ do {				  					\
  	}								\
  } while (0)
@@ -185,3 +227,19 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
+--- linux-2.6.11/arch/xen/i386/pci/irq.c.rc1	2005-03-30 10:39:38.000000000 -0500
++++ linux-2.6.11/arch/xen/i386/pci/irq.c	2005-03-30 10:45:12.000000000 -0500
+@@ -115,11 +115,11 @@ static int pirq_enable_irq(struct pci_de
+ 	if (pin != 0) {
+ 		if (dev->irq != 0)
+ 			printk(KERN_INFO "PCI: Obtained IRQ %d for device %s\n",
+-			    dev->irq, dev->slot_name);
++			    dev->irq, pci_name(dev));
+ 		else
+ 			printk(KERN_WARNING "PCI: No IRQ known for interrupt "
+ 			    "pin %c of device %s.\n", 'A' + pin - 1,
+-			    dev->slot_name);
++			    pci_name(dev));
+ 	}
+ 
+ 	return 0;