rpms/kernel-xen/devel .cvsignore, 1.8, 1.9 kernel-xen.spec, 1.31, 1.32 linux-2.6-xen-merge.patch, 1.5, 1.6 sources, 1.8, 1.9 linux-2.6.12-xen.patch, 1.7, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 27 22:31:26 UTC 2006
- Previous message (by thread): rpms/microcode_ctl/devel .cvsignore, 1.4, 1.5 microcode_ctl.patch, 1.5, 1.6 microcode_ctl.spec, 1.28, 1.29 sources, 1.4, 1.5
- Next message (by thread): rpms/system-config-display/devel .cvsignore, 1.24, 1.25 sources, 1.27, 1.28 system-config-display.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sct
Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14910
Modified Files:
.cvsignore kernel-xen.spec linux-2.6-xen-merge.patch sources
Removed Files:
linux-2.6.12-xen.patch
Log Message:
- Rebase to linux-2.6-merge.hg cset 19859
- Rebase to HV from xen-unstable.hg cset 8680
- Delete unused linux-2.6.12-xen.patch
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 26 Jan 2006 22:14:33 -0000 1.8
+++ .cvsignore 27 Jan 2006 22:30:20 -0000 1.9
@@ -2,7 +2,7 @@
temp-*
kernel-xen-2.6.15
linux-2.6.15.tar.bz2
-xen-20060106.tar.bz2
bcm43xx-20060114.tar.bz2
patch-2.6.16-rc1.bz2
patch-2.6.16-rc1-git4.bz2
+xen-20060127.tar.bz2
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kernel-xen.spec 26 Jan 2006 22:29:32 -0000 1.31
+++ kernel-xen.spec 27 Jan 2006 22:30:20 -0000 1.32
@@ -186,7 +186,7 @@
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060106.tar.bz2
+Source1: xen-20060127.tar.bz2
Source2: Config.mk
Source10: COPYING.modules
@@ -1373,6 +1373,11 @@
%endif
%changelog
+* Fri Jan 27 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to linux-2.6-merge.hg cset 19859
+- Rebase to HV from xen-unstable.hg cset 8680
+- Delete unused linux-2.6.12-xen.patch
+
* Thu Jan 26 2006 Juan Quintela <quintela at redhat.com>
- "don't edit patches by hand" release.
linux-2.6-xen-merge.patch:
arch/i386/Kconfig | 81
arch/i386/Makefile | 18
arch/i386/kernel/Makefile | 26
arch/i386/kernel/acpi/Makefile | 4
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/cpufreq/Kconfig | 2
arch/i386/kernel/cpu/mtrr/Makefile | 7
arch/i386/kernel/smpboot.c | 10
arch/i386/kernel/traps.c | 9
arch/i386/kernel/vmlinux.lds.S | 7
arch/i386/mm/Makefile | 8
arch/i386/pci/Makefile | 5
arch/i386/power/Makefile | 4
arch/um/kernel/physmem.c | 4
arch/x86_64/Kconfig | 43
arch/x86_64/Makefile | 15
arch/x86_64/ia32/Makefile | 18
arch/x86_64/ia32/vsyscall-sigreturn.S | 2
arch/x86_64/kernel/Makefile | 20
arch/x86_64/kernel/acpi/Makefile | 2
arch/x86_64/kernel/i387.c | 5
arch/x86_64/kernel/pci-gart.c | 8
arch/x86_64/kernel/setup64.c | 2
arch/x86_64/mm/Makefile | 10
arch/x86_64/pci/Makefile | 8
b/arch/i386/boot-xen/Makefile | 21
b/arch/i386/kernel/acpi/boot-xen.c | 1157 +++++++++
b/arch/i386/kernel/apic-xen.c | 143 +
b/arch/i386/kernel/cpu/common-xen.c | 659 +++++
b/arch/i386/kernel/cpu/mtrr/main-xen.c | 187 +
b/arch/i386/kernel/early_printk-xen.c | 2
b/arch/i386/kernel/entry-xen.S | 853 +++++++
b/arch/i386/kernel/fixup.c | 95
b/arch/i386/kernel/head-xen.S | 170 +
b/arch/i386/kernel/init_task-xen.c | 49
b/arch/i386/kernel/io_apic-xen.c | 2725 +++++++++++++++++++++++
b/arch/i386/kernel/ioport-xen.c | 122 +
b/arch/i386/kernel/irq-xen.c | 306 ++
b/arch/i386/kernel/ldt-xen.c | 262 ++
b/arch/i386/kernel/microcode-xen.c | 164 +
b/arch/i386/kernel/mpparse-xen.c | 1177 +++++++++
b/arch/i386/kernel/pci-dma-xen.c | 326 ++
b/arch/i386/kernel/process-xen.c | 821 ++++++
b/arch/i386/kernel/quirks-xen.c | 48
b/arch/i386/kernel/setup-xen.c | 1876 +++++++++++++++
b/arch/i386/kernel/smp-xen.c | 617 +++++
b/arch/i386/kernel/smpalts.c | 85
b/arch/i386/kernel/swiotlb.c | 677 +++++
b/arch/i386/kernel/time-xen.c | 1016 ++++++++
b/arch/i386/kernel/traps-xen.c | 1103 +++++++++
b/arch/i386/kernel/vsyscall-note-xen.S | 32
b/arch/i386/mach-xen/Makefile | 7
b/arch/i386/mach-xen/setup.c | 37
b/arch/i386/mm/fault-xen.c | 617 +++++
b/arch/i386/mm/highmem-xen.c | 123 +
b/arch/i386/mm/hypervisor.c | 459 +++
b/arch/i386/mm/init-xen.c | 848 +++++++
b/arch/i386/mm/ioremap-xen.c | 493 ++++
b/arch/i386/mm/pgtable-xen.c | 597 +++++
b/arch/i386/pci/irq-xen.c | 1197 ++++++++++
b/arch/x86_64/ia32/ia32entry-xen.S | 718 ++++++
b/arch/x86_64/ia32/syscall32-xen.c | 128 +
b/arch/x86_64/ia32/syscall32_syscall-xen.S | 28
b/arch/x86_64/ia32/vsyscall-int80.S | 58
b/arch/x86_64/kernel/apic-xen.c | 187 +
b/arch/x86_64/kernel/e820-xen.c | 744 ++++++
b/arch/x86_64/kernel/early_printk-xen.c | 306 ++
b/arch/x86_64/kernel/entry-xen.S | 1160 +++++++++
b/arch/x86_64/kernel/genapic-xen.c | 135 +
b/arch/x86_64/kernel/genapic_xen.c | 162 +
b/arch/x86_64/kernel/head-xen.S | 247 ++
b/arch/x86_64/kernel/head64-xen.c | 137 +
b/arch/x86_64/kernel/io_apic-xen.c | 2191 ++++++++++++++++++
b/arch/x86_64/kernel/ioport-xen.c | 58
b/arch/x86_64/kernel/irq-xen.c | 157 +
b/arch/x86_64/kernel/ldt-xen.c | 275 ++
b/arch/x86_64/kernel/mpparse-xen.c | 1000 ++++++++
b/arch/x86_64/kernel/pci-nommu-xen.c | 99
b/arch/x86_64/kernel/process-xen.c | 798 ++++++
b/arch/x86_64/kernel/setup-xen.c | 1613 +++++++++++++
b/arch/x86_64/kernel/setup64-xen.c | 353 ++
b/arch/x86_64/kernel/smp-xen.c | 592 ++++
b/arch/x86_64/kernel/traps-xen.c | 1010 ++++++++
b/arch/x86_64/kernel/vsyscall-xen.c | 239 ++
b/arch/x86_64/kernel/x8664_ksyms-xen.c | 181 +
b/arch/x86_64/kernel/xen_entry.S | 41
b/arch/x86_64/mm/fault-xen.c | 601 +++++
b/arch/x86_64/mm/init-xen.c | 1090 +++++++++
b/arch/x86_64/mm/pageattr-xen.c | 375 +++
b/drivers/char/tpm/tpm_xen.c | 525 ++++
b/drivers/xen/Kconfig | 175 +
b/drivers/xen/Makefile | 20
b/drivers/xen/balloon/Makefile | 2
b/drivers/xen/balloon/balloon.c | 563 ++++
b/drivers/xen/blkback/Makefile | 2
b/drivers/xen/blkback/blkback.c | 590 ++++
b/drivers/xen/blkback/common.h | 123 +
b/drivers/xen/blkback/interface.c | 164 +
b/drivers/xen/blkback/vbd.c | 102
b/drivers/xen/blkback/xenbus.c | 421 +++
b/drivers/xen/blkfront/Kconfig | 6
b/drivers/xen/blkfront/Makefile | 5
b/drivers/xen/blkfront/blkfront.c | 835 +++++++
b/drivers/xen/blkfront/block.h | 162 +
b/drivers/xen/blkfront/vbd.c | 323 ++
b/drivers/xen/blktap/Makefile | 3
b/drivers/xen/blktap/blktap.c | 910 +++++++
b/drivers/xen/blktap/common.h | 110
b/drivers/xen/blktap/interface.c | 146 +
b/drivers/xen/blktap/xenbus.c | 234 +
b/drivers/xen/char/Makefile | 2
b/drivers/xen/char/mem.c | 159 +
b/drivers/xen/console/Makefile | 2
b/drivers/xen/console/console.c | 688 +++++
b/drivers/xen/console/xencons_ring.c | 125 +
b/drivers/xen/core/Makefile | 9
b/drivers/xen/core/evtchn.c | 820 ++++++
b/drivers/xen/core/gnttab.c | 480 ++++
b/drivers/xen/core/reboot.c | 436 +++
b/drivers/xen/core/skbuff.c | 143 +
b/drivers/xen/core/smpboot.c | 439 +++
b/drivers/xen/core/xen_proc.c | 29
b/drivers/xen/evtchn/Makefile | 2
b/drivers/xen/evtchn/evtchn.c | 459 +++
b/drivers/xen/net_driver_util.c | 67
b/drivers/xen/netback/Makefile | 2
b/drivers/xen/netback/common.h | 110
b/drivers/xen/netback/interface.c | 320 ++
b/drivers/xen/netback/loopback.c | 198 +
b/drivers/xen/netback/netback.c | 829 ++++++
b/drivers/xen/netback/xenbus.c | 327 ++
b/drivers/xen/netfront/Kconfig | 6
b/drivers/xen/netfront/Makefile | 4
b/drivers/xen/netfront/netfront.c | 1487 ++++++++++++
b/drivers/xen/privcmd/Makefile | 2
b/drivers/xen/privcmd/privcmd.c | 274 ++
b/drivers/xen/tpmback/Makefile | 4
b/drivers/xen/tpmback/common.h | 89
b/drivers/xen/tpmback/interface.c | 200 +
b/drivers/xen/tpmback/tpmback.c | 1109 +++++++++
b/drivers/xen/tpmback/xenbus.c | 328 ++
b/drivers/xen/tpmfront/Makefile | 2
b/drivers/xen/tpmfront/tpmfront.c | 703 +++++
b/drivers/xen/tpmfront/tpmfront.h | 43
b/drivers/xen/util.c | 75
b/drivers/xen/xenbus/Makefile | 8
b/drivers/xen/xenbus/xenbus_client.c | 238 ++
b/drivers/xen/xenbus/xenbus_comms.c | 203 +
b/drivers/xen/xenbus/xenbus_comms.h | 50
b/drivers/xen/xenbus/xenbus_dev.c | 238 ++
b/drivers/xen/xenbus/xenbus_probe.c | 1015 ++++++++
b/drivers/xen/xenbus/xenbus_xs.c | 821 ++++++
b/include/asm-i386/hypercall.h | 328 ++
b/include/asm-i386/hypervisor.h | 180 +
b/include/asm-i386/mach-default/mach_dma_map.h | 85
b/include/asm-i386/mach-default/mach_fixmap.h | 15
b/include/asm-i386/mach-default/mach_io.h | 35
b/include/asm-i386/mach-default/mach_mmu.h | 18
b/include/asm-i386/mach-default/mach_mode.h | 7
b/include/asm-i386/mach-default/mach_page.h | 28
b/include/asm-i386/mach-default/mach_pgtable.h | 45
b/include/asm-i386/mach-default/mach_processor.h | 53
b/include/asm-i386/mach-default/mach_seg.h | 39
b/include/asm-i386/mach-default/mach_setup.h | 50
b/include/asm-i386/mach-default/mach_system.h | 87
b/include/asm-i386/mach-default/mach_tlbflush.h | 59
b/include/asm-i386/mach-xen/irq_vectors.h | 125 +
b/include/asm-i386/mach-xen/mach_dma_map.h | 47
b/include/asm-i386/mach-xen/mach_fixmap.h | 15
b/include/asm-i386/mach-xen/mach_io.h | 50
b/include/asm-i386/mach-xen/mach_mmu.h | 47
b/include/asm-i386/mach-xen/mach_mode.h | 7
b/include/asm-i386/mach-xen/mach_page.h | 154 +
b/include/asm-i386/mach-xen/mach_pgtable.h | 154 +
b/include/asm-i386/mach-xen/mach_processor.h | 59
b/include/asm-i386/mach-xen/mach_seg.h | 9
b/include/asm-i386/mach-xen/mach_setup.h | 11
b/include/asm-i386/mach-xen/mach_system.h | 157 +
b/include/asm-i386/mach-xen/mach_tlbflush.h | 10
b/include/asm-i386/mach-xen/mach_traps.h | 33
b/include/asm-i386/mach-xen/setup_arch_post.h | 43
b/include/asm-i386/mach-xen/setup_arch_pre.h | 5
b/include/asm-i386/smp_alt.h | 32
b/include/asm-i386/swiotlb.h | 59
b/include/asm-i386/synch_bitops.h | 143 +
b/include/asm-x86_64/arch_hooks.h | 31
b/include/asm-x86_64/hypercall.h | 328 ++
b/include/asm-x86_64/hypervisor.h | 2
b/include/asm-x86_64/mach-xen/asm/nmi.h | 75
b/include/asm-x86_64/synch_bitops.h | 1
b/include/xen/balloon.h | 70
b/include/xen/driver_util.h | 26
b/include/xen/evtchn.h | 123 +
b/include/xen/foreign_page.h | 40
b/include/xen/gnttab.h | 98
b/include/xen/interface/acm.h | 181 +
b/include/xen/interface/acm_ops.h | 96
b/include/xen/interface/arch-ia64.h | 279 ++
b/include/xen/interface/arch-x86_32.h | 158 +
b/include/xen/interface/arch-x86_64.h | 243 ++
b/include/xen/interface/dom0_ops.h | 482 ++++
b/include/xen/interface/event_channel.h | 203 +
b/include/xen/interface/grant_table.h | 306 ++
b/include/xen/interface/hvm/hvm_info_table.h | 24
b/include/xen/interface/hvm/ioreq.h | 90
b/include/xen/interface/hvm/vmx_assist.h | 97
b/include/xen/interface/io/blkif.h | 85
b/include/xen/interface/io/console.h | 33
b/include/xen/interface/io/netif.h | 76
b/include/xen/interface/io/ring.h | 270 ++
b/include/xen/interface/io/tpmif.h | 56
b/include/xen/interface/io/vmx_vlapic.h | 58
b/include/xen/interface/io/vmx_vpic.h | 85
b/include/xen/interface/io/xenbus.h | 44
b/include/xen/interface/io/xs_wire.h | 97
b/include/xen/interface/memory.h | 101
b/include/xen/interface/nmi.h | 54
b/include/xen/interface/physdev.h | 70
b/include/xen/interface/sched.h | 60
b/include/xen/interface/sched_ctl.h | 68
b/include/xen/interface/trace.h | 90
b/include/xen/interface/vcpu.h | 64
b/include/xen/interface/version.h | 52
b/include/xen/interface/xen.h | 449 +++
b/include/xen/net_driver_util.h | 56
b/include/xen/public/evtchn.h | 98
b/include/xen/public/privcmd.h | 91
b/include/xen/public/xenstored.h | 89
b/include/xen/tpmfe.h | 33
b/include/xen/xen_proc.h | 23
b/include/xen/xenbus.h | 254 ++
b/include/xen/xencons.h | 14
b/scripts/Makefile.xen | 14
drivers/Kconfig | 11
drivers/Makefile | 1
drivers/acpi/Kconfig | 2
drivers/acpi/tables.c | 7
drivers/char/mem.c | 6
drivers/char/tpm/Kconfig | 14
drivers/char/tpm/Makefile | 1
drivers/char/tpm/tpm.c | 47
drivers/char/tpm/tpm.h | 13
drivers/char/tpm/tpm_atmel.c | 110
drivers/char/tpm/tpm_nsc.c | 155 -
drivers/char/tty_io.c | 7
drivers/firmware/Kconfig | 2
drivers/ide/legacy/hd.c | 2
drivers/pci/Kconfig | 1
drivers/serial/Kconfig | 1
drivers/video/fbmon.c | 2
fs/Kconfig | 1
include/asm-i386/agp.h | 15
include/asm-i386/atomic.h | 7
include/asm-i386/bitops.h | 19
include/asm-i386/desc.h | 47
include/asm-i386/dma-mapping.h | 102
include/asm-i386/fixmap.h | 20
include/asm-i386/floppy.h | 43
include/asm-i386/futex.h | 4
include/asm-i386/highmem.h | 5
include/asm-i386/hw_irq.h | 4
include/asm-i386/io.h | 41
include/asm-i386/kmap_types.h | 3
include/asm-i386/mach-default/mach_traps.h | 12
include/asm-i386/mmu.h | 6
include/asm-i386/mmu_context.h | 17
include/asm-i386/page.h | 14
include/asm-i386/pci.h | 31
include/asm-i386/pgalloc.h | 31
include/asm-i386/pgtable-2level.h | 12
include/asm-i386/pgtable-3level.h | 35
include/asm-i386/pgtable.h | 22
include/asm-i386/processor.h | 48
include/asm-i386/ptrace.h | 5
include/asm-i386/rwsem.h | 17
include/asm-i386/scatterlist.h | 9
include/asm-i386/segment.h | 41
include/asm-i386/setup.h | 45
include/asm-i386/smp.h | 5
include/asm-i386/spinlock.h | 43
include/asm-i386/system.h | 138 -
include/asm-i386/tlbflush.h | 55
include/asm-i386/vga.h | 2
include/asm-um/page.h | 2
include/asm-x86_64/bootsetup.h | 10
include/asm-x86_64/desc.h | 36
include/asm-x86_64/dma-mapping.h | 102
include/asm-x86_64/fixmap.h | 21
include/asm-x86_64/floppy.h | 45
include/asm-x86_64/hw_irq.h | 14
include/asm-x86_64/i387.h | 7
include/asm-x86_64/io.h | 49
include/asm-x86_64/ipi.h | 8
include/asm-x86_64/irq.h | 39
include/asm-x86_64/mmu.h | 13
include/asm-x86_64/mmu_context.h | 102
include/asm-x86_64/page.h | 155 +
include/asm-x86_64/pci.h | 26
include/asm-x86_64/pda.h | 5
include/asm-x86_64/pgalloc.h | 156 +
include/asm-x86_64/pgtable.h | 253 +-
include/asm-x86_64/processor.h | 38
include/asm-x86_64/segment.h | 9
include/asm-x86_64/smp.h | 10
include/asm-x86_64/swiotlb.h | 18
include/asm-x86_64/system.h | 114
include/asm-x86_64/tlbflush.h | 14
include/asm-x86_64/vga.h | 2
include/asm-x86_64/xor.h | 23
include/linux/gfp.h | 6
include/linux/highmem.h | 6
include/linux/irq.h | 3
include/linux/mm.h | 13
include/linux/skbuff.h | 13
init/Kconfig | 2
kernel/Kconfig.preempt | 1
kernel/irq/manage.c | 92
lib/Kconfig.debug | 2
lib/Makefile | 2
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 118
mm/mmap.c | 4
mm/page_alloc.c | 6
net/core/dev.c | 50
net/core/skbuff.c | 45
326 files changed, 61778 insertions(+), 820 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 linux-2.6-xen-merge.patch
Index: linux-2.6-xen-merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-xen-merge.patch 26 Jan 2006 22:29:32 -0000 1.5
+++ linux-2.6-xen-merge.patch 27 Jan 2006 22:30:20 -0000 1.6
@@ -1,995 +1,1349 @@
---- ./fs/Kconfig.xenmerge 2006-01-06 16:03:15.000000000 -0500
-+++ ./fs/Kconfig 2006-01-06 16:04:34.000000000 -0500
-@@ -811,6 +811,7 @@
- config HUGETLBFS
- bool "HugeTLB file system support"
- depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
-+ depends !XEN
+diff -r df46ccb05adf -r 328a491adf0b arch/i386/Kconfig
+--- a/arch/i386/Kconfig Fri Jan 20 17:49:15 2006 +0800
++++ b/arch/i386/Kconfig Fri Jan 27 20:45:25 2006 +0100
+@@ -50,6 +50,7 @@ config DOUBLEFAULT
+ config DOUBLEFAULT
+ default y
+ bool "Enable doublefault exception handler" if EMBEDDED
++ depends on !XEN
+ help
+ This option allows trapping of rare doublefault exceptions that
+ would otherwise cause a system to silently reboot. Disabling this
+@@ -66,6 +67,15 @@ config X86_PC
+ bool "PC-compatible"
+ 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 if XEN_PHYSDEV_ACCESS
++ help
++ Choose this option is you plan to run this kernel on top of Xen
++ Hypervisor.
- config HUGETLB_PAGE
- def_bool HUGETLBFS
---- ./drivers/char/mem.c.xenmerge 2006-01-06 16:03:14.000000000 -0500
-+++ ./drivers/char/mem.c 2006-01-06 16:04:32.000000000 -0500
-@@ -103,6 +103,7 @@
- }
- #endif
+ config X86_ELAN
+ bool "AMD Elan"
+@@ -168,6 +178,7 @@ source "arch/i386/Kconfig.cpu"
-+#ifndef ARCH_HAS_DEV_MEM
- /*
- * This funcion reads the *physical* memory. The f_pos points directly to the
- * memory location.
-@@ -227,6 +228,7 @@
- *ppos += written;
- return written;
- }
-+#endif
+ 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.
+@@ -211,6 +222,19 @@ config SMP
- static int mmap_mem(struct file * file, struct vm_area_struct * vma)
- {
-@@ -758,6 +760,7 @@
- #define open_kmem open_mem
- #define open_oldmem open_mem
+ If you don't know what to do here, say N.
-+#ifndef ARCH_HAS_DEV_MEM
- static struct file_operations mem_fops = {
- .llseek = memory_lseek,
- .read = read_mem,
-@@ -765,6 +768,9 @@
- .mmap = mmap_mem,
- .open = open_mem,
- };
-+#else
-+extern struct file_operations mem_fops;
-+#endif
++config SMP_ALTERNATIVES
++ bool "SMP alternatives support (EXPERIMENTAL)"
++ depends on SMP && EXPERIMENTAL
++ help
++ Try to reduce the overhead of running an SMP kernel on a uniprocessor
++ host slightly by replacing certain key instruction sequences
++ according to whether we currently have more than one CPU available.
++ This should provide a noticeable boost to performance when
++ running SMP kernels on UP machines, and have negligible impact
++ when running on an true SMP host.
++
++ If unsure, say N.
++
+ config NR_CPUS
+ int "Maximum number of CPUs (2-255)"
+ range 2 255
+@@ -227,7 +251,7 @@ config NR_CPUS
- static struct file_operations kmem_fops = {
- .llseek = memory_lseek,
---- ./drivers/char/tpm/tpm_nsc.c.xenmerge 2006-01-06 16:03:14.000000000 -0500
-+++ ./drivers/char/tpm/tpm_nsc.c 2006-01-06 16:04:32.000000000 -0500
-@@ -19,7 +19,6 @@
- *
- */
+ config SCHED_SMT
+ bool "SMT (Hyperthreading) scheduler support"
+- depends on SMP
++ depends on SMP && !X86_XEN
+ default off
+ help
+ SMT scheduler support improves the CPU scheduler's decision making
+@@ -239,7 +263,7 @@ source "kernel/Kconfig.preempt"
--#include <linux/platform_device.h>
- #include "tpm.h"
+ 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
+@@ -264,22 +288,27 @@ config X86_UP_IOAPIC
- /* National definitions */
-@@ -245,7 +244,7 @@
- &dev_attr_pcrs.attr,
- &dev_attr_caps.attr,
- &dev_attr_cancel.attr,
-- NULL,
-+ 0,
- };
+ 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
- static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs };
-@@ -262,93 +261,55 @@
- .miscdev = { .fops = &nsc_ops, },
- };
+ 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
--static struct platform_device *pdev = NULL;
--
--static void __devexit tpm_nsc_remove(struct device *dev)
--{
-- struct tpm_chip *chip = dev_get_drvdata(dev);
-- if ( chip ) {
-- release_region(chip->vendor->base, 2);
-- tpm_remove_hardware(chip->dev);
-- }
--}
--
--static struct device_driver nsc_drv = {
-- .name = "tpm_nsc",
-- .bus = &platform_bus_type,
-- .owner = THIS_MODULE,
-- .suspend = tpm_pm_suspend,
-- .resume = tpm_pm_resume,
--};
--
--static int __init init_nsc(void)
-+static int __devinit tpm_nsc_init(struct pci_dev *pci_dev,
-+ const struct pci_device_id *pci_id)
- {
- int rc = 0;
- int lo, hi;
- int nscAddrBase = TPM_ADDR;
+ config X86_VISWS_APIC
+ bool
+ depends on X86_VISWS
++ default y
++
++config X86_TSC
++ bool
++ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN
+ default y
+ 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).
+@@ -369,6 +398,7 @@ config X86_REBOOTFIXUPS
[...115951 lines suppressed...]
-- depends on SMP
-+ depends on SMP && !X86_64_XEN
- default n
- help
- SMT scheduler support improves the CPU scheduler's decision making
-@@ -250,7 +266,7 @@ source "kernel/Kconfig.preempt"
-
- config NUMA
- bool "Non Uniform Memory Access (NUMA) Support"
-- depends on SMP
-+ depends on SMP && !X86_64_XEN
- help
- Enable NUMA (Non Uniform Memory Access) support. The kernel
- will try to allocate memory used by a CPU on the local memory
-@@ -325,6 +341,7 @@ config NR_CPUS
- int "Maximum number of CPUs (2-256)"
- range 2 256
- depends on SMP
-+ default "16" if X86_64_XEN
- default "8"
- help
- This allows you to specify the maximum number of CPUs which this
-@@ -345,6 +362,7 @@ config HOTPLUG_CPU
-
- config HPET_TIMER
- bool
-+ depends on !X86_64_XEN
- default y
- help
- Use the IA-PC HPET (High Precision Event Timer) to manage
-@@ -356,7 +374,7 @@ config HPET_TIMER
-
- config X86_PM_TIMER
- bool "PM timer" if EMBEDDED
-- depends on ACPI
-+ depends on ACPI && !X86_64_XEN
- default y
- help
- Support the ACPI PM timer for time keeping. This is slow,
-@@ -377,7 +395,7 @@ config GART_IOMMU
- bool "K8 GART IOMMU support"
- default y
- select SWIOTLB
-- depends on PCI
-+ depends on PCI && !X86_64_XEN
- help
- Support the IOMMU. Needed to run systems with more than 3GB of memory
- properly with 32-bit PCI devices that do not support DAC (Double Address
-@@ -395,6 +413,7 @@ config SWIOTLB
-
- config X86_MCE
- bool "Machine check support" if EMBEDDED
-+ depends on !X86_64_XEN
- default y
- help
- Include a machine check error handler to report hardware errors.
-@@ -420,7 +439,7 @@ config X86_MCE_AMD
-
- config KEXEC
- bool "kexec system call (EXPERIMENTAL)"
-- depends on EXPERIMENTAL
-+ depends on EXPERIMENTAL && !X86_64_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
-@@ -503,12 +522,17 @@ config GENERIC_PENDING_IRQ
- default y
-
- menu "Power management options"
-+ depends on !XEN_UNPRIVILEGED_GUEST
-
-+if !X86_64_XEN
- source kernel/power/Kconfig
-+endif
-
- source "drivers/acpi/Kconfig"
-
-+if !X86_64_XEN
- source "arch/x86_64/kernel/cpufreq/Kconfig"
-+endif
-
- endmenu
-
-@@ -537,6 +561,7 @@ config UNORDERED_IO
- from i386. Requires that the driver writer used memory barriers
- properly.
-
-+if !X86_64_XEN
- source "drivers/pci/pcie/Kconfig"
-
- source "drivers/pci/Kconfig"
-@@ -544,6 +569,7 @@ source "drivers/pci/Kconfig"
- source "drivers/pcmcia/Kconfig"
-
- source "drivers/pci/hotplug/Kconfig"
-+endif
-
- endmenu
-
-@@ -606,4 +632,6 @@ source "security/Kconfig"
-
- source "crypto/Kconfig"
-
-+source "drivers/xen/Kconfig"
++void xencons_force_flush(void);
++void xencons_resume(void);
+
- source "lib/Kconfig"
-diff -uNp linux-2.6.15.i686/arch/i386/Makefile.orig linux-2.6.15.i686/arch/i386/Makefile
---- linux-2.6.15.i686/arch/i386/Makefile.orig 2006-01-25 18:07:21.000000000 -0500
-+++ linux-2.6.15.i686/arch/i386/Makefile 2006-01-25 18:11:15.000000000 -0500
-@@ -68,6 +68,10 @@ mcore-$(CONFIG_X86_BIGSMP) := mach-defau
- 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
++/* Interrupt work hooks. Receive data, or kick data out. */
++void xencons_rx(char *buf, unsigned len, struct pt_regs *regs);
++void xencons_tx(void);
+
- # generic subarchitecture
- mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
- mcore-$(CONFIG_X86_GENERICARCH) := mach-default
-@@ -96,12 +100,25 @@ drivers-$(CONFIG_PM) += arch/i386/powe
-
- CFLAGS += $(mflags-y)
- AFLAGS += $(mflags-y)
-+CPPFLAGS += $(mflags-y)
-
- boot := arch/i386/boot
-
- .PHONY: zImage bzImage compressed zlilo bzlilo \
- zdisk bzdisk fdimage fdimage144 fdimage288 install
-
-+ifdef CONFIG_XEN
-+head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o
-+boot := arch/i386/boot-xen
-+.PHONY: vmlinuz
-+all: vmlinuz
++int xencons_ring_init(void);
++int xencons_ring_send(const char *data, unsigned len);
+
-+vmlinuz: vmlinux
-+ $(Q)$(MAKE) $(build)=$(boot) $@
++#endif /* __ASM_XENCONS_H__ */
+diff -r df46ccb05adf -r 328a491adf0b scripts/Makefile.xen
+--- /dev/null Thu Jan 1 00:00:00 1970 +0000
++++ b/scripts/Makefile.xen Fri Jan 27 20:45:25 2006 +0100
+@@ -0,0 +1,14 @@
+
-+install: vmlinux
-+ $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
-+else
- all: bzImage
-
- # KBUILD_IMAGE specify target image being built
-@@ -124,6 +141,7 @@ fdimage fdimage144 fdimage288: vmlinux
-
- install:
- $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
-+endif
-
- archclean:
- $(Q)$(MAKE) $(clean)=arch/i386/boot
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/drivers/acpi/processor_idle.c linux-2.6.15.i686/drivers/acpi/processor_idle.c
---- linux-2.6.15.orig/drivers/acpi/processor_idle.c 2006-01-25 18:16:41.000000000 -0500
-+++ linux-2.6.15.i686/drivers/acpi/processor_idle.c 2006-01-26 09:45:56.000000000 -0500
-@@ -878,7 +879,7 @@ static int acpi_processor_power_verify(s
- unsigned int i;
- unsigned int working = 0;
-
--#ifdef ARCH_APICTIMER_STOPS_ON_C3
-+#if defined(ARCH_APICTIMER_STOPS_ON_C3) && !defined(CONFIG_XEN)
- struct cpuinfo_x86 *c = cpu_data + pr->id;
- cpumask_t mask = cpumask_of_cpu(pr->id);
-
-@@ -901,7 +902,7 @@ static int acpi_processor_power_verify(s
-
- case ACPI_STATE_C3:
- acpi_processor_power_verify_c3(pr, cx);
--#ifdef ARCH_APICTIMER_STOPS_ON_C3
-+#if defined(ARCH_APICTIMER_STOPS_ON_C3) && !defined(CONFIG_XEN)
- if (c->x86_vendor == X86_VENDOR_INTEL) {
- on_each_cpu(switch_APIC_timer_to_ipi,
- &mask, 1, 1);
++# cherrypickxen($1 = allobj)
++cherrypickxen = $(foreach var, $(1), \
++ $(shell o=$(var); \
++ c=$${o/%.o/-xen.c}; \
++ s=$${o/%.o/-xen.S}; \
++ oxen=$${o/%.o/-xen.o}; \
++ [ -f $(srctree)/$(src)/$${c} ] || \
++ [ -f $(srctree)/$(src)/$${s} ] \
++ && echo $$oxen \
++ || echo $(var) ) \
++ )
++# filterxen($1 = allobj, $2 = noobjs)
++filterxen = $(filter-out $(2), $(1))
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 26 Jan 2006 22:14:35 -0000 1.8
+++ sources 27 Jan 2006 22:31:07 -0000 1.9
@@ -1,5 +1,5 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
-2f072f3527bb24f37b46f4622a4404fe xen-20060106.tar.bz2
ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2
fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2
a247c21e1202f514283ba928d9382353 patch-2.6.16-rc1-git4.bz2
+6a61bb016042f108705ffb2efdce1053 xen-20060127.tar.bz2
--- linux-2.6.12-xen.patch DELETED ---
- Previous message (by thread): rpms/microcode_ctl/devel .cvsignore, 1.4, 1.5 microcode_ctl.patch, 1.5, 1.6 microcode_ctl.spec, 1.28, 1.29 sources, 1.4, 1.5
- Next message (by thread): rpms/system-config-display/devel .cvsignore, 1.24, 1.25 sources, 1.27, 1.28 system-config-display.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list