rpms/kernel/devel linux-2.6.9-xen-compile.patch,1.32,1.33

[fedora-cvs-commits at redhat.com]

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

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


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/kernel/Makefile                        |    2 
 linux-2.6.11/arch/xen/i386/kernel/i386_ksyms.c                    |    5 
 linux-2.6.11/arch/xen/i386/kernel/putuser.S                       |   87 ++++++++++
 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/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                   |   19 +-
 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 
 19 files changed, 168 insertions(+), 23 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- linux-2.6.9-xen-compile.patch	1 Apr 2005 03:42:47 -0000	1.32
+++ linux-2.6.9-xen-compile.patch	6 Apr 2005 21:48:06 -0000	1.33
@@ -97,8 +97,7 @@
  }
 +#endif
  
--static int mmap_mem(struct file * file, struct vm_area_struct * vma)
-+static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
+ static int mmap_mem(struct file * file, struct vm_area_struct * vma)
  {
  #ifdef pgprot_noncached
  	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;