rpms/kernel/devel linux-2.6-xen-compile-fixes.patch, 1.1.12.4, 1.1.12.5

[fedora-cvs-commits redhat com]

Author: quintela

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

Modified Files:
      Tag: private-xen-rebased-1971-branch
	linux-2.6-xen-compile-fixes.patch 
Log Message:
fix the topology fix

linux-2.6-xen-compile-fixes.patch:
 linux-2.6.15.i686/arch/i386/mach-xen/Makefile                |    4 ---
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.new/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 --
 linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c            |    3 --
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h         |    7 +++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/acpi.h                   |    2 +
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 19 files changed, 49 insertions(+), 18 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.1.12.4
retrieving revision 1.1.12.5
diff -u -r1.1.12.4 -r1.1.12.5
--- linux-2.6-xen-compile-fixes.patch	28 Feb 2006 22:53:14 -0000	1.1.12.4
+++ linux-2.6-xen-compile-fixes.patch	1 Mar 2006 00:20:54 -0000	1.1.12.5
@@ -221,7 +221,8 @@
 @@ -3,5 +3,3 @@
  #
  
- obj-y				:= setup.o topology.o
+-obj-y				:= setup.o topology.o
++obj-y				:= setup.o
 -  
 -topology-y			:= ../mach-default/topology.o
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c