rpms/kernel/devel linux-2.6-crash-driver-xen.patch, NONE, 1.1 linux-2.6-debug-sysfs-crash-debugging-xen.patch, NONE, 1.1 linux-2.6-xen-tux.patch, NONE, 1.1 kernel-2.6.spec, 1.2460, 1.2461 linux-2.6-compile-fixes.patch, 1.94, 1.95 linux-2.6-devmem-xen.patch, 1.3, 1.4 linux-2.6-xen.patch, 1.45, 1.46 linux-2.6-xen_remap_vma_flags.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 27 13:05:42 UTC 2006
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch, NONE, 1.1 openoffice.org.spec, 1.797, 1.798 openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch, 1.1, NONE
- Next message (by thread): rpms/kexec-tools/devel kdump.init, 1.8, 1.9 kexec-tools.spec, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: quintela
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16734
Modified Files:
kernel-2.6.spec linux-2.6-compile-fixes.patch
linux-2.6-devmem-xen.patch linux-2.6-xen.patch
Added Files:
linux-2.6-crash-driver-xen.patch
linux-2.6-debug-sysfs-crash-debugging-xen.patch
linux-2.6-xen-tux.patch
Removed Files:
linux-2.6-xen_remap_vma_flags.patch
Log Message:
xen update
linux-2.6-crash-driver-xen.patch:
i386/mm/init-xen.c | 1 +
x86_64/mm/init-xen.c | 1 +
2 files changed, 2 insertions(+)
--- NEW FILE linux-2.6-crash-driver-xen.patch ---
# HG changeset patch
# User quintela at elfo.mitica
# Node ID ed87076d010ee2f549658308cf2298fd888ba94a
# Parent 7bad01eaf8f795b08be97187c9ed41891cca9bab
crash xen bits
diff -r 7bad01eaf8f7 -r ed87076d010e arch/i386/mm/init-xen.c
--- a/arch/i386/mm/init-xen.c Thu Jul 27 02:44:10 2006 +0200
+++ b/arch/i386/mm/init-xen.c Thu Jul 27 02:50:45 2006 +0200
@@ -275,6 +275,7 @@ int page_is_ram(unsigned long pagenr)
}
return 0;
}
+EXPORT_SYMBOL_GPL(page_is_ram);
/*
* devmem_is_allowed() checks to see if /dev/mem access to a certain address is
diff -r 7bad01eaf8f7 -r ed87076d010e arch/x86_64/mm/init-xen.c
--- a/arch/x86_64/mm/init-xen.c Thu Jul 27 02:44:10 2006 +0200
+++ b/arch/x86_64/mm/init-xen.c Thu Jul 27 02:50:45 2006 +0200
@@ -964,6 +964,7 @@ static inline int page_is_ram (unsigned
{
return 1;
}
+EXPORT_SYMBOL_GPL(page_is_ram);
/*
* devmem_is_allowed() checks to see if /dev/mem access to a certain address is
linux-2.6-debug-sysfs-crash-debugging-xen.patch:
i386/kernel/traps-xen.c | 5 +++++
x86_64/kernel/traps-xen.c | 5 +++++
2 files changed, 10 insertions(+)
--- NEW FILE linux-2.6-debug-sysfs-crash-debugging-xen.patch ---
# HG changeset patch
# User quintela at elfo.mitica
# Node ID e5168f3eb0de30d54f9d03d4afeddbb3a1e69d3f
# Parent 35d3d547d0d38754c0fc4831a7f073531245c835
sysfs-crash-debugging xen bits
diff -r 35d3d547d0d3 -r e5168f3eb0de arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c Thu Jul 27 00:46:20 2006 +0200
+++ b/arch/i386/kernel/traps-xen.c Thu Jul 27 00:59:37 2006 +0200
@@ -100,6 +100,8 @@ static int kstack_depth_to_print = 24;
static int kstack_depth_to_print = 24;
static int call_trace = 1;
ATOMIC_NOTIFIER_HEAD(i386die_chain);
+
+extern char last_sysfs_file[];
int register_die_notifier(struct notifier_block *nb)
{
@@ -414,6 +416,9 @@ void die(const char * str, struct pt_reg
#endif
if (nl)
printk("\n");
+#ifdef CONFIG_SYSFS
+ printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file);
+#endif
if (notify_die(DIE_OOPS, str, regs, err,
current->thread.trap_no, SIGSEGV) !=
NOTIFY_STOP) {
diff -r 35d3d547d0d3 -r e5168f3eb0de arch/x86_64/kernel/traps-xen.c
--- a/arch/x86_64/kernel/traps-xen.c Thu Jul 27 00:46:20 2006 +0200
+++ b/arch/x86_64/kernel/traps-xen.c Thu Jul 27 00:59:37 2006 +0200
@@ -69,6 +69,8 @@ asmlinkage void spurious_interrupt_bug(v
asmlinkage void spurious_interrupt_bug(void);
ATOMIC_NOTIFIER_HEAD(die_chain);
+
+extern char last_sysfs_file[];
int register_die_notifier(struct notifier_block *nb)
{
@@ -537,6 +539,9 @@ void __kprobes __die(const char * str, s
printk("DEBUG_PAGEALLOC");
#endif
printk("\n");
+#ifdef CONFIG_SYSFS
+ printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file);
+#endif
notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);
show_registers(regs);
/* Executive summary in case the oops scrolled away */
linux-2.6-xen-tux.patch:
ia32entry-xen.S | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletion(-)
--- NEW FILE linux-2.6-xen-tux.patch ---
# HG changeset patch
# User quintela at elfo.mitica
# Node ID 7f7c006d23578ae6d391810086b0099c1730edb9
# Parent 9be92de1dd0d02611bbd35d8649fd048e1d43cc7
tux xen bits
diff -r 9be92de1dd0d -r 7f7c006d2357 arch/x86_64/ia32/ia32entry-xen.S
--- a/arch/x86_64/ia32/ia32entry-xen.S Wed Jul 26 23:46:46 2006 +0200
+++ b/arch/x86_64/ia32/ia32entry-xen.S Wed Jul 26 23:53:03 2006 +0200
@@ -474,7 +474,15 @@ ia32_sys_call_table:
.quad quiet_ni_syscall /* old lock syscall holder */
.quad compat_sys_ioctl
.quad compat_sys_fcntl64 /* 55 */
- .quad quiet_ni_syscall /* old mpx syscall holder */
+#ifdef CONFIG_TUX
+ .quad __sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+ .quad sys_tux
+# else
+ .quad quiet_ni_syscall
+# endif
+#endif
.quad sys_setpgid
.quad quiet_ni_syscall /* old ulimit syscall holder */
.quad sys32_olduname
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2460
retrieving revision 1.2461
diff -u -r1.2460 -r1.2461
--- kernel-2.6.spec 27 Jul 2006 05:07:19 -0000 1.2460
+++ kernel-2.6.spec 27 Jul 2006 13:05:33 -0000 1.2461
@@ -323,9 +323,10 @@
Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch
Patch954: linux-2.6-xen-execshield.patch
+Patch955: linux-2.6-xen-tux.patch
+
Patch990: linux-2.6-xen-compile-fixes.patch
-Patch991: linux-2.6-xen_remap_vma_flags.patch
#
# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -340,10 +341,12 @@
Patch1016: linux-2.6-debug-Wundef.patch
Patch1017: linux-2.6-debug-disable-builtins.patch
Patch1018: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1019: linux-2.6-debug-sysfs-crash-debugging.patch
+Patch1019: linux-2.6-debug-must_check.patch
Patch1020: linux-2.6-debug-no-quiet.patch
Patch1021: linux-2.6-debug-boot-delay.patch
-Patch1022: linux-2.6-debug-must_check.patch
+Patch1022: linux-2.6-debug-sysfs-crash-debugging.patch
+Patch1023: linux-2.6-debug-sysfs-crash-debugging-xen.patch
+
Patch1027: linux-2.6-debug-slab-leak-detector.patch
Patch1028: linux-2.6-debug-oops-pause.patch
@@ -356,6 +359,7 @@
# Provide read only /dev/crash driver.
Patch1060: linux-2.6-crash-driver.patch
+Patch1061: linux-2.6-crash-driver-xen.patch
Patch1070: linux-2.6-sleepon.patch
@@ -830,10 +834,10 @@
%patch953 -p1
# Xen exec-shield bits
%patch954 -p1
+%patch955 -p1
-%patch990 -p1
-%patch991 -p1
+#%patch990 -p1
%endif
@@ -857,6 +861,9 @@
%patch1020 -p1
%patch1021 -p1
%patch1022 -p1
+%if %{includexen}
+%patch1023 -p1
+%endif
# Slab leak detector.
#%patch1027 -p1
@@ -877,6 +884,9 @@
# /dev/crash driver for the crashdump analysis tool
#
%patch1060 -p1
+%if %{includexen}
+%patch1061 -p1
+%endif
#
# Most^WAll users of sleep_on are broken; fix a bunch
@@ -1649,6 +1659,10 @@
%endif
%changelog
+* Thu Jul 27 2006 Juan Quintela <quintela at redhat.com>
+- review all xen related patches.
+- x86_64 dom0, x86_64 domU and i386 domU should work.
+
* Thu Jul 27 2006 Rik van Riel <riel at redhat.com>
- reduce hypervisor stack use with -O2, this really fixes bug (#198932)
linux-2.6-compile-fixes.patch:
0 files changed
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- linux-2.6-compile-fixes.patch 15 Jul 2006 20:21:21 -0000 1.94
+++ linux-2.6-compile-fixes.patch 27 Jul 2006 13:05:34 -0000 1.95
@@ -1,14 +0,0 @@
-
---- linux-2.6.17.noarch/Makefile~ 2006-06-29 17:20:17.000000000 -0400
-+++ linux-2.6.17.noarch/Makefile 2006-06-29 17:20:38.000000000 -0400
-@@ -267,10 +267,6 @@ MAKEFLAGS += --include-dir=$(srctree)
- # We need some generic definitions
- include $(srctree)/scripts/Kbuild.include
-
--# Do not use make's built-in rules and variables
--# This increases performance and avoid hard-to-debug behavour
--MAKEFLAGS += -rR
--
- # Make variables (CC, etc...)
-
- AS = $(CROSS_COMPILE)as
linux-2.6-devmem-xen.patch:
arch/i386/mm/init-xen.c | 19 +++++++++++++++++++
arch/x86_64/mm/init-xen.c | 25 +++++++++++++++++++++++++
include/asm-i386/mach-xen/asm/page.h | 2 ++
include/asm-x86_64/mach-xen/asm/page.h | 4 ++++
4 files changed, 50 insertions(+)
Index: linux-2.6-devmem-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem-xen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-devmem-xen.patch 22 Apr 2006 17:48:28 -0000 1.3
+++ linux-2.6-devmem-xen.patch 27 Jul 2006 13:05:34 -0000 1.4
@@ -1,10 +1,26 @@
-diff -uNp linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig linux-2.6.16.noarch/arch/i386/mm/init-xen.c
---- linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig 2006-04-13 19:37:24.000000000 +0200
-+++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c 2006-04-13 19:39:38.000000000 +0200
-@@ -280,6 +280,17 @@ int page_is_ram(unsigned long pagenr)
-
- #endif
+# HG changeset patch
+# User quintela at elfo.mitica
+# Node ID b5b4c76164972243479a9cb2a428a93a5aef7263
+# Parent ad6b852bd54573cf46e8f34ffaeeae3877ec5603
+devmem xen bits
+
+diff -r ad6b852bd545 -r b5b4c7616497 arch/i386/mm/init-xen.c
+--- a/arch/i386/mm/init-xen.c Thu Jul 27 02:02:42 2006 +0200
++++ b/arch/i386/mm/init-xen.c Thu Jul 27 02:21:44 2006 +0200
+@@ -276,6 +276,25 @@ int page_is_ram(unsigned long pagenr)
+ return 0;
+ }
++/*
++ * devmem_is_allowed() checks to see if /dev/mem access to a certain address is
++ * valid. The argument is a physical page number.
++ *
++ *
++ * On x86, access has to be given to the first megabyte of ram because that area
++ * contains bios code and data regions used by X and dosemu and similar apps.
++ * Access has to be given to non-kernel-ram areas as well, these contain the PCI
++ * mmio resources as well as potential bios/acpi data regions.
++ */
+int devmem_is_allowed(unsigned long pagenr)
+{
+ if (pagenr <= 256)
@@ -14,29 +30,21 @@
+ return 0;
+}
+
-+EXPORT_SYMBOL_GPL(page_is_ram);
-+
#ifdef CONFIG_HIGHMEM
pte_t *kmap_pte;
pgprot_t kmap_prot;
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
---- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c 2006-04-13 14:19:58.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c 2006-04-13 16:16:23.000000000 +0200
-@@ -847,6 +847,10 @@ void __init clear_kernel_mapping(unsigne
- __flush_tlb_all();
- }
+diff -r ad6b852bd545 -r b5b4c7616497 arch/x86_64/mm/init-xen.c
+--- a/arch/x86_64/mm/init-xen.c Thu Jul 27 02:02:42 2006 +0200
++++ b/arch/x86_64/mm/init-xen.c Thu Jul 27 02:21:44 2006 +0200
+@@ -960,6 +960,31 @@ int __add_pages(struct zone *z, unsigned
+ }
+ #endif /* CONFIG_MEMORY_HOTPLUG */
+static inline int page_is_ram (unsigned long pagenr)
+{
+ return 1;
+}
- /*
- * Memory hotplug specific functions
- * These are only for non-NUMA machines right now.
-@@ -891,6 +895,28 @@ EXPORT_SYMBOL_GPL(remove_memory);
-
- #endif
-
++
+/*
+ * devmem_is_allowed() checks to see if /dev/mem access to a certain address is
+ * valid. The argument is a physical page number.
@@ -57,28 +65,27 @@
+}
+
+
-+EXPORT_SYMBOL_GPL(devmem_is_allowed);
-+
static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
kcore_vsyscall;
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h
---- linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h 2006-04-13 14:19:59.000000000 +0200
-+++ linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h 2006-04-13 16:19:23.000000000 +0200
-@@ -276,6 +276,7 @@ extern unsigned int __VMALLOC_RESERVE;
+diff -r ad6b852bd545 -r b5b4c7616497 include/asm-i386/mach-xen/asm/page.h
+--- a/include/asm-i386/mach-xen/asm/page.h Thu Jul 27 02:02:42 2006 +0200
++++ b/include/asm-i386/mach-xen/asm/page.h Thu Jul 27 02:21:44 2006 +0200
+@@ -287,6 +287,8 @@ extern unsigned int __VMALLOC_RESERVE;
extern int sysctl_legacy_va_layout;
+extern int devmem_is_allowed(unsigned long pagenr);
++
extern int page_is_ram(unsigned long pagenr);
#endif /* __ASSEMBLY__ */
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h
---- linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h 2006-04-13 14:19:58.000000000 +0200
-+++ linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h 2006-04-13 16:20:50.000000000 +0200
-@@ -309,6 +309,10 @@ static inline pgd_t __pgd(unsigned long
-
- #define __HAVE_ARCH_GATE_AREA 1
+diff -r ad6b852bd545 -r b5b4c7616497 include/asm-x86_64/mach-xen/asm/page.h
+--- a/include/asm-x86_64/mach-xen/asm/page.h Thu Jul 27 02:02:42 2006 +0200
++++ b/include/asm-x86_64/mach-xen/asm/page.h Thu Jul 27 02:21:44 2006 +0200
+@@ -322,6 +322,10 @@ static inline pgd_t __pgd(unsigned long
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+#ifndef __ASSEMBLY__
+extern int devmem_is_allowed(unsigned long pagenr);
@@ -86,4 +93,4 @@
+
#endif /* __KERNEL__ */
- #include <asm-generic/memory_model.h>
+ #endif /* _X86_64_PAGE_H */
linux-2.6-xen.patch:
arch/i386/Kconfig | 86
arch/i386/Kconfig.cpu | 4
arch/i386/Kconfig.debug | 2
arch/i386/Makefile | 24
arch/i386/boot-xen/Makefile | 21
arch/i386/kernel/Makefile | 21
arch/i386/kernel/acpi/Makefile | 4
arch/i386/kernel/acpi/boot-xen.c | 1168 ++++++++
arch/i386/kernel/alternative.c | 4
arch/i386/kernel/apic-xen.c | 160 +
arch/i386/kernel/asm-offsets.c | 7
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 740 +++++
arch/i386/kernel/cpu/mtrr/Makefile | 7
arch/i386/kernel/cpu/mtrr/main-xen.c | 197 +
arch/i386/kernel/early_printk-xen.c | 2
arch/i386/kernel/entry-xen.S | 1188 ++++++++
arch/i386/kernel/entry.S | 6
arch/i386/kernel/fixup.c | 93
arch/i386/kernel/head-xen.S | 180 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2772 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
arch/i386/kernel/irq-xen.c | 324 ++
arch/i386/kernel/ldt-xen.c | 269 +
arch/i386/kernel/microcode-xen.c | 147 +
arch/i386/kernel/mpparse-xen.c | 1186 ++++++++
arch/i386/kernel/pci-dma-xen.c | 378 ++
arch/i386/kernel/process-xen.c | 815 +++++
arch/i386/kernel/quirks-xen.c | 48
arch/i386/kernel/setup-xen.c | 1827 +++++++++++++
arch/i386/kernel/smp-xen.c | 624 ++++
arch/i386/kernel/swiotlb.c | 672 ++++
arch/i386/kernel/sysenter.c | 22
arch/i386/kernel/time-xen.c | 1103 +++++++
arch/i386/kernel/traps-xen.c | 1169 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/tsc.c | 2
arch/i386/kernel/vm86.c | 12
arch/i386/kernel/vsyscall-note-xen.S | 32
arch/i386/lib/delay.c | 3
arch/i386/mach-xen/Makefile | 5
arch/i386/mach-xen/setup.c | 154 +
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 770 +++++
arch/i386/mm/highmem-xen.c | 133
arch/i386/mm/hypervisor.c | 458 +++
arch/i386/mm/init-xen.c | 852 ++++++
arch/i386/mm/ioremap-xen.c | 476 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 693 +++++
arch/i386/mm/pgtable.c | 12
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 555 ++++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1204 ++++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 58
arch/ia64/Makefile | 16
arch/ia64/hp/sim/Makefile | 2
arch/ia64/kernel/asm-offsets.c | 25
arch/ia64/kernel/entry.S | 32
arch/ia64/kernel/gate.S | 375 --
arch/ia64/kernel/gate.lds.S | 95
arch/ia64/kernel/head.S | 6
arch/ia64/kernel/iosapic.c | 65
arch/ia64/kernel/irq_ia64.c | 208 +
arch/ia64/kernel/pal.S | 5
arch/ia64/kernel/patch.c | 197 -
arch/ia64/kernel/setup.c | 60
arch/ia64/mm/ioremap.c | 1
arch/ia64/xen/Makefile | 8
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/hypercall.S | 353 ++
arch/ia64/xen/hypervisor.c | 795 +++++
arch/ia64/xen/util.c | 130
arch/ia64/xen/xenentry.S | 869 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2171 +++++++++++++++
arch/ia64/xen/xenminstate.h | 369 ++
arch/ia64/xen/xenpal.S | 76
arch/ia64/xen/xensetup.S | 35
arch/um/kernel/physmem.c | 4
arch/x86_64/Kconfig | 63
arch/x86_64/Kconfig.debug | 1
arch/x86_64/Makefile | 20
arch/x86_64/ia32/Makefile | 20
arch/x86_64/ia32/ia32entry-xen.S | 743 +++++
arch/x86_64/ia32/syscall32-xen.c | 128
arch/x86_64/ia32/syscall32_syscall-xen.S | 28
arch/x86_64/ia32/vsyscall-int80.S | 58
arch/x86_64/ia32/vsyscall-sigreturn.S | 2
arch/x86_64/kernel/Makefile | 18
arch/x86_64/kernel/acpi/Makefile | 1
arch/x86_64/kernel/apic-xen.c | 197 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/e820-xen.c | 752 +++++
arch/x86_64/kernel/early_printk-xen.c | 304 ++
arch/x86_64/kernel/entry-xen.S | 1209 ++++++++
arch/x86_64/kernel/genapic-xen.c | 143 +
arch/x86_64/kernel/genapic_xen.c | 176 +
arch/x86_64/kernel/head-xen.S | 176 +
arch/x86_64/kernel/head64-xen.c | 161 +
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2263 ++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 99
arch/x86_64/kernel/irq-xen.c | 198 +
arch/x86_64/kernel/ldt-xen.c | 282 ++
arch/x86_64/kernel/mpparse-xen.c | 1012 +++++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 54
arch/x86_64/kernel/process-xen.c | 793 +++++
arch/x86_64/kernel/setup-xen.c | 1640 +++++++++++
arch/x86_64/kernel/setup64-xen.c | 360 ++
arch/x86_64/kernel/smp-xen.c | 600 ++++
arch/x86_64/kernel/traps-xen.c | 1156 ++++++++
arch/x86_64/kernel/vsyscall-xen.c | 239 +
arch/x86_64/kernel/xen_entry.S | 40
arch/x86_64/mm/Makefile | 10
arch/x86_64/mm/fault-xen.c | 723 +++++
arch/x86_64/mm/init-xen.c | 1201 ++++++++
arch/x86_64/mm/pageattr-xen.c | 396 ++
arch/x86_64/oprofile/Makefile | 5
arch/x86_64/pci/Makefile | 12
drivers/Makefile | 1
drivers/acpi/Kconfig | 3
drivers/char/hangcheck-timer.c | 2
drivers/char/mem.c | 6
drivers/char/tpm/Kconfig | 12
drivers/char/tpm/Makefile | 2
drivers/char/tpm/tpm.c | 55
drivers/char/tpm/tpm.h | 7
drivers/char/tpm/tpm_vtpm.c | 547 +++
drivers/char/tpm/tpm_vtpm.h | 68
drivers/char/tpm/tpm_xen.c | 758 +++++
drivers/char/tty_io.c | 7
drivers/firmware/Kconfig | 2
drivers/ide/ide-lib.c | 8
drivers/oprofile/buffer_sync.c | 66
drivers/oprofile/cpu_buffer.c | 51
drivers/oprofile/cpu_buffer.h | 9
drivers/oprofile/event_buffer.h | 7
drivers/oprofile/oprof.c | 32
drivers/oprofile/oprof.h | 3
drivers/oprofile/oprofile_files.c | 207 +
drivers/pci/Kconfig | 1
drivers/scsi/scsi_error.c | 1
drivers/scsi/scsi_priv.h | 1
drivers/serial/Kconfig | 1
drivers/xen/Kconfig | 260 +
drivers/xen/Makefile | 17
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 608 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 568 ++++
drivers/xen/blkback/common.h | 134
drivers/xen/blkback/interface.c | 177 +
drivers/xen/blkback/vbd.c | 119
drivers/xen/blkback/xenbus.c | 460 +++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 841 ++++++
drivers/xen/blkfront/block.h | 155 +
drivers/xen/blkfront/vbd.c | 318 ++
drivers/xen/blktap/Makefile | 3
drivers/xen/blktap/blktap.c | 1438 ++++++++++
drivers/xen/blktap/common.h | 120
drivers/xen/blktap/interface.c | 165 +
drivers/xen/blktap/xenbus.c | 354 ++
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 181 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 647 ++++
drivers/xen/console/xencons_ring.c | 141 +
drivers/xen/core/Makefile | 13
drivers/xen/core/cpu_hotplug.c | 188 +
drivers/xen/core/evtchn.c | 870 ++++++
drivers/xen/core/features.c | 30
drivers/xen/core/gnttab.c | 442 +++
drivers/xen/core/hypervisor_sysfs.c | 60
drivers/xen/core/reboot.c | 364 ++
drivers/xen/core/skbuff.c | 141 +
drivers/xen/core/smpboot.c | 427 +++
drivers/xen/core/xen_proc.c | 19
drivers/xen/core/xen_sysfs.c | 379 ++
drivers/xen/evtchn/Makefile | 2
drivers/xen/evtchn/evtchn.c | 457 +++
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 124
drivers/xen/netback/interface.c | 315 ++
drivers/xen/netback/loopback.c | 261 +
drivers/xen/netback/netback.c | 1121 ++++++++
drivers/xen/netback/xenbus.c | 405 ++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 1605 +++++++++++
drivers/xen/pciback/Makefile | 13
drivers/xen/pciback/conf_space.c | 403 ++
drivers/xen/pciback/conf_space.h | 123
drivers/xen/pciback/conf_space_capability.c | 71
drivers/xen/pciback/conf_space_capability.h | 23
drivers/xen/pciback/conf_space_capability_pm.c | 113
drivers/xen/pciback/conf_space_capability_vpd.c | 42
drivers/xen/pciback/conf_space_header.c | 299 ++
drivers/xen/pciback/passthrough.c | 157 +
drivers/xen/pciback/pci_stub.c | 690 ++++
drivers/xen/pciback/pciback.h | 91
drivers/xen/pciback/pciback_ops.c | 95
drivers/xen/pciback/vpci.c | 204 +
drivers/xen/pciback/xenbus.c | 454 +++
drivers/xen/pcifront/Makefile | 7
drivers/xen/pcifront/pci.c | 46
drivers/xen/pcifront/pci_op.c | 272 +
drivers/xen/pcifront/pcifront.h | 40
drivers/xen/pcifront/xenbus.c | 294 ++
drivers/xen/privcmd/Makefile | 2
drivers/xen/privcmd/privcmd.c | 285 ++
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 85
drivers/xen/tpmback/interface.c | 177 +
drivers/xen/tpmback/tpmback.c | 983 +++++++
drivers/xen/tpmback/xenbus.c | 291 ++
drivers/xen/util.c | 70
drivers/xen/xenbus/Makefile | 12
drivers/xen/xenbus/xenbus_backend_client.c | 135
drivers/xen/xenbus/xenbus_client.c | 278 ++
drivers/xen/xenbus/xenbus_comms.c | 208 +
drivers/xen/xenbus/xenbus_comms.h | 43
drivers/xen/xenbus/xenbus_dev.c | 245 +
drivers/xen/xenbus/xenbus_probe.c | 1086 +++++++
drivers/xen/xenbus/xenbus_xs.c | 843 ++++++
fs/Kconfig | 1
include/asm-i386/apic.h | 2
include/asm-i386/fixmap.h | 4
include/asm-i386/mach-default/mach_traps.h | 12
include/asm-i386/mach-xen/asm/agp.h | 37
include/asm-i386/mach-xen/asm/desc.h | 164 +
include/asm-i386/mach-xen/asm/dma-mapping.h | 152 +
include/asm-i386/mach-xen/asm/fixmap.h | 156 +
include/asm-i386/mach-xen/asm/floppy.h | 147 +
include/asm-i386/mach-xen/asm/highmem.h | 80
include/asm-i386/mach-xen/asm/hypercall.h | 372 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 226 +
include/asm-i386/mach-xen/asm/io.h | 389 ++
include/asm-i386/mach-xen/asm/kmap_types.h | 31
include/asm-i386/mach-xen/asm/mmu.h | 26
include/asm-i386/mach-xen/asm/mmu_context.h | 107
include/asm-i386/mach-xen/asm/page.h | 337 ++
include/asm-i386/mach-xen/asm/param.h | 23
include/asm-i386/mach-xen/asm/pci.h | 153 +
include/asm-i386/mach-xen/asm/pgalloc.h | 63
include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
include/asm-i386/mach-xen/asm/pgtable-2level.h | 88
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
include/asm-i386/mach-xen/asm/pgtable-3level.h | 197 +
include/asm-i386/mach-xen/asm/pgtable.h | 509 +++
include/asm-i386/mach-xen/asm/processor.h | 741 +++++
include/asm-i386/mach-xen/asm/ptrace.h | 90
include/asm-i386/mach-xen/asm/scatterlist.h | 22
include/asm-i386/mach-xen/asm/segment.h | 117
include/asm-i386/mach-xen/asm/setup.h | 79
include/asm-i386/mach-xen/asm/smp.h | 103
include/asm-i386/mach-xen/asm/spinlock.h | 199 +
include/asm-i386/mach-xen/asm/swiotlb.h | 43
include/asm-i386/mach-xen/asm/synch_bitops.h | 143 +
include/asm-i386/mach-xen/asm/system.h | 575 ++++
include/asm-i386/mach-xen/asm/timer.h | 70
include/asm-i386/mach-xen/asm/tlbflush.h | 101
include/asm-i386/mach-xen/asm/vga.h | 20
include/asm-i386/mach-xen/irq_vectors.h | 125
include/asm-i386/mach-xen/mach_traps.h | 33
include/asm-i386/mach-xen/setup_arch.h | 6
include/asm-i386/page.h | 2
include/asm-i386/pgtable-2level-defs.h | 2
include/asm-i386/pgtable-3level-defs.h | 2
include/asm-ia64/agp.h | 31
include/asm-ia64/dma-mapping.h | 72
include/asm-ia64/fixmap.h | 2
include/asm-ia64/gcc_intrin.h | 60
include/asm-ia64/hw_irq.h | 11
include/asm-ia64/hypercall.h | 533 +++
include/asm-ia64/hypervisor.h | 207 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/io.h | 50
include/asm-ia64/iosapic.h | 2
include/asm-ia64/irq.h | 31
include/asm-ia64/machvec.h | 15
include/asm-ia64/meminit.h | 5
include/asm-ia64/page.h | 124
include/asm-ia64/pal.h | 1
include/asm-ia64/pgalloc.h | 2
include/asm-ia64/privop.h | 59
include/asm-ia64/processor.h | 1
include/asm-ia64/synch_bitops.h | 63
include/asm-ia64/system.h | 4
include/asm-ia64/xen/privop.h | 302 ++
include/asm-um/page.h | 2
include/asm-x86_64/apic.h | 2
include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
include/asm-x86_64/mach-xen/asm/bootsetup.h | 42
include/asm-x86_64/mach-xen/asm/desc.h | 263 +
include/asm-x86_64/mach-xen/asm/dma-mapping.h | 208 +
include/asm-x86_64/mach-xen/asm/dmi.h | 29
include/asm-x86_64/mach-xen/asm/e820.h | 64
include/asm-x86_64/mach-xen/asm/fixmap.h | 113
include/asm-x86_64/mach-xen/asm/floppy.h | 206 +
include/asm-x86_64/mach-xen/asm/hw_irq.h | 137
include/asm-x86_64/mach-xen/asm/hypercall.h | 372 ++
include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
include/asm-x86_64/mach-xen/asm/io.h | 327 ++
include/asm-x86_64/mach-xen/asm/irq.h | 39
include/asm-x86_64/mach-xen/asm/mmu.h | 37
include/asm-x86_64/mach-xen/asm/mmu_context.h | 135
include/asm-x86_64/mach-xen/asm/msr.h | 399 ++
include/asm-x86_64/mach-xen/asm/nmi.h | 93
include/asm-x86_64/mach-xen/asm/page.h | 327 ++
include/asm-x86_64/mach-xen/asm/param.h | 22
include/asm-x86_64/mach-xen/asm/pci.h | 173 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 226 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++++
include/asm-x86_64/mach-xen/asm/processor.h | 499 +++
include/asm-x86_64/mach-xen/asm/ptrace.h | 125
include/asm-x86_64/mach-xen/asm/smp.h | 150 +
include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
include/asm-x86_64/mach-xen/asm/system.h | 346 ++
include/asm-x86_64/mach-xen/asm/timer.h | 67
include/asm-x86_64/mach-xen/asm/tlbflush.h | 103
include/asm-x86_64/mach-xen/asm/vga.h | 20
include/asm-x86_64/mach-xen/asm/xor.h | 328 ++
include/asm-x86_64/mach-xen/irq_vectors.h | 123
include/asm-x86_64/mach-xen/mach_time.h | 111
include/asm-x86_64/mach-xen/mach_timer.h | 48
include/asm-x86_64/mach-xen/setup_arch_post.h | 58
include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
include/linux/gfp.h | 6
include/linux/highmem.h | 6
include/linux/interrupt.h | 6
include/linux/mm.h | 10
include/linux/oprofile.h | 11
include/linux/pfn.h | 2
include/linux/skbuff.h | 15
include/scsi/scsi_eh.h | 1
include/xen/balloon.h | 63
include/xen/cpu_hotplug.h | 44
include/xen/driver_util.h | 16
include/xen/evtchn.h | 114
include/xen/features.h | 20
include/xen/foreign_page.h | 30
include/xen/gnttab.h | 151 +
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/acm.h | 188 +
include/xen/interface/acm_ops.h | 103
include/xen/interface/arch-ia64.h | 433 +++
include/xen/interface/arch-powerpc.h | 119
include/xen/interface/arch-x86_32.h | 233 +
include/xen/interface/arch-x86_64.h | 299 ++
include/xen/interface/callback.h | 74
include/xen/interface/dom0_ops.h | 598 ++++
include/xen/interface/event_channel.h | 233 +
include/xen/interface/features.h | 53
include/xen/interface/grant_table.h | 317 ++
include/xen/interface/hvm/hvm_info_table.h | 24
include/xen/interface/hvm/ioreq.h | 93
include/xen/interface/hvm/vmx_assist.h | 98
include/xen/interface/io/blkif.h | 87
include/xen/interface/io/console.h | 33
include/xen/interface/io/netif.h | 157 +
include/xen/interface/io/pciif.h | 55
include/xen/interface/io/ring.h | 273 +
include/xen/interface/io/tpmif.h | 59
include/xen/interface/io/xenbus.h | 45
include/xen/interface/io/xs_wire.h | 97
include/xen/interface/memory.h | 243 +
include/xen/interface/nmi.h | 60
include/xen/interface/physdev.h | 149 +
include/xen/interface/sched.h | 103
include/xen/interface/sched_ctl.h | 69
include/xen/interface/trace.h | 87
include/xen/interface/vcpu.h | 121
include/xen/interface/version.h | 70
include/xen/interface/xen-compat.h | 47
include/xen/interface/xen.h | 507 +++
include/xen/interface/xencomm.h | 37
include/xen/interface/xenoprof.h | 103
include/xen/pcifront.h | 39
include/xen/public/evtchn.h | 91
include/xen/public/privcmd.h | 79
include/xen/xen_proc.h | 13
include/xen/xenbus.h | 299 ++
include/xen/xencons.h | 14
kernel/Kconfig.preempt | 1
kernel/fork.c | 3
kernel/irq/manage.c | 1
kernel/timer.c | 16
lib/Kconfig.debug | 2
lib/Makefile | 3
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 119
mm/mmap.c | 4
mm/page_alloc.c | 6
net/core/dev.c | 63
net/core/pktgen.c | 2
net/core/skbuff.c | 42
net/ipv4/netfilter/ip_nat_proto_tcp.c | 7
net/ipv4/netfilter/ip_nat_proto_udp.c | 7
net/ipv4/xfrm4_output.c | 6
net/ipv6/addrconf.c | 2
scripts/Makefile.xen | 14
409 files changed, 85166 insertions(+), 871 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.45 -r 1.46 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- linux-2.6-xen.patch 27 Jul 2006 00:11:29 -0000 1.45
+++ linux-2.6-xen.patch 27 Jul 2006 13:05:34 -0000 1.46
@@ -1,6 +1,6 @@
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/boot-xen/Makefile 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
+--- linux-2.6/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile 2006-07-18 03:27:59.000000000 +0200
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,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 -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig 2006-07-26 05:37:14.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
+--- linux-2.6/arch/i386/Kconfig 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig 2006-07-26 17:11:03.000000000 +0200
@@ -16,10 +16,12 @@ config X86_32
config GENERIC_TIME
@@ -311,9 +311,9 @@
config KTIME_SCALAR
bool
default y
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.cpu 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
+--- linux-2.6/arch/i386/Kconfig.cpu 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu 2006-07-18 03:27:59.000000000 +0200
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -330,9 +330,9 @@
- depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
+ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
default y
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.debug 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
+--- linux-2.6/arch/i386/Kconfig.debug 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug 2006-07-22 20:37:34.000000000 +0200
@@ -2,6 +2,7 @@ menu "Kernel hacking"
config TRACE_IRQFLAGS_SUPPORT
@@ -349,9 +349,9 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/acpi/boot-xen.c 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c 2006-07-22 20:37:34.000000000 +0200
@@ -0,0 +1,1168 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1521,9 +1521,9 @@
+
+ return 0;
+}
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile compiling/arch/i386/kernel/acpi/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/acpi/Makefile 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
+--- linux-2.6/arch/i386/kernel/acpi/Makefile 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile 2006-07-18 03:27:59.000000000 +0200
@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -1532,9 +1532,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c compiling/arch/i386/kernel/alternative.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/alternative.c 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
+--- linux-2.6/arch/i386/kernel/alternative.c 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c 2006-07-22 20:37:34.000000000 +0200
@@ -4,7 +4,11 @@
#include <asm/alternative.h>
#include <asm/sections.h>
@@ -1547,9 +1547,9 @@
static int smp_alt_once = 0;
static int debug_alternative = 0;
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c compiling/arch/i386/kernel/apic-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/apic-xen.c 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
+--- linux-2.6/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c 2006-07-22 20:37:34.000000000 +0200
@@ -0,0 +1,160 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1711,9 +1711,9 @@
+
+ return 0;
+}
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c compiling/arch/i386/kernel/asm-offsets.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/asm-offsets.c 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
+--- linux-2.6/arch/i386/kernel/asm-offsets.c 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c 2006-07-22 21:45:45.000000000 +0200
@@ -66,9 +66,14 @@ void foo(void)
OFFSET(pbe_orig_address, pbe, orig_address);
OFFSET(pbe_next, pbe, next);
@@ -1730,9 +1730,9 @@
DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
DEFINE(VDSO_PRELINK, VDSO_PRELINK);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c compiling/arch/i386/kernel/cpu/common-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/common-xen.c 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c 2006-07-18 03:27:59.000000000 +0200
@@ -0,0 +1,740 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -2474,9 +2474,9 @@
+ per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
+}
+#endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile compiling/arch/i386/kernel/cpu/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/Makefile 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/Makefile 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile 2006-07-18 03:27:59.000000000 +0200
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
@@ -2486,9 +2486,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c compiling/arch/i386/kernel/cpu/mtrr/main-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-07-18 03:27:59.000000000 +0200
@@ -0,0 +1,197 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -2687,9 +2687,9 @@
+}
+
+subsys_initcall(mtrr_init);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile compiling/arch/i386/kernel/cpu/mtrr/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/mtrr/Makefile 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile 2006-07-18 03:27:59.000000000 +0200
@@ -3,3 +3,10 @@ obj-y += amd.o
obj-y += cyrix.o
obj-y += centaur.o
@@ -2701,15 +2701,15 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c compiling/arch/i386/kernel/early_printk-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/early_printk-xen.c 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
+--- linux-2.6/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c 2006-07-18 03:27:59.000000000 +0200
@@ -0,0 +1,2 @@
+
+#include "../../x86_64/kernel/early_printk-xen.c"
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S compiling/arch/i386/kernel/entry.S
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S 2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/entry.S 2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
+--- linux-2.6/arch/i386/kernel/entry.S 2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S 2006-07-22 21:45:45.000000000 +0200
@@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
CFI_STARTPROC simple
CFI_DEF_CFA esp, 0
@@ -2737,9 +2737,9 @@
pushfl; \
pushl $__KERNEL_CS; \
pushl $sysenter_past_esp
[...4888 lines suppressed...]
+--- linux-2.6/kernel/timer.c 2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/timer.c 2006-07-22 20:37:56.000000000 +0200
@@ -554,6 +554,22 @@ found:
if (time_before(expires, jiffies))
return jiffies;
@@ -89215,9 +89226,9 @@
if (time_before(hr_expires, expires))
return hr_expires;
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
---- /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug 2006-07-16 19:14:09.000000000 +0200
-+++ compiling/lib/Kconfig.debug 2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
+--- linux-2.6/lib/Kconfig.debug 2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug 2006-07-22 20:37:56.000000000 +0200
@@ -325,7 +325,7 @@ config FRAME_POINTER
config UNWIND_INFO
@@ -89227,9 +89238,9 @@
depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
help
If you say Y here the resulting kernel image will be slightly larger
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
---- /mnt/ro/repos/hg/linux-2.6/lib/Makefile 2006-07-13 00:51:41.000000000 +0200
-+++ compiling/lib/Makefile 2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
+--- linux-2.6/lib/Makefile 2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Makefile 2006-07-22 20:37:56.000000000 +0200
@@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
obj-$(CONFIG_SMP) += percpu_counter.o
@@ -89240,9 +89251,9 @@
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
---- /mnt/ro/repos/hg/linux-2.6/mm/highmem.c 2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/highmem.c 2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
+--- linux-2.6/mm/highmem.c 2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c 2006-07-22 20:37:56.000000000 +0200
@@ -142,6 +142,17 @@ start:
return vaddr;
}
@@ -89261,9 +89272,9 @@
void fastcall *kmap_high(struct page *page)
{
unsigned long vaddr;
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
---- /mnt/ro/repos/hg/linux-2.6/mm/Kconfig 2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/Kconfig 2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
+--- linux-2.6/mm/Kconfig 2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig 2006-07-22 20:37:56.000000000 +0200
@@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
# 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.
@@ -89279,9 +89290,9 @@
default "4"
#
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
---- /mnt/ro/repos/hg/linux-2.6/mm/memory.c 2006-07-16 19:14:09.000000000 +0200
-+++ compiling/mm/memory.c 2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
+--- linux-2.6/mm/memory.c 2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c 2006-07-22 20:37:57.000000000 +0200
@@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
@@ -89422,9 +89433,9 @@
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
---- /mnt/ro/repos/hg/linux-2.6/mm/mmap.c 2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/mmap.c 2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
+--- linux-2.6/mm/mmap.c 2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c 2006-07-22 20:37:57.000000000 +0200
@@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -89436,9 +89447,9 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
---- /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c 2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/page_alloc.c 2006-07-23 00:17:58.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
+--- linux-2.6/mm/page_alloc.c 2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c 2006-07-22 20:37:57.000000000 +0200
@@ -443,7 +443,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -89459,9 +89470,9 @@
if (PageAnon(page))
page->mapping = NULL;
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/dev.c 2006-07-13 00:51:41.000000000 +0200
-+++ compiling/net/core/dev.c 2006-07-23 00:46:36.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
+--- linux-2.6/net/core/dev.c 2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c 2006-07-23 03:42:00.000000000 +0200
@@ -117,6 +117,12 @@
#include <linux/dmaengine.h>
#include <linux/err.h>
@@ -89560,9 +89571,9 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c 2006-07-13 00:51:41.000000000 +0200
-+++ compiling/net/core/pktgen.c 2006-07-23 00:17:59.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
+--- linux-2.6/net/core/pktgen.c 2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/pktgen.c 2006-07-22 20:37:57.000000000 +0200
@@ -6,7 +6,7 @@
*
* Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
@@ -89572,9 +89583,9 @@
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c 2006-07-16 19:14:09.000000000 +0200
-+++ compiling/net/core/skbuff.c 2006-07-23 00:17:59.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
+--- linux-2.6/net/core/skbuff.c 2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c 2006-07-22 20:37:57.000000000 +0200
@@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
@@ -89661,9 +89672,9 @@
C(pkt_type);
C(ip_summed);
C(priority);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-07-23 00:18:01.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-07-18 03:28:34.000000000 +0200
@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
@@ -89678,9 +89689,9 @@
ip_nat_cheat_check(oldport ^ 0xFFFF,
newport,
hdr->check));
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-07-23 00:18:01.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-07-22 20:37:58.000000000 +0200
@@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
portptr = &hdr->dest;
}
@@ -89695,9 +89706,9 @@
ip_nat_cheat_check(*portptr ^ 0xFFFF,
newport,
hdr->check));
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c 2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/xfrm4_output.c 2006-07-23 00:18:03.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
+--- linux-2.6/net/ipv4/xfrm4_output.c 2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c 2006-07-22 20:37:58.000000000 +0200
@@ -18,6 +18,8 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -89718,9 +89729,9 @@
if (skb->ip_summed == CHECKSUM_HW) {
err = skb_checksum_help(skb, 0);
if (err)
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c 2006-07-16 19:14:10.000000000 +0200
-+++ compiling/net/ipv6/addrconf.c 2006-07-23 00:18:03.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
+--- linux-2.6/net/ipv6/addrconf.c 2006-07-16 19:14:10.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c 2006-07-22 20:37:58.000000000 +0200
@@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
@@ -89737,9 +89748,9 @@
(ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
struct in6_addr all_routers;
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
---- /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
-+++ compiling/scripts/Makefile.xen 2006-07-23 00:18:07.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
+--- linux-2.6/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/scripts/Makefile.xen 2006-07-18 03:28:35.000000000 +0200
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
--- linux-2.6-xen_remap_vma_flags.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch, NONE, 1.1 openoffice.org.spec, 1.797, 1.798 openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch, 1.1, NONE
- Next message (by thread): rpms/kexec-tools/devel kdump.init, 1.8, 1.9 kexec-tools.spec, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list