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

[fedora-cvs-commits at redhat.com]

Author: quintela

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

Modified Files:
	linux-2.6-xen-compile-fixes.patch 
Log Message:
fixed last xen bits

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/net/ipv4/netfilter/ip_nat_proto_tcp.c    |    5 ++-
 linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c    |    5 ++-
 19 files changed, 63 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-xen-compile-fixes.patch	14 Apr 2006 18:11:39 -0000	1.5
+++ linux-2.6-xen-compile-fixes.patch	14 Apr 2006 18:33:56 -0000	1.6
@@ -286,34 +286,34 @@
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-13 23:58:07.000000000 +0200
 +++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-04-14 19:39:59.000000000 +0200
-@@ -129,12 +129,9 @@ tcp_manip_pkt(struct sk_buff **pskb,
+@@ -129,9 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
  
--#ifdef CONFIG_XEN
++#ifdef CONFIG_XEN
  	if ((*pskb)->proto_csum_blank) {
  		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
--	} else 
--#endif
--	{
-+	} else {
++	} else 
++#endif
++	{
+-	} else {
  		hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-13 23:58:39.000000000 +0200
 +++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-04-14 19:39:59.000000000 +0200
-@@ -114,12 +114,9 @@ udp_manip_pkt(struct sk_buff **pskb,
+@@ -114,9 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
  	if (hdr->check) { /* 0 is a special case meaning no checksum */
--#ifdef CONFIG_XEN
++#ifdef CONFIG_XEN
  		if ((*pskb)->proto_csum_blank) {
  			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
--		} else 
--#endif
--		{
-+		} else {
++		} else 
++#endif
++		{
+-		} else {
  			hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,