rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.35.2.3, 1.35.2.4 linux-2.6.20.14-xen-3.1.0.patch, 1.2, 1.2.2.1
Eduardo Habkost (ehabkost)
fedora-extras-commits at redhat.com
Wed Aug 8 19:32:07 UTC 2007
Author: ehabkost
Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2004
Modified Files:
Tag: private-ehabkost-testing-csum-patches
kernel-xen.spec linux-2.6.20.14-xen-3.1.0.patch
Log Message:
Fix critical_fixup_table
This was causing crashes like the ones seen on bug #234008.
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.35.2.3
retrieving revision 1.35.2.4
diff -u -r1.35.2.3 -r1.35.2.4
--- kernel-xen.spec 7 Aug 2007 14:20:37 -0000 1.35.2.3
+++ kernel-xen.spec 8 Aug 2007 19:31:33 -0000 1.35.2.4
@@ -2022,6 +2022,10 @@
# - tux.
%changelog
+* Wed Aug 08 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Fix critical_fixup_table (this was causing crashes like the ones seen
+ on bug #234008)
+
* Mon Aug 06 2007 Eduardo Habkost <ehabkost at redhat.com>
- Re-add checksum patches, now ported to xen-3.1.0
linux-2.6.20.14-xen-3.1.0.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.2.2.1 linux-2.6.20.14-xen-3.1.0.patch
Index: linux-2.6.20.14-xen-3.1.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/linux-2.6.20.14-xen-3.1.0.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- linux-2.6.20.14-xen-3.1.0.patch 20 Jul 2007 20:49:47 -0000 1.2
+++ linux-2.6.20.14-xen-3.1.0.patch 8 Aug 2007 19:31:33 -0000 1.2.2.1
@@ -1,6 +1,6 @@
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/Kconfig
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/Kconfig
--- a/arch/i386/Kconfig Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/Kconfig Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/Kconfig Wed Aug 08 16:25:28 2007 -0300
@@ -16,6 +16,7 @@ config X86_32
config GENERIC_TIME
@@ -272,9 +272,9 @@
config KTIME_SCALAR
bool
default y
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/Kconfig.cpu
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/Kconfig.cpu
--- a/arch/i386/Kconfig.cpu Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/Kconfig.cpu Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/Kconfig.cpu Wed Aug 08 16:25:28 2007 -0300
@@ -267,7 +267,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -292,9 +292,9 @@
- default y
+ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ && !X86_XEN
+ default y
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/Kconfig.debug
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/Kconfig.debug
--- a/arch/i386/Kconfig.debug Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/Kconfig.debug Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/Kconfig.debug Wed Aug 08 16:25:28 2007 -0300
@@ -79,6 +79,7 @@ config DOUBLEFAULT
config DOUBLEFAULT
default y
@@ -303,9 +303,9 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/Makefile
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/Makefile
--- a/arch/i386/Makefile Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/Makefile Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/Makefile Wed Aug 08 16:25:28 2007 -0300
@@ -60,6 +60,11 @@ AFLAGS += $(call as-instr,.cfi_startproc
CFLAGS += $(cflags-y)
@@ -362,9 +362,9 @@
arch/$(ARCH)/boot/image.iso \
arch/$(ARCH)/boot/mtools.conf
+CLEAN_FILES += vmlinuz vmlinux-stripped
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/boot-xen/Makefile
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/boot-xen/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/boot-xen/Makefile Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/boot-xen/Makefile Wed Aug 08 16:25:28 2007 -0300
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -387,9 +387,9 @@
+ install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+ install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/Makefile
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/Makefile
--- a/arch/i386/kernel/Makefile Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/Makefile Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/Makefile Wed Aug 08 16:25:28 2007 -0300
@@ -47,6 +47,12 @@ EXTRA_AFLAGS := -traditional
obj-$(CONFIG_SCx200) += scx200.o
@@ -435,17 +435,17 @@
+extra-y := $(call cherrypickxen, $(extra-y))
+%/head-xen.o %/head-xen.s: EXTRA_AFLAGS :=
+endif
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/acpi/Makefile
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/acpi/Makefile
--- a/arch/i386/kernel/acpi/Makefile Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/acpi/Makefile Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/acpi/Makefile Wed Aug 08 16:25:28 2007 -0300
@@ -7,4 +7,3 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
-
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/acpi/boot.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/acpi/boot.c
--- a/arch/i386/kernel/acpi/boot.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/acpi/boot.c Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/acpi/boot.c Wed Aug 08 16:25:28 2007 -0300
@@ -107,7 +107,7 @@ EXPORT_SYMBOL(x86_acpiid_to_apicid);
*/
enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
@@ -489,9 +489,9 @@
/* detect the location of the ACPI PM Timer */
if (fadt->revision >= FADT2_REVISION_ID) {
/* FADT rev. 2 */
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/apic-xen.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/apic-xen.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/apic-xen.c Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/apic-xen.c Wed Aug 08 16:25:28 2007 -0300
@@ -0,0 +1,223 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -716,9 +716,9 @@
+}
+early_param("nolapic", parse_nolapic);
+
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/asm-offsets.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/asm-offsets.c
--- a/arch/i386/kernel/asm-offsets.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/asm-offsets.c Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/asm-offsets.c Wed Aug 08 16:25:28 2007 -0300
@@ -89,9 +89,14 @@ void foo(void)
OFFSET(pbe_orig_address, pbe, orig_address);
OFFSET(pbe_next, pbe, next);
@@ -746,9 +746,9 @@
+ OFFSET(XEN_START_mfn_list, start_info, mfn_list);
+#endif
}
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/cpu/common.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/common.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/cpu/common.c Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/cpu/common.c Wed Aug 08 16:25:28 2007 -0300
@@ -19,6 +19,10 @@
#include <mach_apic.h>
#endif
@@ -855,9 +855,9 @@
load_LDT(&init_mm.context);
#ifdef CONFIG_DOUBLEFAULT
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/cpu/mtrr/Makefile
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/cpu/mtrr/Makefile
--- a/arch/i386/kernel/cpu/mtrr/Makefile Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/cpu/mtrr/Makefile Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/cpu/mtrr/Makefile Wed Aug 08 16:25:28 2007 -0300
@@ -1,3 +1,10 @@ obj-y := main.o if.o generic.o state.o
obj-y := main.o if.o generic.o state.o
obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o
@@ -869,9 +869,9 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/cpu/mtrr/main-xen.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/cpu/mtrr/main-xen.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/cpu/mtrr/main-xen.c Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/cpu/mtrr/main-xen.c Wed Aug 08 16:25:28 2007 -0300
@@ -0,0 +1,198 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -1071,9 +1071,9 @@
+}
+
+subsys_initcall(mtrr_init);
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/crash.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/crash.c
--- a/arch/i386/kernel/crash.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/crash.c Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/crash.c Wed Aug 08 16:25:28 2007 -0300
@@ -31,6 +31,7 @@
/* This keeps a track of which one is crashing cpu. */
static int crashing_cpu;
@@ -1103,9 +1103,9 @@
+#endif /* CONFIG_XEN */
crash_save_cpu(regs, safe_smp_processor_id());
}
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/e820.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/e820.c
--- a/arch/i386/kernel/e820.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/arch/i386/kernel/e820.c Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/e820.c Wed Aug 08 16:25:28 2007 -0300
@@ -15,10 +15,24 @@
#include <asm/page.h>
#include <asm/e820.h>
@@ -1351,9 +1351,9 @@
if (type && ei->type != type)
continue;
/* is the region (part) in overlap with the current region ?*/
-diff -r 4a9ef6a03fd9 -r 008004888022 arch/i386/kernel/entry-xen.S
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 arch/i386/kernel/entry-xen.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/entry-xen.S Wed Jul 18 12:32:22 2007 -0300
++++ b/arch/i386/kernel/entry-xen.S Wed Aug 08 16:25:28 2007 -0300
@@ -0,0 +1,1264 @@
+/*
+ * linux/arch/i386/entry.S
@@ -2211,7 +2211,7 @@
+ .byte 0x18 # pop %eax
+ .byte 0x1c # pop %ds
+ .byte 0x20 # pop %es
-+ .byte 0x24 # pop %gs
[...5152 lines suppressed...]
-diff -r 4a9ef6a03fd9 -r 008004888022 kernel/irq/manage.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 kernel/irq/manage.c
--- a/kernel/irq/manage.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/kernel/irq/manage.c Wed Jul 18 12:32:22 2007 -0300
++++ b/kernel/irq/manage.c Wed Aug 08 16:25:28 2007 -0300
@@ -30,6 +30,7 @@ void synchronize_irq(unsigned int irq)
{
struct irq_desc *desc = irq_desc + irq;
@@ -92443,9 +92443,9 @@
if (irq >= NR_IRQS)
return;
-diff -r 4a9ef6a03fd9 -r 008004888022 kernel/irq/spurious.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 kernel/irq/spurious.c
--- a/kernel/irq/spurious.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/kernel/irq/spurious.c Wed Jul 18 12:32:22 2007 -0300
++++ b/kernel/irq/spurious.c Wed Aug 08 16:25:28 2007 -0300
@@ -139,7 +139,8 @@ void note_interrupt(unsigned int irq, st
irqreturn_t action_ret)
{
@@ -92456,9 +92456,9 @@
if (unlikely(action_ret != IRQ_NONE))
report_bad_irq(irq, desc, action_ret);
}
-diff -r 4a9ef6a03fd9 -r 008004888022 kernel/kexec.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 kernel/kexec.c
--- a/kernel/kexec.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/kernel/kexec.c Wed Jul 18 12:32:22 2007 -0300
++++ b/kernel/kexec.c Wed Aug 08 16:25:28 2007 -0300
@@ -331,13 +331,27 @@ static int kimage_is_destination_range(s
return 0;
}
@@ -92670,9 +92670,9 @@
/* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image);
-diff -r 4a9ef6a03fd9 -r 008004888022 kernel/softlockup.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 kernel/softlockup.c
--- a/kernel/softlockup.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/kernel/softlockup.c Wed Jul 18 12:32:22 2007 -0300
++++ b/kernel/softlockup.c Wed Aug 08 16:25:28 2007 -0300
@@ -39,6 +39,19 @@ void touch_softlockup_watchdog(void)
__raw_get_cpu_var(touch_timestamp) = jiffies;
}
@@ -92693,9 +92693,9 @@
/*
* This callback runs from the timer interrupt, and checks
-diff -r 4a9ef6a03fd9 -r 008004888022 kernel/timer.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 kernel/timer.c
--- a/kernel/timer.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/kernel/timer.c Wed Jul 18 12:32:22 2007 -0300
++++ b/kernel/timer.c Wed Aug 08 16:25:28 2007 -0300
@@ -616,7 +616,9 @@ unsigned long next_timer_interrupt(void)
if (hr_expires < 3)
return hr_expires + jiffies;
@@ -92707,9 +92707,9 @@
base = __get_cpu_var(tvec_bases);
spin_lock(&base->lock);
-diff -r 4a9ef6a03fd9 -r 008004888022 lib/Makefile
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 lib/Makefile
--- a/lib/Makefile Wed Jul 18 12:23:24 2007 -0300
-+++ b/lib/Makefile Wed Jul 18 12:32:22 2007 -0300
++++ b/lib/Makefile Wed Aug 08 16:25:28 2007 -0300
@@ -57,6 +57,7 @@ obj-$(CONFIG_AUDIT_GENERIC) += audit.o
obj-$(CONFIG_SWIOTLB) += swiotlb.o
@@ -92718,9 +92718,9 @@
lib-$(CONFIG_GENERIC_BUG) += bug.o
-diff -r 4a9ef6a03fd9 -r 008004888022 mm/Kconfig
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 mm/Kconfig
--- a/mm/Kconfig Wed Jul 18 12:23:24 2007 -0300
-+++ b/mm/Kconfig Wed Jul 18 12:32:22 2007 -0300
++++ b/mm/Kconfig Wed Aug 08 16:25:28 2007 -0300
@@ -132,11 +132,14 @@ config MEMORY_HOTPLUG_SPARSE
# Default to 4 for wider testing, though 8 might be more appropriate.
# ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -92736,9 +92736,9 @@
default "4"
#
-diff -r 4a9ef6a03fd9 -r 008004888022 mm/highmem.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 mm/highmem.c
--- a/mm/highmem.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/mm/highmem.c Wed Jul 18 12:32:22 2007 -0300
++++ b/mm/highmem.c Wed Aug 08 16:25:28 2007 -0300
@@ -147,6 +147,17 @@ start:
return vaddr;
@@ -92757,9 +92757,9 @@
void fastcall *kmap_high(struct page *page)
{
-diff -r 4a9ef6a03fd9 -r 008004888022 mm/memory.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 mm/memory.c
--- a/mm/memory.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/mm/memory.c Wed Jul 18 12:32:22 2007 -0300
++++ b/mm/memory.c Wed Aug 08 16:25:28 2007 -0300
@@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
@@ -92934,9 +92934,9 @@
return;
}
-diff -r 4a9ef6a03fd9 -r 008004888022 mm/mmap.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 mm/mmap.c
--- a/mm/mmap.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/mm/mmap.c Wed Jul 18 12:32:22 2007 -0300
++++ b/mm/mmap.c Wed Aug 08 16:25:28 2007 -0300
@@ -1976,6 +1976,10 @@ void exit_mmap(struct mm_struct *mm)
struct vm_area_struct *vma = mm->mmap;
unsigned long nr_accounted = 0;
@@ -92948,9 +92948,9 @@
lru_add_drain();
flush_cache_mm(mm);
-diff -r 4a9ef6a03fd9 -r 008004888022 mm/page_alloc.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 mm/page_alloc.c
--- a/mm/page_alloc.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/mm/page_alloc.c Wed Jul 18 12:32:22 2007 -0300
++++ b/mm/page_alloc.c Wed Aug 08 16:25:28 2007 -0300
@@ -199,7 +199,11 @@ static void bad_page(struct page *page)
1 << PG_slab |
1 << PG_swapcache |
@@ -93017,9 +93017,9 @@
if (PageAnon(page))
page->mapping = NULL;
-diff -r 4a9ef6a03fd9 -r 008004888022 net/core/dev.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 net/core/dev.c
--- a/net/core/dev.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/net/core/dev.c Wed Jul 18 12:32:22 2007 -0300
++++ b/net/core/dev.c Wed Aug 08 16:25:28 2007 -0300
@@ -117,6 +117,12 @@
#include <linux/err.h>
#include <linux/ctype.h>
@@ -93118,9 +93118,9 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-diff -r 4a9ef6a03fd9 -r 008004888022 net/core/skbuff.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 net/core/skbuff.c
--- a/net/core/skbuff.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/net/core/skbuff.c Wed Jul 18 12:32:22 2007 -0300
++++ b/net/core/skbuff.c Wed Aug 08 16:25:28 2007 -0300
@@ -243,6 +243,7 @@ struct sk_buff *alloc_skb_from_cache(str
skb_shinfo(skb)->gso_size = 0;
skb_shinfo(skb)->gso_segs = 0;
@@ -93148,9 +93148,9 @@
n->data_len = skb->data_len;
n->len = skb->len;
-diff -r 4a9ef6a03fd9 -r 008004888022 net/ipv4/netfilter/ip_nat_proto_tcp.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 net/ipv4/netfilter/ip_nat_proto_tcp.c
--- a/net/ipv4/netfilter/ip_nat_proto_tcp.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/net/ipv4/netfilter/ip_nat_proto_tcp.c Wed Jul 18 12:32:22 2007 -0300
++++ b/net/ipv4/netfilter/ip_nat_proto_tcp.c Wed Aug 08 16:25:28 2007 -0300
@@ -129,8 +129,15 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
@@ -93167,9 +93167,9 @@
return 1;
}
-diff -r 4a9ef6a03fd9 -r 008004888022 net/ipv4/netfilter/ip_nat_proto_udp.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 net/ipv4/netfilter/ip_nat_proto_udp.c
--- a/net/ipv4/netfilter/ip_nat_proto_udp.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/net/ipv4/netfilter/ip_nat_proto_udp.c Wed Jul 18 12:32:22 2007 -0300
++++ b/net/ipv4/netfilter/ip_nat_proto_udp.c Wed Aug 08 16:25:28 2007 -0300
@@ -115,8 +115,16 @@ udp_manip_pkt(struct sk_buff **pskb,
}
@@ -93187,9 +93187,9 @@
if (!hdr->check)
hdr->check = CSUM_MANGLED_0;
}
-diff -r 4a9ef6a03fd9 -r 008004888022 net/ipv4/xfrm4_output.c
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 net/ipv4/xfrm4_output.c
--- a/net/ipv4/xfrm4_output.c Wed Jul 18 12:23:24 2007 -0300
-+++ b/net/ipv4/xfrm4_output.c Wed Jul 18 12:32:22 2007 -0300
++++ b/net/ipv4/xfrm4_output.c Wed Aug 08 16:25:28 2007 -0300
@@ -17,6 +17,8 @@
#include <net/ip.h>
#include <net/xfrm.h>
@@ -93210,9 +93210,9 @@
if (skb->ip_summed == CHECKSUM_PARTIAL) {
err = skb_checksum_help(skb);
if (err)
-diff -r 4a9ef6a03fd9 -r 008004888022 scripts/Makefile.xen
+diff -r 4a9ef6a03fd9 -r 85b796b085e5 scripts/Makefile.xen
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/scripts/Makefile.xen Wed Jul 18 12:32:22 2007 -0300
++++ b/scripts/Makefile.xen Wed Aug 08 16:25:28 2007 -0300
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
More information about the fedora-extras-commits
mailing list