rpms/kernel/FC-5 kernel-2.6.spec, 1.2241, 1.2242 linux-2.6-devmem.patch, 1.8, 1.9 linux-2.6-xen-x86-unwinder.patch, 1.1, 1.2 linux-2.6-xen.patch, 1.25, 1.26
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Nov 16 22:14:37 UTC 2006
- Previous message (by thread): rpms/kernel/FC-5/scripts rebase-xen-kernel.sh,NONE,1.1
- Next message (by thread): rpms/kernel/FC-6 sources, 1.503, 1.504 .cvsignore, 1.540, 1.541 kernel-2.6.spec, 1.2850, 1.2851 xen-version-strings.patch, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: quintela
Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22882
Modified Files:
kernel-2.6.spec linux-2.6-devmem.patch
linux-2.6-xen-x86-unwinder.patch linux-2.6-xen.patch
Log Message:
- Update xen kernel patch to 3.0.3_0:
* linux-2.6.18-xen changeset: 36182:c6ef4b521aef
* xen-3.0.3-testing changeset: 11774:52ae8dd4bc75
* linux-2.6-xen-3.0.3 changeset: 22949:4281f5246814
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2241
retrieving revision 1.2242
diff -u -r1.2241 -r1.2242
--- kernel-2.6.spec 16 Nov 2006 22:11:02 -0000 1.2241
+++ kernel-2.6.spec 16 Nov 2006 22:14:34 -0000 1.2242
@@ -1658,6 +1658,10 @@
%changelog
* Thu Nov 16 2006 Juan Quintela <quintela at redhat.com>
- Update xen HV to 3.0.3_0 (cset 11774).
+- Update xen kernel patch to 3.0.3_0:
+ * linux-2.6.18-xen changeset: 36182:c6ef4b521aef
+ * xen-3.0.3-testing changeset: 11774:52ae8dd4bc75
+ * linux-2.6-xen-3.0.3 changeset: 22949:4281f5246814
* Thu Nov 16 2006 Dave Jones <davej at redhat.com>
- Fix squashfs corruption bug. (#211237)
linux-2.6-devmem.patch:
arch/powerpc/mm/mem.c | 14 ++
linux-1050/arch/i386/mm/init.c | 19 +++
linux-1050/arch/ia64/mm/init.c | 7 +
linux-1050/arch/s390/mm/init.c | 5
linux-1050/arch/x86_64/mm/init.c | 20 +++
linux-1050/drivers/char/mem.c | 143 +++----------------------
linux-1050/fs/proc/kcore.c | 2
linux-1050/include/asm-arm/page.h | 2
linux-1050/include/asm-arm26/page.h | 2
linux-1050/include/asm-cris/page.h | 2
linux-1050/include/asm-h8300/page.h | 2
linux-1050/include/asm-i386/page.h | 2
linux-1050/include/asm-m68k/page.h | 2
linux-1050/include/asm-m68knommu/page.h | 2
linux-1050/include/asm-mips/page.h | 2
linux-1050/include/asm-parisc/page.h | 2
linux-1050/include/asm-s390/page.h | 2
linux-1050/include/asm-sh/page.h | 2
linux-1050/include/asm-sh64/page.h | 2
linux-1050/include/asm-sparc/page.h | 2
linux-1050/include/asm-um/page.h | 1
linux-1050/include/asm-v850/page.h | 2
linux-1050/include/asm-x86_64/page.h | 4
linux-2.6.13/arch/x86_64/mm/init.c | 22 +++
linux-2.6.14/include/asm-powerpc/page.h | 2
linux-2.6.16.noarch/include/asm-ppc/page.h | 2
linux-2.6.17.noarch/include/asm-alpha/page.h | 2
linux-2.6.17.noarch/include/asm-ia64/page.h | 1
linux-2.6.18.noarch/include/asm-sparc64/page.h | 2
29 files changed, 152 insertions(+), 122 deletions(-)
Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-devmem.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-devmem.patch 14 Oct 2006 20:19:50 -0000 1.8
+++ linux-2.6-devmem.patch 16 Nov 2006 22:14:34 -0000 1.9
@@ -412,7 +412,7 @@
#endif /* CONFIG_XEN */
#endif /* __ASSEMBLY__ */
+#define devmem_is_allowed(x) 1
- # endif /* __KERNEL__ */
+ #endif /* __KERNEL__ */
#endif /* _ASM_IA64_PAGE_H */
diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-m68k/page.h linux-1050/include/asm-m68k/page.h
--- linux-1020/include/asm-m68k/page.h
linux-2.6-xen-x86-unwinder.patch:
include/asm-i386/mach-xen/asm/stacktrace.h | 18 +++
include/asm-x86_64/mach-xen/asm/stacktrace.h | 18 +++
linux-2.6.18.noarch/arch/i386/kernel/traps-xen.c | 110 +++++++++++++++------
linux-2.6.18.noarch/arch/x86_64/kernel/traps-xen.c | 100 ++++++++++++++-----
4 files changed, 195 insertions(+), 51 deletions(-)
Index: linux-2.6-xen-x86-unwinder.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-x86-unwinder.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-x86-unwinder.patch 10 Oct 2006 05:04:22 -0000 1.1
+++ linux-2.6-xen-x86-unwinder.patch 16 Nov 2006 22:14:34 -0000 1.2
@@ -1,5 +1,6 @@
---- linux-2.6.18.noarch/arch/x86_64/kernel/traps-xen.c~ 2006-10-04 01:43:48.000000000 -0400
-+++ linux-2.6.18.noarch/arch/x86_64/kernel/traps-xen.c 2006-10-04 01:50:55.000000000 -0400
+diff -uNp linux-2.6.18.noarch/arch/x86_64/kernel/traps-xen.c.orig linux-2.6.18.noarch/arch/x86_64/kernel/traps-xen.c
+--- linux-2.6.18.noarch/arch/x86_64/kernel/traps-xen.c.orig 2006-11-16 22:32:30.000000000 +0100
++++ linux-2.6.18.noarch/arch/x86_64/kernel/traps-xen.c 2006-11-16 22:32:30.000000000 +0100
@@ -45,6 +45,7 @@
#include <asm/pda.h>
#include <asm/proto.h>
@@ -8,7 +9,7 @@
asmlinkage void divide_error(void);
asmlinkage void debug(void);
-@@ -144,7 +145,7 @@ void printk_address(unsigned long addres
+@@ -141,7 +142,7 @@ void printk_address(unsigned long addres
#endif
static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
@@ -17,7 +18,7 @@
{
#ifndef CONFIG_X86_NO_TSS
static char ids[][8] = {
-@@ -238,15 +239,21 @@ static unsigned long *in_exception_stack
+@@ -235,15 +236,21 @@ static unsigned long *in_exception_stack
return NULL;
}
@@ -41,7 +42,7 @@
}
return n;
}
-@@ -258,46 +265,53 @@ static int show_trace_unwind(struct unwi
+@@ -255,46 +262,53 @@ static int show_trace_unwind(struct unwi
* severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
*/
@@ -106,7 +107,7 @@
/*
* Print function call entries within a stack. 'cond' is the
* "end of stackframe" condition, that the 'stack++'
-@@ -315,7 +329,7 @@ void show_trace(struct task_struct *tsk,
+@@ -312,7 +326,7 @@ void show_trace(struct task_struct *tsk,
* down the cause of the crash will be able to figure \
* out the call path that was taken. \
*/ \
@@ -115,7 +116,7 @@
} \
} while (0)
-@@ -324,16 +338,17 @@ void show_trace(struct task_struct *tsk,
+@@ -321,16 +335,17 @@ void show_trace(struct task_struct *tsk,
* current stack address. If the stacks consist of nested
* exceptions
*/
@@ -137,7 +138,7 @@
/*
* We link to the next stack via the
* second-to-last pointer (index -2 to end) in the
-@@ -348,7 +363,8 @@ void show_trace(struct task_struct *tsk,
+@@ -345,7 +360,8 @@ void show_trace(struct task_struct *tsk,
(IRQSTACKSIZE - 64) / sizeof(*irqstack);
if (stack >= irqstack && stack < irqstack_end) {
@@ -147,7 +148,7 @@
HANDLE_STACK (stack < irqstack_end);
/*
* We link to the next stack (which would be
-@@ -357,7 +373,7 @@ void show_trace(struct task_struct *tsk,
+@@ -354,7 +370,7 @@ void show_trace(struct task_struct *tsk,
*/
stack = (unsigned long *) (irqstack_end[-1]);
irqstack_end = NULL;
@@ -156,7 +157,7 @@
continue;
}
}
-@@ -365,15 +381,53 @@ void show_trace(struct task_struct *tsk,
+@@ -362,15 +378,53 @@ void show_trace(struct task_struct *tsk,
}
/*
@@ -212,6 +213,7 @@
{
unsigned long *stack;
int i;
+diff
--- vanilla/include/asm-x86_64/mach-xen/asm/stacktrace.h 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.18.noarch/include/asm-x86_64/mach-xen/asm/stacktrace.h 2006-10-04 00:39:51.000000000 -0400
@@ -0,0 +1,18 @@
@@ -233,6 +235,7 @@
+ struct stacktrace_ops *ops, void *data);
+
+#endif
+diff
--- vanilla/include/asm-i386/mach-xen/asm/stacktrace.h 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.18.noarch/include/asm-i386/mach-xen/asm/stacktrace.h 2006-10-04 00:39:51.000000000 -0400
@@ -0,0 +1,18 @@
@@ -254,9 +257,9 @@
+ struct stacktrace_ops *ops, void *data);
+
+#endif
-
---- linux-2.6.18.noarch/arch/i386/kernel/traps-xen.c~ 2006-10-04 02:48:02.000000000 -0400
-+++ linux-2.6.18.noarch/arch/i386/kernel/traps-xen.c 2006-10-04 02:59:26.000000000 -0400
+diff -uNp linux-2.6.18.noarch/arch/i386/kernel/traps-xen.c.orig linux-2.6.18.noarch/arch/i386/kernel/traps-xen.c
+--- linux-2.6.18.noarch/arch/i386/kernel/traps-xen.c.orig 2006-11-16 22:55:31.000000000 +0100
++++ linux-2.6.18.noarch/arch/i386/kernel/traps-xen.c 2006-11-16 22:59:24.000000000 +0100
@@ -51,6 +51,7 @@
#include <asm/smp.h>
#include <asm/arch_hooks.h>
@@ -265,7 +268,7 @@
#include <linux/module.h>
-@@ -126,26 +127,16 @@ static inline int valid_stack_ptr(struct
+@@ -124,26 +125,16 @@ static inline int valid_stack_ptr(struct
p < (void *)tinfo + THREAD_SIZE - 3;
}
@@ -294,7 +297,7 @@
/*
* break out of recursive entries (such as
* end_of_stack_stop_unwind_function):
-@@ -158,28 +149,35 @@ static inline unsigned long print_contex
+@@ -156,28 +147,35 @@ static inline unsigned long print_contex
while (valid_stack_ptr(tinfo, stack)) {
addr = *stack++;
if (__kernel_text_address(addr))
@@ -335,7 +338,7 @@
{
unsigned long ebp;
-@@ -189,30 +187,38 @@ static void show_trace_log_lvl(struct ta
+@@ -187,31 +185,38 @@ static void show_trace_log_lvl(struct ta
if (call_trace >= 0) {
int unw_ret = 0;
struct unwind_frame_info info;
@@ -367,10 +370,10 @@
+ ops->warning(data, "Full inexact backtrace again:\n");
} else if (call_trace >= 1)
return;
-+ else
+ else
+- printk("Full inexact backtrace again:\n");
+ ops->warning(data, "Full inexact backtrace again:\n");
} else
-- printk("Full inexact backtrace again:\n");
- printk("Inexact backtrace:\n");
+ ops->warning(data, "Inexact backtrace:\n");
+
@@ -382,7 +385,7 @@
}
if (task == current) {
-@@ -227,15 +233,64 @@ static void show_trace_log_lvl(struct ta
+@@ -226,15 +231,64 @@ static void show_trace_log_lvl(struct ta
struct thread_info *context;
context = (struct thread_info *)
((unsigned long)stack & (~(THREAD_SIZE - 1)));
linux-2.6-xen.patch:
linux-2.6.18-xen/arch/i386/Kconfig.cpu | 4
linux-2.6.18-xen/arch/i386/Kconfig.debug | 1
linux-2.6.18-xen/arch/i386/Makefile | 24
linux-2.6.18-xen/arch/i386/boot-xen/Makefile | 21
linux-2.6.18-xen/arch/i386/kernel/acpi/Makefile | 4
linux-2.6.18-xen/arch/i386/kernel/acpi/boot-xen.c | 1168 ++++
linux-2.6.18-xen/arch/i386/kernel/alternative.c | 8
linux-2.6.18-xen/arch/i386/kernel/apic-xen.c | 160
linux-2.6.18-xen/arch/i386/kernel/asm-offsets.c | 7
linux-2.6.18-xen/arch/i386/kernel/cpu/Makefile | 5
linux-2.6.18-xen/arch/i386/kernel/cpu/common-xen.c | 739 ++
linux-2.6.18-xen/arch/i386/kernel/cpu/mtrr/Makefile | 7
linux-2.6.18-xen/arch/i386/kernel/cpu/mtrr/main-xen.c | 197
linux-2.6.18-xen/arch/i386/kernel/early_printk-xen.c | 2
linux-2.6.18-xen/arch/i386/kernel/entry-xen.S | 1213 ++++
linux-2.6.18-xen/arch/i386/kernel/fixup.c | 92
linux-2.6.18-xen/arch/i386/kernel/head-xen.S | 200
linux-2.6.18-xen/arch/i386/kernel/init_task-xen.c | 51
linux-2.6.18-xen/arch/i386/kernel/io_apic-xen.c | 2771 ++++++++++
linux-2.6.18-xen/arch/i386/kernel/ioport-xen.c | 121
linux-2.6.18-xen/arch/i386/kernel/irq-xen.c | 324 +
linux-2.6.18-xen/arch/i386/kernel/ldt-xen.c | 270
linux-2.6.18-xen/arch/i386/kernel/microcode-xen.c | 147
linux-2.6.18-xen/arch/i386/kernel/mpparse-xen.c | 1185 ++++
linux-2.6.18-xen/arch/i386/kernel/pci-dma-xen.c | 379 +
linux-2.6.18-xen/arch/i386/kernel/process-xen.c | 812 ++
linux-2.6.18-xen/arch/i386/kernel/quirks-xen.c | 47
linux-2.6.18-xen/arch/i386/kernel/setup-xen.c | 1835 ++++++
linux-2.6.18-xen/arch/i386/kernel/smp-xen.c | 624 ++
linux-2.6.18-xen/arch/i386/kernel/swiotlb.c | 672 ++
linux-2.6.18-xen/arch/i386/kernel/sysenter.c | 22
linux-2.6.18-xen/arch/i386/kernel/time-xen.c | 1101 +++
linux-2.6.18-xen/arch/i386/kernel/traps-xen.c | 1185 ++++
linux-2.6.18-xen/arch/i386/kernel/traps.c | 9
linux-2.6.18-xen/arch/i386/kernel/tsc.c | 2
linux-2.6.18-xen/arch/i386/kernel/vm86.c | 12
linux-2.6.18-xen/arch/i386/kernel/vmlinux.lds.S | 12
linux-2.6.18-xen/arch/i386/kernel/vsyscall-note-xen.S | 32
linux-2.6.18-xen/arch/i386/lib/delay.c | 3
linux-2.6.18-xen/arch/i386/mach-xen/Makefile | 5
linux-2.6.18-xen/arch/i386/mach-xen/irqflags.c | 99
linux-2.6.18-xen/arch/i386/mach-xen/setup.c | 153
linux-2.6.18-xen/arch/i386/mm/Makefile | 8
linux-2.6.18-xen/arch/i386/mm/fault-xen.c | 770 ++
linux-2.6.18-xen/arch/i386/mm/highmem-xen.c | 133
linux-2.6.18-xen/arch/i386/mm/hypervisor.c | 457 +
linux-2.6.18-xen/arch/i386/mm/init-xen.c | 851 +++
linux-2.6.18-xen/arch/i386/mm/ioremap-xen.c | 443 +
linux-2.6.18-xen/arch/i386/mm/pageattr.c | 2
linux-2.6.18-xen/arch/i386/mm/pgtable-xen.c | 699 ++
linux-2.6.18-xen/arch/i386/oprofile/Makefile | 4
linux-2.6.18-xen/arch/i386/oprofile/xenoprof.c | 584 ++
linux-2.6.18-xen/arch/i386/pci/Makefile | 9
linux-2.6.18-xen/arch/i386/pci/irq-xen.c | 1206 ++++
linux-2.6.18-xen/arch/i386/pci/pcifront.c | 55
linux-2.6.18-xen/arch/i386/power/Makefile | 4
linux-2.6.18-xen/arch/ia64/Kconfig | 60
linux-2.6.18-xen/arch/ia64/Makefile | 16
linux-2.6.18-xen/arch/ia64/dig/setup.c | 17
linux-2.6.18-xen/arch/ia64/hp/sim/Makefile | 2
linux-2.6.18-xen/arch/ia64/kernel/asm-offsets.c | 25
linux-2.6.18-xen/arch/ia64/kernel/entry.S | 32
linux-2.6.18-xen/arch/ia64/kernel/gate.S | 113
linux-2.6.18-xen/arch/ia64/kernel/gate.lds.S | 22
linux-2.6.18-xen/arch/ia64/kernel/head.S | 6
linux-2.6.18-xen/arch/ia64/kernel/iosapic.c | 65
linux-2.6.18-xen/arch/ia64/kernel/irq_ia64.c | 259
linux-2.6.18-xen/arch/ia64/kernel/pal.S | 5
linux-2.6.18-xen/arch/ia64/kernel/patch.c | 71
linux-2.6.18-xen/arch/ia64/kernel/setup.c | 125
linux-2.6.18-xen/arch/ia64/mm/ioremap.c | 3
linux-2.6.18-xen/arch/ia64/xen/Makefile | 8
linux-2.6.18-xen/arch/ia64/xen/drivers/README | 2
linux-2.6.18-xen/arch/ia64/xen/hypercall.S | 413 +
linux-2.6.18-xen/arch/ia64/xen/hypervisor.c | 847 +++
linux-2.6.18-xen/arch/ia64/xen/util.c | 115
linux-2.6.18-xen/arch/ia64/xen/xenentry.S | 867 +++
linux-2.6.18-xen/arch/ia64/xen/xenhpski.c | 19
linux-2.6.18-xen/arch/ia64/xen/xenivt.S | 2169 +++++++
linux-2.6.18-xen/arch/ia64/xen/xenminstate.h | 368 +
linux-2.6.18-xen/arch/ia64/xen/xenpal.S | 76
linux-2.6.18-xen/arch/ia64/xen/xensetup.S | 54
linux-2.6.18-xen/arch/um/kernel/physmem.c | 4
linux-2.6.18-xen/arch/x86_64/Kconfig | 63
linux-2.6.18-xen/arch/x86_64/Makefile | 20
linux-2.6.18-xen/arch/x86_64/ia32/Makefile | 20
linux-2.6.18-xen/arch/x86_64/ia32/ia32entry-xen.S | 743 ++
linux-2.6.18-xen/arch/x86_64/ia32/syscall32-xen.c | 128
linux-2.6.18-xen/arch/x86_64/ia32/syscall32_syscall-xen.S | 28
linux-2.6.18-xen/arch/x86_64/ia32/vsyscall-int80.S | 58
linux-2.6.18-xen/arch/x86_64/ia32/vsyscall-sigreturn.S | 2
linux-2.6.18-xen/arch/x86_64/kernel/Makefile | 19
linux-2.6.18-xen/arch/x86_64/kernel/acpi/Makefile | 1
linux-2.6.18-xen/arch/x86_64/kernel/apic-xen.c | 197
linux-2.6.18-xen/arch/x86_64/kernel/asm-offsets.c | 2
linux-2.6.18-xen/arch/x86_64/kernel/e820-xen.c | 757 ++
linux-2.6.18-xen/arch/x86_64/kernel/early_printk-xen.c | 304 +
linux-2.6.18-xen/arch/x86_64/kernel/entry-xen.S | 1213 ++++
linux-2.6.18-xen/arch/x86_64/kernel/genapic-xen.c | 143
linux-2.6.18-xen/arch/x86_64/kernel/genapic_xen.c | 176
linux-2.6.18-xen/arch/x86_64/kernel/head-xen.S | 191
linux-2.6.18-xen/arch/x86_64/kernel/head64-xen.c | 161
linux-2.6.18-xen/arch/x86_64/kernel/init_task.c | 3
linux-2.6.18-xen/arch/x86_64/kernel/io_apic-xen.c | 2263 ++++++++
linux-2.6.18-xen/arch/x86_64/kernel/ioport-xen.c | 99
linux-2.6.18-xen/arch/x86_64/kernel/irq-xen.c | 198
linux-2.6.18-xen/arch/x86_64/kernel/irqflags-xen.c | 100
linux-2.6.18-xen/arch/x86_64/kernel/ldt-xen.c | 282 +
linux-2.6.18-xen/arch/x86_64/kernel/mpparse-xen.c | 1011 +++
linux-2.6.18-xen/arch/x86_64/kernel/pci-swiotlb-xen.c | 54
linux-2.6.18-xen/arch/x86_64/kernel/process-xen.c | 793 ++
linux-2.6.18-xen/arch/x86_64/kernel/setup-xen.c | 1637 +++++
linux-2.6.18-xen/arch/x86_64/kernel/setup64-xen.c | 361 +
linux-2.6.18-xen/arch/x86_64/kernel/smp-xen.c | 600 ++
linux-2.6.18-xen/arch/x86_64/kernel/traps-xen.c | 1172 ++++
linux-2.6.18-xen/arch/x86_64/kernel/vmlinux.lds.S | 31
linux-2.6.18-xen/arch/x86_64/kernel/vsyscall-xen.c | 239
linux-2.6.18-xen/arch/x86_64/kernel/xen_entry.S | 40
linux-2.6.18-xen/arch/x86_64/mm/Makefile | 10
linux-2.6.18-xen/arch/x86_64/mm/fault-xen.c | 723 ++
linux-2.6.18-xen/arch/x86_64/mm/init-xen.c | 1200 ++++
linux-2.6.18-xen/arch/x86_64/mm/pageattr-xen.c | 398 +
linux-2.6.18-xen/arch/x86_64/oprofile/Makefile | 5
linux-2.6.18-xen/arch/x86_64/pci/Makefile | 12
linux-2.6.18-xen/drivers/Makefile | 1
linux-2.6.18-xen/drivers/acpi/Kconfig | 3
linux-2.6.18-xen/drivers/char/hangcheck-timer.c | 2
linux-2.6.18-xen/drivers/char/mem.c | 6
linux-2.6.18-xen/drivers/char/tpm/Kconfig | 12
linux-2.6.18-xen/drivers/char/tpm/Makefile | 2
linux-2.6.18-xen/drivers/char/tpm/tpm.c | 55
linux-2.6.18-xen/drivers/char/tpm/tpm.h | 7
linux-2.6.18-xen/drivers/char/tpm/tpm_vtpm.c | 547 +
linux-2.6.18-xen/drivers/char/tpm/tpm_vtpm.h | 68
linux-2.6.18-xen/drivers/char/tpm/tpm_xen.c | 756 ++
linux-2.6.18-xen/drivers/char/tty_io.c | 7
linux-2.6.18-xen/drivers/firmware/Kconfig | 2
linux-2.6.18-xen/drivers/ide/ide-lib.c | 8
linux-2.6.18-xen/drivers/oprofile/buffer_sync.c | 66
linux-2.6.18-xen/drivers/oprofile/cpu_buffer.c | 51
linux-2.6.18-xen/drivers/oprofile/cpu_buffer.h | 9
linux-2.6.18-xen/drivers/oprofile/event_buffer.h | 7
linux-2.6.18-xen/drivers/oprofile/oprof.c | 32
linux-2.6.18-xen/drivers/oprofile/oprof.h | 3
linux-2.6.18-xen/drivers/oprofile/oprofile_files.c | 207
linux-2.6.18-xen/drivers/pci/Kconfig | 1
linux-2.6.18-xen/drivers/serial/Kconfig | 1
linux-2.6.18-xen/drivers/xen/Kconfig | 260
linux-2.6.18-xen/drivers/xen/Makefile | 17
linux-2.6.18-xen/drivers/xen/balloon/Makefile | 2
linux-2.6.18-xen/drivers/xen/balloon/balloon.c | 637 ++
linux-2.6.18-xen/drivers/xen/blkback/Makefile | 3
linux-2.6.18-xen/drivers/xen/blkback/blkback.c | 549 +
linux-2.6.18-xen/drivers/xen/blkback/common.h | 133
linux-2.6.18-xen/drivers/xen/blkback/interface.c | 171
linux-2.6.18-xen/drivers/xen/blkback/vbd.c | 119
linux-2.6.18-xen/drivers/xen/blkback/xenbus.c | 468 +
linux-2.6.18-xen/drivers/xen/blkfront/Kconfig | 6
linux-2.6.18-xen/drivers/xen/blkfront/Makefile | 5
linux-2.6.18-xen/drivers/xen/blkfront/blkfront.c | 846 +++
linux-2.6.18-xen/drivers/xen/blkfront/block.h | 154
linux-2.6.18-xen/drivers/xen/blkfront/vbd.c | 318 +
linux-2.6.18-xen/drivers/xen/blktap/Makefile | 6
linux-2.6.18-xen/drivers/xen/blktap/blktapmain.c | 1393 +++++
linux-2.6.18-xen/drivers/xen/blktap/common.h | 120
linux-2.6.18-xen/drivers/xen/blktap/interface.c | 164
linux-2.6.18-xen/drivers/xen/blktap/xenbus.c | 366 +
linux-2.6.18-xen/drivers/xen/char/Makefile | 2
linux-2.6.18-xen/drivers/xen/char/mem.c | 180
linux-2.6.18-xen/drivers/xen/console/Makefile | 2
linux-2.6.18-xen/drivers/xen/console/console.c | 688 ++
linux-2.6.18-xen/drivers/xen/console/xencons_ring.c | 143
linux-2.6.18-xen/drivers/xen/core/Makefile | 13
linux-2.6.18-xen/drivers/xen/core/cpu_hotplug.c | 188
linux-2.6.18-xen/drivers/xen/core/evtchn.c | 868 +++
linux-2.6.18-xen/drivers/xen/core/features.c | 30
linux-2.6.18-xen/drivers/xen/core/gnttab.c | 483 +
linux-2.6.18-xen/drivers/xen/core/hypervisor_sysfs.c | 59
linux-2.6.18-xen/drivers/xen/core/reboot.c | 384 +
linux-2.6.18-xen/drivers/xen/core/skbuff.c | 144
linux-2.6.18-xen/drivers/xen/core/smpboot.c | 429 +
linux-2.6.18-xen/drivers/xen/core/xen_proc.c | 18
linux-2.6.18-xen/drivers/xen/core/xen_sysfs.c | 378 +
linux-2.6.18-xen/drivers/xen/evtchn/Makefile | 2
linux-2.6.18-xen/drivers/xen/evtchn/evtchn.c | 456 +
linux-2.6.18-xen/drivers/xen/netback/Makefile | 5
linux-2.6.18-xen/drivers/xen/netback/common.h | 141
linux-2.6.18-xen/drivers/xen/netback/interface.c | 352 +
linux-2.6.18-xen/drivers/xen/netback/loopback.c | 320 +
linux-2.6.18-xen/drivers/xen/netback/netback.c | 1510 +++++
linux-2.6.18-xen/drivers/xen/netback/xenbus.c | 438 +
linux-2.6.18-xen/drivers/xen/netfront/Kconfig | 6
linux-2.6.18-xen/drivers/xen/netfront/Makefile | 4
linux-2.6.18-xen/drivers/xen/netfront/netfront.c | 2138 +++++++
linux-2.6.18-xen/drivers/xen/pciback/Makefile | 15
linux-2.6.18-xen/drivers/xen/pciback/conf_space.c | 425 +
linux-2.6.18-xen/drivers/xen/pciback/conf_space.h | 126
linux-2.6.18-xen/drivers/xen/pciback/conf_space_capability.c | 71
linux-2.6.18-xen/drivers/xen/pciback/conf_space_capability.h | 23
linux-2.6.18-xen/drivers/xen/pciback/conf_space_capability_pm.c | 113
linux-2.6.18-xen/drivers/xen/pciback/conf_space_capability_vpd.c | 42
linux-2.6.18-xen/drivers/xen/pciback/conf_space_header.c | 299 +
linux-2.6.18-xen/drivers/xen/pciback/conf_space_quirks.c | 128
linux-2.6.18-xen/drivers/xen/pciback/conf_space_quirks.h | 35
linux-2.6.18-xen/drivers/xen/pciback/passthrough.c | 157
linux-2.6.18-xen/drivers/xen/pciback/pci_stub.c | 916 +++
linux-2.6.18-xen/drivers/xen/pciback/pciback.h | 93
linux-2.6.18-xen/drivers/xen/pciback/pciback_ops.c | 95
linux-2.6.18-xen/drivers/xen/pciback/slot.c | 151
linux-2.6.18-xen/drivers/xen/pciback/vpci.c | 204
linux-2.6.18-xen/drivers/xen/pciback/xenbus.c | 458 +
linux-2.6.18-xen/drivers/xen/pcifront/Makefile | 7
linux-2.6.18-xen/drivers/xen/pcifront/pci.c | 46
linux-2.6.18-xen/drivers/xen/pcifront/pci_op.c | 273
linux-2.6.18-xen/drivers/xen/pcifront/pcifront.h | 40
linux-2.6.18-xen/drivers/xen/pcifront/xenbus.c | 295 +
linux-2.6.18-xen/drivers/xen/privcmd/Makefile | 2
linux-2.6.18-xen/drivers/xen/privcmd/privcmd.c | 294 +
linux-2.6.18-xen/drivers/xen/tpmback/Makefile | 4
linux-2.6.18-xen/drivers/xen/tpmback/common.h | 86
linux-2.6.18-xen/drivers/xen/tpmback/interface.c | 182
linux-2.6.18-xen/drivers/xen/tpmback/tpmback.c | 944 +++
linux-2.6.18-xen/drivers/xen/tpmback/xenbus.c | 287 +
linux-2.6.18-xen/drivers/xen/util.c | 70
linux-2.6.18-xen/drivers/xen/xenbus/Makefile | 12
linux-2.6.18-xen/drivers/xen/xenbus/xenbus_backend_client.c | 147
linux-2.6.18-xen/drivers/xen/xenbus/xenbus_client.c | 299 +
linux-2.6.18-xen/drivers/xen/xenbus/xenbus_comms.c | 203
linux-2.6.18-xen/drivers/xen/xenbus/xenbus_comms.h | 45
linux-2.6.18-xen/drivers/xen/xenbus/xenbus_dev.c | 356 +
linux-2.6.18-xen/drivers/xen/xenbus/xenbus_probe.c | 1189 ++++
linux-2.6.18-xen/drivers/xen/xenbus/xenbus_xs.c | 853 +++
linux-2.6.18-xen/fs/Kconfig | 1
linux-2.6.18-xen/include/asm-generic/vmlinux.lds.h | 3
linux-2.6.18-xen/include/asm-i386/apic.h | 2
linux-2.6.18-xen/include/asm-i386/fixmap.h | 1
linux-2.6.18-xen/include/asm-i386/mach-default/mach_traps.h | 12
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/agp.h | 37
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/desc.h | 164
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/dma-mapping.h | 151
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/fixmap.h | 156
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/floppy.h | 147
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/highmem.h | 80
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/hw_irq.h | 72
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/hypercall.h | 389 +
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/hypervisor.h | 234
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/io.h | 389 +
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/irqflags.h | 80
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/kmap_types.h | 31
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/maddr.h | 160
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/mmu.h | 29
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/mmu_context.h | 108
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/page.h | 220
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/param.h | 23
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/pci.h | 153
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/pgalloc.h | 63
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/pgtable-2level.h | 87
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/pgtable-3level.h | 185
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/pgtable.h | 508 +
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/processor.h | 741 ++
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/ptrace.h | 90
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/scatterlist.h | 22
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/segment.h | 117
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/setup.h | 81
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/smp.h | 103
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/spinlock.h | 190
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/swiotlb.h | 41
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/synch_bitops.h | 141
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/system.h | 495 +
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/timer.h | 70
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/tlbflush.h | 101
linux-2.6.18-xen/include/asm-i386/mach-xen/asm/vga.h | 20
linux-2.6.18-xen/include/asm-i386/mach-xen/irq_vectors.h | 125
linux-2.6.18-xen/include/asm-i386/mach-xen/mach_traps.h | 33
linux-2.6.18-xen/include/asm-i386/mach-xen/setup_arch.h | 5
linux-2.6.18-xen/include/asm-i386/pgtable-2level-defs.h | 2
linux-2.6.18-xen/include/asm-i386/pgtable-3level-defs.h | 2
linux-2.6.18-xen/include/asm-ia64/agp.h | 31
linux-2.6.18-xen/include/asm-ia64/dma-mapping.h | 99
linux-2.6.18-xen/include/asm-ia64/fixmap.h | 2
linux-2.6.18-xen/include/asm-ia64/gcc_intrin.h | 60
linux-2.6.18-xen/include/asm-ia64/hw_irq.h | 10
linux-2.6.18-xen/include/asm-ia64/hypercall.h | 423 +
linux-2.6.18-xen/include/asm-ia64/hypervisor.h | 219
linux-2.6.18-xen/include/asm-ia64/intel_intrin.h | 68
linux-2.6.18-xen/include/asm-ia64/io.h | 34
linux-2.6.18-xen/include/asm-ia64/iosapic.h | 2
linux-2.6.18-xen/include/asm-ia64/irq.h | 31
linux-2.6.18-xen/include/asm-ia64/machvec_dig.h | 15
linux-2.6.18-xen/include/asm-ia64/maddr.h | 92
linux-2.6.18-xen/include/asm-ia64/meminit.h | 5
linux-2.6.18-xen/include/asm-ia64/page.h | 52
linux-2.6.18-xen/include/asm-ia64/pal.h | 1
linux-2.6.18-xen/include/asm-ia64/pgalloc.h | 4
linux-2.6.18-xen/include/asm-ia64/privop.h | 59
linux-2.6.18-xen/include/asm-ia64/processor.h | 1
linux-2.6.18-xen/include/asm-ia64/synch_bitops.h | 61
linux-2.6.18-xen/include/asm-ia64/system.h | 4
linux-2.6.18-xen/include/asm-ia64/xen/privop.h | 304 +
linux-2.6.18-xen/include/asm-um/page.h | 2
linux-2.6.18-xen/include/asm-x86_64/apic.h | 2
linux-2.6.18-xen/include/asm-x86_64/ipi.h | 2
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/bootsetup.h | 42
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/desc.h | 263
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/dma-mapping.h | 207
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/dmi.h | 29
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/e820.h | 64
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/fixmap.h | 113
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/floppy.h | 206
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/hw_irq.h | 136
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/hypercall.h | 389 +
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/io.h | 327 +
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/irq.h | 38
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/irqflags.h | 65
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/maddr.h | 139
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/mmu.h | 38
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/mmu_context.h | 135
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/msr.h | 399 +
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/nmi.h | 93
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/page.h | 208
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/param.h | 22
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/pci.h | 173
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 226
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 558 ++
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/processor.h | 503 +
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/ptrace.h | 125
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/smp.h | 150
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/system.h | 264
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/timer.h | 67
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/tlbflush.h | 103
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/vga.h | 20
linux-2.6.18-xen/include/asm-x86_64/mach-xen/asm/xor.h | 328 +
linux-2.6.18-xen/include/asm-x86_64/mach-xen/irq_vectors.h | 123
linux-2.6.18-xen/include/asm-x86_64/mach-xen/mach_time.h | 111
linux-2.6.18-xen/include/asm-x86_64/mach-xen/mach_timer.h | 48
linux-2.6.18-xen/include/asm-x86_64/mach-xen/setup_arch_post.h | 58
linux-2.6.18-xen/include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
linux-2.6.18-xen/include/linux/elfnote.h | 90
linux-2.6.18-xen/include/linux/gfp.h | 6
linux-2.6.18-xen/include/linux/highmem.h | 6
linux-2.6.18-xen/include/linux/interrupt.h | 6
linux-2.6.18-xen/include/linux/mm.h | 10
linux-2.6.18-xen/include/linux/oprofile.h | 11
linux-2.6.18-xen/include/linux/pfn.h | 4
linux-2.6.18-xen/include/linux/skbuff.h | 15
linux-2.6.18-xen/include/xen/balloon.h | 57
linux-2.6.18-xen/include/xen/cpu_hotplug.h | 43
linux-2.6.18-xen/include/xen/driver_util.h | 15
linux-2.6.18-xen/include/xen/evtchn.h | 113
linux-2.6.18-xen/include/xen/features.h | 20
linux-2.6.18-xen/include/xen/foreign_page.h | 30
linux-2.6.18-xen/include/xen/gnttab.h | 150
linux-2.6.18-xen/include/xen/hvm.h | 24
linux-2.6.18-xen/include/xen/hypervisor_sysfs.h | 32
linux-2.6.18-xen/include/xen/interface/acm.h | 187
linux-2.6.18-xen/include/xen/interface/acm_ops.h | 102
linux-2.6.18-xen/include/xen/interface/arch-ia64.h | 448 +
linux-2.6.18-xen/include/xen/interface/arch-powerpc.h | 115
linux-2.6.18-xen/include/xen/interface/arch-x86_32.h | 255
linux-2.6.18-xen/include/xen/interface/arch-x86_64.h | 322 +
linux-2.6.18-xen/include/xen/interface/callback.h | 74
linux-2.6.18-xen/include/xen/interface/dom0_ops.h | 102
linux-2.6.18-xen/include/xen/interface/domctl.h | 392 +
linux-2.6.18-xen/include/xen/interface/elfnote.h | 133
linux-2.6.18-xen/include/xen/interface/event_channel.h | 233
linux-2.6.18-xen/include/xen/interface/features.h | 53
linux-2.6.18-xen/include/xen/interface/grant_table.h | 362 +
linux-2.6.18-xen/include/xen/interface/hvm/e820.h | 32
linux-2.6.18-xen/include/xen/interface/hvm/hvm_info_table.h | 22
linux-2.6.18-xen/include/xen/interface/hvm/ioreq.h | 99
linux-2.6.18-xen/include/xen/interface/hvm/params.h | 24
linux-2.6.18-xen/include/xen/interface/hvm/vmx_assist.h | 98
linux-2.6.18-xen/include/xen/interface/io/blkif.h | 87
linux-2.6.18-xen/include/xen/interface/io/console.h | 33
linux-2.6.18-xen/include/xen/interface/io/netif.h | 166
linux-2.6.18-xen/include/xen/interface/io/pciif.h | 55
linux-2.6.18-xen/include/xen/interface/io/ring.h | 273
linux-2.6.18-xen/include/xen/interface/io/tpmif.h | 59
linux-2.6.18-xen/include/xen/interface/io/xenbus.h | 45
linux-2.6.18-xen/include/xen/interface/io/xs_wire.h | 97
linux-2.6.18-xen/include/xen/interface/memory.h | 243
linux-2.6.18-xen/include/xen/interface/nmi.h | 60
linux-2.6.18-xen/include/xen/interface/physdev.h | 149
linux-2.6.18-xen/include/xen/interface/platform.h | 125
linux-2.6.18-xen/include/xen/interface/sched.h | 103
linux-2.6.18-xen/include/xen/interface/sysctl.h | 151
linux-2.6.18-xen/include/xen/interface/trace.h | 87
linux-2.6.18-xen/include/xen/interface/vcpu.h | 121
linux-2.6.18-xen/include/xen/interface/version.h | 73
linux-2.6.18-xen/include/xen/interface/xen-compat.h | 26
linux-2.6.18-xen/include/xen/interface/xen.h | 581 ++
linux-2.6.18-xen/include/xen/interface/xencomm.h | 37
linux-2.6.18-xen/include/xen/interface/xenoprof.h | 110
linux-2.6.18-xen/include/xen/pcifront.h | 76
linux-2.6.18-xen/include/xen/public/evtchn.h | 88
linux-2.6.18-xen/include/xen/public/privcmd.h | 79
linux-2.6.18-xen/include/xen/xen_proc.h | 12
linux-2.6.18-xen/include/xen/xenbus.h | 306 +
linux-2.6.18-xen/include/xen/xencons.h | 17
linux-2.6.18-xen/kernel/Kconfig.preempt | 1
linux-2.6.18-xen/kernel/fork.c | 3
linux-2.6.18-xen/kernel/irq/manage.c | 1
linux-2.6.18-xen/lib/Kconfig.debug | 2
linux-2.6.18-xen/lib/Makefile | 3
linux-2.6.18-xen/mm/Kconfig | 4
linux-2.6.18-xen/mm/highmem.c | 11
linux-2.6.18-xen/mm/memory.c | 120
linux-2.6.18-xen/mm/mmap.c | 4
linux-2.6.18-xen/mm/page_alloc.c | 6
linux-2.6.18-xen/net/core/dev.c | 63
linux-2.6.18-xen/net/core/skbuff.c | 27
linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_tcp.c | 7
linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_udp.c | 7
linux-2.6.18-xen/net/ipv4/xfrm4_output.c | 6
linux-2.6.18-xen/net/ipv6/addrconf.c | 2
linux-2.6.18-xen/scripts/Makefile.xen | 14
linux-2.6.18.noarch/arch/i386/Kconfig | 85
linux-2.6.18.noarch/arch/i386/kernel/Makefile | 19
linux-2.6.18.noarch/arch/i386/kernel/entry.S | 6
424 files changed, 88543 insertions(+), 217 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.25 -r 1.26 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linux-2.6-xen.patch 2 Nov 2006 06:13:44 -0000 1.25
+++ linux-2.6-xen.patch 16 Nov 2006 22:14:34 -0000 1.26
@@ -1,14 +1,12 @@
- * linux-2.6 /mnt/ro/repos/hg/linux-2.6
-changeset: 39746:07aee2b95c3f
- * linux-2.6-xen-fedora /mnt/ro/repos/hg/linux-2.6-xen-fedora
-changeset: 36227:84594d199837
- * xen-3.0.3-testing /mnt/ro/repos/hg/xen-3.0.3-testing
-changeset: 11740:64b3e8596dc9
- * linux-2.6-xen-3.0.3 /mnt/ro/repos/hg/linux-2.6-xen-3.0.3
-changeset: 22940:410c17270c74
-diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
---- /scratch/src/linux-2.6.18/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-26 16:46:14.000000000 +0200
+ * linux-2.6.18-xen /disk/ro/repos/hg/linux-2.6.18-xen
+changeset: 36182:c6ef4b521aef
+ * xen-3.0.3-testing /disk/ro/repos/hg/xen-3.0.3-testing
+changeset: 11774:52ae8dd4bc75
+ * linux-2.6-xen-3.0.3 /disk/ro/repos/hg/linux-2.6-xen-3.0.3
+changeset: 22949:4281f5246814
+diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.2/arch/i386/boot-xen/Makefile linux-2.6.18-xen/arch/i386/boot-xen/Makefile
+--- /scratch/src/linux-2.6.18.2/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18-xen/arch/i386/boot-xen/Makefile 2006-11-12 22:54:49.000000000 +0100
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -31,296 +29,10 @@
+ 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='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- /scratch/src/linux-2.6.18/arch/i386/Kconfig 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig 2006-09-20 15:52:33.000000000 +0200
-@@ -16,6 +16,7 @@ config X86_32
-
- config GENERIC_TIME
- bool
-+ depends on !X86_XEN
- default y
-
- config LOCKDEP_SUPPORT
-@@ -103,6 +104,15 @@ config X86_PC
- help
- Choose this option if your computer is a standard PC or compatible.
-
-+config X86_XEN
-+ bool "Xen-compatible"
-+ select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
-+ select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST
-+ select SWIOTLB
-+ help
-+ Choose this option if you plan to run this kernel on top of the
-+ Xen Hypervisor.
-+
- config X86_ELAN
- bool "AMD Elan"
- help
-@@ -213,6 +223,7 @@ source "arch/i386/Kconfig.cpu"
-
- config HPET_TIMER
- bool "HPET Timer Support"
-+ depends on !X86_XEN
- help
- This enables the use of the HPET for the kernel's internal timer.
- HPET is the next generation timer replacing legacy 8254s.
-@@ -263,7 +274,7 @@ source "kernel/Kconfig.preempt"
-
- config X86_UP_APIC
- bool "Local APIC support on uniprocessors"
-- depends on !SMP && !(X86_VISWS || X86_VOYAGER)
-+ depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
- help
- A local APIC (Advanced Programmable Interrupt Controller) is an
- integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -299,7 +299,7 @@ config X86_UP_IOAPIC
-
- config X86_LOCAL_APIC
- bool
-- depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
-+ depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
- default y
-
- config X86_APIC_AUTO
-@@ -314,7 +314,7 @@ config X86_APIC_AUTO
-
- config X86_IO_APIC
- bool
-- depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
-+ depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
- default y
-
- config X86_VISWS_APIC
-@@ -303,7 +314,7 @@ config X86_VISWS_APIC
-
- config X86_MCE
- bool "Machine Check Exception"
-- depends on !X86_VOYAGER
-+ depends on !(X86_VOYAGER || X86_XEN)
- ---help---
- Machine Check Exception support allows the processor to notify the
- kernel if it detects a problem (e.g. overheating, component failure).
-@@ -402,6 +413,7 @@ config X86_REBOOTFIXUPS
-
- config MICROCODE
- tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
-+ depends on !XEN_UNPRIVILEGED_GUEST
- ---help---
- If you say Y here and also to "/dev file system support" in the
- 'File systems' section, you will be able to update the microcode on
-@@ -419,6 +431,7 @@ config MICROCODE
-
- config X86_MSR
- tristate "/dev/cpu/*/msr - Model-specific register support"
-+ depends on !X86_XEN
- help
- This device gives privileged processes access to the x86
- Model-Specific Registers (MSRs). It is a character device with
-@@ -434,6 +447,10 @@ config X86_CPUID
- with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
- /dev/cpu/31/cpuid.
-
-+config SWIOTLB
-+ bool
-+ default n
-+
- source "drivers/firmware/Kconfig"
-
- choice
-@@ -607,7 +624,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
-
- config HIGHPTE
- bool "Allocate 3rd-level pagetables from highmem"
-- depends on HIGHMEM4G || HIGHMEM64G
-+ depends on (HIGHMEM4G || HIGHMEM64G) && !X86_XEN
- help
- The VM uses one page table entry for each page of physical memory.
- For systems with a lot of RAM, this can be wasteful of precious
-@@ -616,6 +633,7 @@ config HIGHPTE
-
- config MATH_EMULATION
- bool "Math emulation"
-+ depends on !X86_XEN
- ---help---
- Linux can emulate a math coprocessor (used for floating point
- operations) if you don't have one. 486DX and Pentium processors have
-@@ -641,6 +659,8 @@ config MATH_EMULATION
-
- config MTRR
- bool "MTRR (Memory Type Range Register) support"
-+ depends on !XEN_UNPRIVILEGED_GUEST
-+ default y if X86_XEN
- ---help---
- On Intel P6 family processors (Pentium Pro, Pentium II and later)
- the Memory Type Range Registers (MTRRs) may be used to control
-@@ -675,7 +695,7 @@ config MTRR
-
- config EFI
- bool "Boot from EFI support"
-- depends on ACPI
-+ depends on ACPI && !X86_XEN
- default n
- ---help---
- This enables the the kernel to boot on EFI platforms using
-@@ -693,7 +713,7 @@ config EFI
-
- config IRQBALANCE
- bool "Enable kernel irq balancing"
-- depends on SMP && X86_IO_APIC
-+ depends on SMP && X86_IO_APIC && !X86_XEN
- default y
- help
- The default yes will allow the kernel to do irq load balancing.
-@@ -741,7 +761,7 @@ source kernel/Kconfig.hz
-
- config KEXEC
- bool "kexec system call (EXPERIMENTAL)"
-- depends on EXPERIMENTAL
-+ depends on EXPERIMENTAL && !X86_XEN
- help
- kexec is a system call that implements the ability to shutdown your
- current kernel, and to start another kernel. It is like a reboot
-@@ -794,6 +814,7 @@ config HOTPLUG_CPU
- config COMPAT_VDSO
- bool "Compat VDSO support"
- default y
-+ depends on !X86_XEN
- help
- Map the VDSO to the predictable old-style address too.
- ---help---
-@@ -810,18 +831,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
- depends on HIGHMEM
-
- menu "Power management options (ACPI, APM)"
-- depends on !X86_VOYAGER
[...6903 lines suppressed...]
+ help
+ Map the VDSO to the predictable old-style address too.
+ ---help---
+@@ -820,18 +841,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+ depends on HIGHMEM
+
+ menu "Power management options (ACPI, APM)"
+- depends on !X86_VOYAGER
++ depends on !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
+
++if !X86_XEN
+ source kernel/power/Kconfig
++endif
+
+ source "drivers/acpi/Kconfig"
+
+ menu "APM (Advanced Power Management) BIOS Support"
+-depends on PM && !X86_VISWS
++depends on PM && !(X86_VISWS || X86_XEN)
+
+ config APM
+ tristate "APM (Advanced Power Management) BIOS support"
+- depends on PM
++ depends on PM && PM_LEGACY
+ ---help---
+ APM is a BIOS specification for saving power using several different
+ techniques. This is mostly useful for battery powered laptops with
+@@ -1016,6 +1039,7 @@ choice
+
+ config PCI_GOBIOS
+ bool "BIOS"
++ depends on !X86_XEN
+
+ config PCI_GOMMCONFIG
+ bool "MMConfig"
+@@ -1023,6 +1047,13 @@ config PCI_GOMMCONFIG
+ config PCI_GODIRECT
+ bool "Direct"
+
++config PCI_GOXEN_FE
++ bool "Xen PCI Frontend"
++ depends on X86_XEN
++ help
++ The PCI device frontend driver allows the kernel to import arbitrary
++ PCI devices from a PCI backend to support PCI driver domains.
++
+ config PCI_GOANY
+ bool "Any"
+
+@@ -1030,7 +1061,7 @@ endchoice
+
+ config PCI_BIOS
+ bool
+- depends on !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY)
++ depends on !(X86_VISWS || X86_XEN) && PCI && (PCI_GOBIOS || PCI_GOANY)
+ default y
+
+ config PCI_DIRECT
+@@ -1043,6 +1074,18 @@ config PCI_MMCONFIG
+ depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
+ default y
+
++config XEN_PCIDEV_FRONTEND
++ bool
++ depends on PCI && X86_XEN && (PCI_GOXEN_FE || PCI_GOANY)
++ default y
++
++config XEN_PCIDEV_FE_DEBUG
++ bool "Xen PCI Frontend Debugging"
++ depends on XEN_PCIDEV_FRONTEND
++ default n
++ help
++ Enables some debug statements within the PCI Frontend.
++
+ source "drivers/pci/pcie/Kconfig"
+
+ source "drivers/pci/Kconfig"
+@@ -1053,7 +1096,7 @@ config ISA_DMA_API
+
+ config ISA
+ bool "ISA support"
+- depends on !(X86_VOYAGER || X86_VISWS)
++ depends on !(X86_VOYAGER || X86_VISWS || X86_XEN)
+ help
+ Find out whether you have ISA slots on your motherboard. ISA is the
+ name of a bus system, i.e. the way the CPU talks to the other stuff
+@@ -1080,7 +1123,7 @@ config EISA
+ source "drivers/eisa/Kconfig"
+
+ config MCA
+- bool "MCA support" if !(X86_VISWS || X86_VOYAGER)
++ bool "MCA support" if !(X86_VISWS || X86_VOYAGER || X86_XEN)
+ default y if X86_VOYAGER
+ help
+ MicroChannel Architecture is found in some IBM PS/2 machines and
+@@ -1156,6 +1199,8 @@ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+
++source "drivers/xen/Kconfig"
++
+ source "lib/Kconfig"
+
+ #
+@@ -1181,7 +1226,7 @@ config X86_SMP
+
+ config X86_HT
+ bool
+- depends on SMP && !(X86_VISWS || X86_VOYAGER)
++ depends on SMP && !(X86_VISWS || X86_VOYAGER || X86_XEN)
+ default y
+
+ config X86_BIOS_REBOOT
+@@ -1194,6 +1239,16 @@ config X86_TRAMPOLINE
+ depends on X86_SMP || (X86_VOYAGER && SMP)
+ default y
+
++config X86_NO_TSS
++ bool
++ depends on X86_XEN
++ default y
++
++config X86_NO_IDT
++ bool
++ depends on X86_XEN
++ default y
++
+ config KTIME_SCALAR
+ bool
+ default y
+diff kk
+--- linux-2.6.18.noarch/arch/i386/kernel/Makefile.p.xen 2006-11-16 22:18:47.000000000 +0100
++++ linux-2.6.18.noarch/arch/i386/kernel/Makefile 2006-11-16 22:21:09.000000000 +0100
+@@ -44,6 +44,12 @@ EXTRA_AFLAGS := -traditional
+
+ obj-$(CONFIG_SCx200) += scx200.o
+
++ifdef CONFIG_XEN
++vsyscall_note := vsyscall-note-xen.o
++else
++vsyscall_note := vsyscall-note.o
++endif
++
+ # vsyscall.o contains the vsyscall DSO images as __initdata.
+ # We must build both images before we can assemble it.
+ # Note: kbuild does not track this dependency due to usage of .incbin
+@@ -65,7 +71,7 @@ SYSCFLAGS_vsyscall-int80.so = $(vsyscall
+
+ $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
+ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
+- $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
++ $(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE
+ $(call if_changed,syscall)
+
+ # We also create a special relocatable object that should mirror the symbol
+@@ -83,3 +89,14 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall.
+ k8-y += ../../x86_64/kernel/k8.o
+ stacktrace-y += ../../x86_64/kernel/stacktrace.o
+
++ifdef CONFIG_XEN
++include $(srctree)/scripts/Makefile.xen
++
++obj-y += fixup.o
++microcode-$(subst m,y,$(CONFIG_MICROCODE)) := microcode-xen.o
++n-obj-xen := i8259.o timers/ reboot.o smpboot.o trampoline.o
++
++obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
++obj-y := $(call cherrypickxen, $(obj-y))
++extra-y := $(call cherrypickxen, $(extra-y))
++endif
+diff kk
+--- linux-2.6.18.noarch/arch/i386/kernel/entry.S.p.xen 2006-11-16 22:18:47.000000000 +0100
++++ linux-2.6.18.noarch/arch/i386/kernel/entry.S 2006-11-16 22:21:43.000000000 +0100
+@@ -269,7 +269,7 @@ ENTRY(sysenter_entry)
+ CFI_STARTPROC simple
+ CFI_DEF_CFA esp, 0
+ CFI_REGISTER esp, ebp
+- movl TSS_sysenter_esp0(%esp),%esp
++ movl SYSENTER_stack_esp0(%esp),%esp
+ sysenter_past_esp:
+ /*
+ * No need to follow this irqs on/off section: the syscall
+@@ -686,7 +686,7 @@ device_not_available_emulate:
+ * that sets up the real kernel stack. Check here, since we can't
+ * allow the wrong stack to be used.
+ *
+- * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have
++ * "SYSENTER_stack_esp0+12" is because the NMI/debug handler will have
+ * already pushed 3 words if it hits on the sysenter instruction:
+ * eflags, cs and eip.
+ *
+@@ -698,7 +698,7 @@ device_not_available_emulate:
+ cmpw $__KERNEL_CS,4(%esp); \
+ jne ok; \
+ label: \
+- movl TSS_sysenter_esp0+offset(%esp),%esp; \
++ movl SYSENTER_stack_esp0+offset(%esp),%esp; \
+ CFI_DEF_CFA esp, 0; \
+ CFI_UNDEFINED eip; \
+ pushfl; \
- Previous message (by thread): rpms/kernel/FC-5/scripts rebase-xen-kernel.sh,NONE,1.1
- Next message (by thread): rpms/kernel/FC-6 sources, 1.503, 1.504 .cvsignore, 1.540, 1.541 kernel-2.6.spec, 1.2850, 1.2851 xen-version-strings.patch, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list