rpms/kernel/devel linux-2.6-xen-compile-fixes.patch,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: quintela

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

Modified Files:
	linux-2.6-xen-compile-fixes.patch 
Log Message:
bandaid to get x86_64 xenU to compile (/me really, really hates apic subarch xen abuse)

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    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/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 +
 linux-2.6.16.noarch/arch/x86_64/ia32/ia32entry-xen.S         |   17 +++++------
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c    |    5 ++-
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c    |    5 ++-
 20 files changed, 65 insertions(+), 24 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-xen-compile-fixes.patch	14 Apr 2006 18:33:56 -0000	1.6
+++ linux-2.6-xen-compile-fixes.patch	14 Apr 2006 20:49:32 -0000	1.7
@@ -317,3 +317,21 @@
  			hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
+diff linux-2.6.16.nowork/include/asm-x86_64/ipi.h linux-2.6.16.noarch/include/asm-x86_64/ipi.h
+--- linux-2.6.16.nowork/include/asm-x86_64/ipi.h	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16.noarch/include/asm-x86_64/ipi.h	2006-04-14 21:46:59.000000000 +0200
+@@ -49,6 +49,7 @@ static inline int __prepare_ICR2 (unsign
+ 	return SET_APIC_DEST_FIELD(mask);
+ }
+ 
++#ifndef CONFIG_XEN_UNPRIVILEGED_GUEST
+ static inline void __send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)
+ {
+ 	/*
+@@ -113,5 +114,6 @@ static inline void send_IPI_mask_sequenc
+ 	}
+ 	local_irq_restore(flags);
+ }
++#endif
+ 
+ #endif /* __ASM_IPI_H */