SOURCES (LINUX_2_6_16): xen-3.0-2.6.16.patch - updated
jajcus
jajcus at pld-linux.org
Fri Jun 30 14:25:49 CEST 2006
Author: jajcus Date: Fri Jun 30 12:25:49 2006 GMT
Module: SOURCES Tag: LINUX_2_6_16
---- Log message:
- updated
---- Files affected:
SOURCES:
xen-3.0-2.6.16.patch (1.1.2.2 -> 1.1.2.2.2.1)
---- Diffs:
================================================================
Index: SOURCES/xen-3.0-2.6.16.patch
diff -u SOURCES/xen-3.0-2.6.16.patch:1.1.2.2 SOURCES/xen-3.0-2.6.16.patch:1.1.2.2.2.1
--- SOURCES/xen-3.0-2.6.16.patch:1.1.2.2 Wed Apr 19 15:40:57 2006
+++ SOURCES/xen-3.0-2.6.16.patch Fri Jun 30 14:25:43 2006
@@ -1,32 +1,7 @@
-diff -Nurp ref-linux-2.6.16.9/arch/i386/boot-xen/Makefile tmp-linux-2.6-xen.patch/arch/i386/boot-xen/Makefile
---- ref-linux-2.6.16.9/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/i386/boot-xen/Makefile 2006-04-10 00:05:52.000000000 +0200
-@@ -0,0 +1,21 @@
-+
-+OBJCOPYFLAGS := -g --strip-unneeded
-+
-+vmlinuz: vmlinux-stripped FORCE
-+ $(call if_changed,gzip)
-+
-+vmlinux-stripped: vmlinux FORCE
-+ $(call if_changed,objcopy)
-+
-+INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH))
-+
-+XINSTALL_NAME ?= $(KERNELRELEASE)
-+install:
-+ mkdir -p $(INSTALL_ROOT)/boot
-+ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-+ rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+ install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+ install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
-+ 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 -Nurp ref-linux-2.6.16.9/arch/i386/Kconfig tmp-linux-2.6-xen.patch/arch/i386/Kconfig
---- ref-linux-2.6.16.9/arch/i386/Kconfig 2006-04-19 08:10:14.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig 2006-04-10 00:05:52.000000000 +0200
-@@ -58,6 +58,15 @@ config X86_PC
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/Kconfig linux-2.6.16/arch/i386/Kconfig
+--- linux-2.6.16.orig/arch/i386/Kconfig 2006-06-26 09:49:46.000000000 +0200
++++ linux-2.6.16/arch/i386/Kconfig 2006-06-26 09:51:32.000000000 +0200
+@@ -58,6 +58,15 @@
help
Choose this option if your computer is a standard PC or compatible.
@@ -42,7 +17,7 @@
config X86_ELAN
bool "AMD Elan"
help
-@@ -159,6 +168,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -159,6 +168,7 @@
config HPET_TIMER
bool "HPET Timer Support"
@@ -50,7 +25,7 @@
help
This enables the use of the HPET for the kernel's internal timer.
HPET is the next generation timer replacing legacy 8254s.
-@@ -202,6 +212,19 @@ config SMP
+@@ -202,6 +212,19 @@
If you don't know what to do here, say N.
@@ -70,7 +45,7 @@
config NR_CPUS
int "Maximum number of CPUs (2-255)"
range 2 255
-@@ -218,7 +241,7 @@ config NR_CPUS
+@@ -218,7 +241,7 @@
config SCHED_SMT
bool "SMT (Hyperthreading) scheduler support"
@@ -79,7 +54,7 @@
default off
help
SMT scheduler support improves the CPU scheduler's decision making
-@@ -230,7 +253,7 @@ source "kernel/Kconfig.preempt"
+@@ -230,7 +253,7 @@
config X86_UP_APIC
bool "Local APIC support on uniprocessors"
@@ -88,7 +63,7 @@
help
A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -255,12 +278,12 @@ config X86_UP_IOAPIC
+@@ -255,12 +278,12 @@
config X86_LOCAL_APIC
bool
@@ -103,7 +78,7 @@
default y
config X86_VISWS_APIC
-@@ -268,9 +291,14 @@ config X86_VISWS_APIC
+@@ -268,9 +291,14 @@
depends on X86_VISWS
default y
@@ -119,7 +94,7 @@
---help---
Machine Check Exception support allows the processor to notify the
kernel if it detects a problem (e.g. overheating, component failure).
-@@ -360,6 +388,7 @@ config X86_REBOOTFIXUPS
+@@ -360,6 +388,7 @@
config MICROCODE
tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -127,7 +102,7 @@
---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
-@@ -377,6 +406,7 @@ config MICROCODE
+@@ -377,6 +406,7 @@
config X86_MSR
tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -135,7 +110,7 @@
help
This device gives privileged processes access to the x86
Model-Specific Registers (MSRs). It is a character device with
-@@ -392,6 +422,10 @@ config X86_CPUID
+@@ -392,6 +422,10 @@
with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
/dev/cpu/31/cpuid.
@@ -146,7 +121,7 @@
source "drivers/firmware/Kconfig"
choice
-@@ -560,7 +594,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -580,7 +614,7 @@
config HIGHPTE
bool "Allocate 3rd-level pagetables from highmem"
@@ -155,7 +130,7 @@
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
-@@ -569,6 +603,7 @@ config HIGHPTE
+@@ -589,6 +623,7 @@
config MATH_EMULATION
bool "Math emulation"
@@ -163,7 +138,7 @@
---help---
Linux can emulate a math coprocessor (used for floating point
operations) if you don't have one. 486DX and Pentium processors have
-@@ -594,6 +629,8 @@ config MATH_EMULATION
+@@ -614,6 +649,8 @@
config MTRR
bool "MTRR (Memory Type Range Register) support"
@@ -172,7 +147,7 @@
---help---
On Intel P6 family processors (Pentium Pro, Pentium II and later)
the Memory Type Range Registers (MTRRs) may be used to control
-@@ -628,7 +665,7 @@ config MTRR
+@@ -648,7 +685,7 @@
config EFI
bool "Boot from EFI support (EXPERIMENTAL)"
@@ -181,7 +156,7 @@
default n
---help---
This enables the the kernel to boot on EFI platforms using
-@@ -646,7 +683,7 @@ config EFI
+@@ -666,7 +703,7 @@
config IRQBALANCE
bool "Enable kernel irq balancing"
@@ -190,7 +165,7 @@
default y
help
The default yes will allow the kernel to do irq load balancing.
-@@ -689,7 +726,7 @@ source kernel/Kconfig.hz
+@@ -709,7 +746,7 @@
config KEXEC
bool "kexec system call (EXPERIMENTAL)"
@@ -199,7 +174,7 @@
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
-@@ -743,6 +780,7 @@ config HOTPLUG_CPU
+@@ -763,6 +800,7 @@
config DOUBLEFAULT
default y
bool "Enable doublefault exception handler" if EMBEDDED
@@ -207,7 +182,7 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-@@ -753,18 +791,20 @@ endmenu
+@@ -773,18 +811,20 @@
menu "Power management options (ACPI, APM)"
@@ -231,7 +206,7 @@
---help---
APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with
-@@ -949,6 +989,7 @@ choice
+@@ -969,6 +1009,7 @@
config PCI_GOBIOS
bool "BIOS"
@@ -239,7 +214,7 @@
config PCI_GOMMCONFIG
bool "MMConfig"
-@@ -956,6 +997,13 @@ config PCI_GOMMCONFIG
+@@ -976,6 +1017,13 @@
config PCI_GODIRECT
bool "Direct"
@@ -253,7 +228,7 @@
config PCI_GOANY
bool "Any"
-@@ -963,7 +1011,7 @@ endchoice
+@@ -983,7 +1031,7 @@
config PCI_BIOS
bool
@@ -262,7 +237,7 @@
default y
config PCI_DIRECT
-@@ -976,6 +1024,18 @@ config PCI_MMCONFIG
+@@ -996,6 +1044,18 @@
depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
default y
@@ -281,7 +256,7 @@
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
-@@ -986,7 +1046,7 @@ config ISA_DMA_API
+@@ -1006,7 +1066,7 @@
config ISA
bool "ISA support"
@@ -290,7 +265,7 @@
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
-@@ -1013,7 +1073,7 @@ config EISA
+@@ -1033,7 +1093,7 @@
source "drivers/eisa/Kconfig"
config MCA
@@ -299,7 +274,7 @@
default y if X86_VOYAGER
help
MicroChannel Architecture is found in some IBM PS/2 machines and
-@@ -1056,7 +1116,9 @@ source "fs/Kconfig"
+@@ -1076,7 +1136,9 @@
menu "Instrumentation Support"
depends on EXPERIMENTAL
@@ -309,7 +284,7 @@
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
-@@ -1075,6 +1137,8 @@ source "security/Kconfig"
+@@ -1097,6 +1159,8 @@
source "crypto/Kconfig"
@@ -318,7 +293,7 @@
source "lib/Kconfig"
#
-@@ -1100,7 +1164,7 @@ config X86_SMP
+@@ -1122,7 +1186,7 @@
config X86_HT
bool
@@ -327,7 +302,7 @@
default y
config X86_BIOS_REBOOT
-@@ -1113,6 +1177,21 @@ config X86_TRAMPOLINE
+@@ -1135,6 +1199,21 @@
depends on X86_SMP || (X86_VOYAGER && SMP)
default y
@@ -349,10 +324,10 @@
config KTIME_SCALAR
bool
default y
-diff -Nurp ref-linux-2.6.16.9/arch/i386/Kconfig.cpu tmp-linux-2.6-xen.patch/arch/i386/Kconfig.cpu
---- ref-linux-2.6.16.9/arch/i386/Kconfig.cpu 2006-04-19 08:10:14.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/i386/Kconfig.cpu 2006-04-10 00:05:52.000000000 +0200
-@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/Kconfig.cpu linux-2.6.16/arch/i386/Kconfig.cpu
+--- linux-2.6.16.orig/arch/i386/Kconfig.cpu 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/arch/i386/Kconfig.cpu 2006-06-26 09:51:32.000000000 +0200
+@@ -251,7 +251,7 @@
config X86_F00F_BUG
bool
@@ -361,9 +336,161 @@
default y
config X86_WP_WORKS_OK
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/acpi/boot-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/boot-xen.c
---- ref-linux-2.6.16.9/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/boot-xen.c 2006-04-10 00:05:52.000000000 +0200
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/Makefile linux-2.6.16/arch/i386/Makefile
+--- linux-2.6.16.orig/arch/i386/Makefile 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/arch/i386/Makefile 2006-06-26 09:51:32.000000000 +0200
+@@ -45,6 +45,11 @@
+
+ CFLAGS += $(cflags-y)
+
++cppflags-$(CONFIG_XEN) += \
++ -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
++
++CPPFLAGS += $(cppflags-y)
++
+ # Default subarch .c files
+ mcore-y := mach-default
+
+@@ -68,6 +73,10 @@
+ mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
+ mcore-$(CONFIG_X86_SUMMIT) := mach-default
+
++# Xen subarch support
++mflags-$(CONFIG_X86_XEN) := -Iinclude/asm-i386/mach-xen
++mcore-$(CONFIG_X86_XEN) := mach-xen
++
+ # generic subarchitecture
+ mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
+ mcore-$(CONFIG_X86_GENERICARCH) := mach-default
+@@ -102,6 +111,19 @@
+ .PHONY: zImage bzImage compressed zlilo bzlilo \
+ zdisk bzdisk fdimage fdimage144 fdimage288 install
+
++ifdef CONFIG_XEN
++CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
++head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o
++boot := arch/i386/boot-xen
++.PHONY: vmlinuz
++all: vmlinuz
++
++vmlinuz: vmlinux
++ $(Q)$(MAKE) $(build)=$(boot) $@
++
++install:
++ $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
++else
+ all: bzImage
+
+ # KBUILD_IMAGE specify target image being built
+@@ -124,6 +146,7 @@
+
+ install:
+ $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
++endif
+
+ archclean:
+ $(Q)$(MAKE) $(clean)=arch/i386/boot
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/boot-xen/Makefile linux-2.6.16/arch/i386/boot-xen/Makefile
+--- linux-2.6.16.orig/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16/arch/i386/boot-xen/Makefile 2006-06-26 09:51:32.000000000 +0200
+@@ -0,0 +1,21 @@
++
++OBJCOPYFLAGS := -g --strip-unneeded
++
++vmlinuz: vmlinux-stripped FORCE
++ $(call if_changed,gzip)
++
++vmlinux-stripped: vmlinux FORCE
++ $(call if_changed,objcopy)
++
++INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH))
++
++XINSTALL_NAME ?= $(KERNELRELEASE)
++install:
++ mkdir -p $(INSTALL_ROOT)/boot
++ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
++ rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++ install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++ install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++ 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 -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/Makefile linux-2.6.16/arch/i386/kernel/Makefile
+--- linux-2.6.16.orig/arch/i386/kernel/Makefile 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/Makefile 2006-06-26 09:51:32.000000000 +0200
+@@ -37,17 +37,26 @@
+ obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
+ obj-$(CONFIG_VM86) += vm86.o
+ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
++obj-$(CONFIG_SMP_ALTERNATIVES) += smpalts.o
+
+ 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_TYPES-y := int80
++VSYSCALL_TYPES-$(CONFIG_X86_SYSENTER) += sysenter
+ # 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
+-$(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
+-targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
+-targets += vsyscall-note.o vsyscall.lds
++$(obj)/vsyscall.o: $(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.so)
++targets += $(foreach F,$(VSYSCALL_TYPES-y),vsyscall-$F.o vsyscall-$F.so)
++targets += $(vsyscall_note) vsyscall.lds
+
+ # The DSO images are built using a special linker script.
+ quiet_cmd_syscall = SYSCALL $@
+@@ -62,7 +71,7 @@
+
+ $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
+ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
+- $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
++ $(obj)/vsyscall-%.o $(obj)/$(vsyscall_note) FORCE
+ $(call if_changed,syscall)
+
+ # We also create a special relocatable object that should mirror the symbol
+@@ -74,5 +83,18 @@
+
+ SYSCFLAGS_vsyscall-syms.o = -r
+ $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
+- $(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
++ $(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.o) \
++ $(obj)/$(vsyscall_note) FORCE
+ $(call if_changed,syscall)
++
++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 -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/acpi/Makefile linux-2.6.16/arch/i386/kernel/acpi/Makefile
+--- linux-2.6.16.orig/arch/i386/kernel/acpi/Makefile 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/acpi/Makefile 2006-06-26 09:51:32.000000000 +0200
+@@ -6,3 +6,7 @@
+ obj-y += cstate.o processor.o
+ endif
+
++ifdef CONFIG_XEN
++include $(srctree)/scripts/Makefile.xen
++obj-y := $(call cherrypickxen, $(obj-y), $(src))
++endif
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6.16.orig/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/acpi/boot-xen.c 2006-06-26 09:51:32.000000000 +0200
@@ -0,0 +1,1161 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1526,20 +1653,9 @@
+
+ return 0;
+}
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/acpi/Makefile tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/Makefile
---- ref-linux-2.6.16.9/arch/i386/kernel/acpi/Makefile 2006-04-19 08:10:14.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/acpi/Makefile 2006-04-10 00:05:52.000000000 +0200
-@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
- obj-y += cstate.o processor.o
- endif
-
-+ifdef CONFIG_XEN
-+include $(srctree)/scripts/Makefile.xen
-+obj-y := $(call cherrypickxen, $(obj-y), $(src))
-+endif
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/apic-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/apic-xen.c
---- ref-linux-2.6.16.9/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/apic-xen.c 2006-04-10 00:05:52.000000000 +0200
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/apic-xen.c linux-2.6.16/arch/i386/kernel/apic-xen.c
+--- linux-2.6.16.orig/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/apic-xen.c 2006-06-26 09:51:32.000000000 +0200
@@ -0,0 +1,140 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1681,9 +1797,9 @@
+
+ return 0;
+}
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/asm-offsets.c tmp-linux-2.6-xen.patch/arch/i386/kernel/asm-offsets.c
---- ref-linux-2.6.16.9/arch/i386/kernel/asm-offsets.c 2006-04-19 08:10:14.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/asm-offsets.c 2006-04-10 00:05:52.000000000 +0200
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/asm-offsets.c linux-2.6.16/arch/i386/kernel/asm-offsets.c
+--- linux-2.6.16.orig/arch/i386/kernel/asm-offsets.c 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/asm-offsets.c 2006-06-26 09:51:32.000000000 +0200
@@ -13,6 +13,7 @@
#include <asm/fixmap.h>
#include <asm/processor.h>
@@ -1692,7 +1808,7 @@
#define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -63,10 +64,12 @@ void foo(void)
+@@ -63,10 +64,12 @@
OFFSET(pbe_orig_address, pbe, orig_address);
OFFSET(pbe_next, pbe, next);
@@ -1706,9 +1822,21 @@
- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
}
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/cpu/common-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/common-xen.c
---- ref-linux-2.6.16.9/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/common-xen.c 2006-04-10 00:05:52.000000000 +0200
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/cpu/Makefile linux-2.6.16/arch/i386/kernel/cpu/Makefile
+--- linux-2.6.16.orig/arch/i386/kernel/cpu/Makefile 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/cpu/Makefile 2006-06-26 09:51:32.000000000 +0200
+@@ -17,3 +17,8 @@
+
+ obj-$(CONFIG_MTRR) += mtrr/
+ obj-$(CONFIG_CPU_FREQ) += cpufreq/
++
++ifdef CONFIG_XEN
++include $(srctree)/scripts/Makefile.xen
++obj-y := $(call cherrypickxen, $(obj-y), $(src))
++endif
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/cpu/common-xen.c linux-2.6.16/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6.16.orig/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/cpu/common-xen.c 2006-06-26 09:51:32.000000000 +0200
@@ -0,0 +1,715 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -2425,21 +2553,23 @@
+ per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
+}
+#endif
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/cpu/Makefile tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/Makefile
---- ref-linux-2.6.16.9/arch/i386/kernel/cpu/Makefile 2006-04-19 08:10:14.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/Makefile 2006-04-10 00:05:52.000000000 +0200
-@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6.16/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6.16.orig/arch/i386/kernel/cpu/mtrr/Makefile 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/cpu/mtrr/Makefile 2006-06-26 09:51:32.000000000 +0200
+@@ -3,3 +3,10 @@
+ obj-y += cyrix.o
+ obj-y += centaur.o
- obj-$(CONFIG_MTRR) += mtrr/
- obj-$(CONFIG_CPU_FREQ) += cpufreq/
-+
+ifdef CONFIG_XEN
+include $(srctree)/scripts/Makefile.xen
-+obj-y := $(call cherrypickxen, $(obj-y), $(src))
++n-obj-xen := generic.o state.o amd.o cyrix.o centaur.o
++
++obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
++obj-y := $(call cherrypickxen, $(obj-y))
+endif
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/cpu/mtrr/main-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/main-xen.c
---- ref-linux-2.6.16.9/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-04-10 00:05:52.000000000 +0200
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.16/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- linux-2.6.16.orig/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-06-26 09:51:32.000000000 +0200
@@ -0,0 +1,196 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -2637,29 +2767,15 @@
+}
+
+subsys_initcall(mtrr_init);
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/cpu/mtrr/Makefile tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/Makefile
---- ref-linux-2.6.16.9/arch/i386/kernel/cpu/mtrr/Makefile 2006-04-19 08:10:14.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/cpu/mtrr/Makefile 2006-04-10 00:05:52.000000000 +0200
-@@ -3,3 +3,10 @@ obj-y += amd.o
- obj-y += cyrix.o
- obj-y += centaur.o
-
-+ifdef CONFIG_XEN
-+include $(srctree)/scripts/Makefile.xen
-+n-obj-xen := generic.o state.o amd.o cyrix.o centaur.o
-+
-+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
-+obj-y := $(call cherrypickxen, $(obj-y))
-+endif
-diff -Nurp ref-linux-2.6.16.9/arch/i386/kernel/early_printk-xen.c tmp-linux-2.6-xen.patch/arch/i386/kernel/early_printk-xen.c
---- ref-linux-2.6.16.9/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/i386/kernel/early_printk-xen.c 2006-04-10 00:05:52.000000000 +0200
+diff -durN -x '*~' -x '*.orig' -x '*.rej' linux-2.6.16.orig/arch/i386/kernel/early_printk-xen.c linux-2.6.16/arch/i386/kernel/early_printk-xen.c
+--- linux-2.6.16.orig/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16/arch/i386/kernel/early_printk-xen.c 2006-06-26 09:51:32.000000000 +0200
@@ -0,0 +1,2 @@
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/xen-3.0-2.6.16.patch?r1=1.1.2.2&r2=1.1.2.2.2.1&f=u
More information about the pld-cvs-commit
mailing list