rpms/kernel/devel linux-2.6-xen.patch,1.11,1.12
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 20 17:22:42 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26400
Modified Files:
linux-2.6-xen.patch
Log Message:
rebase with linux-2.6.tip-xen cset 27368
linux-2.6-xen.patch:
arch/i386/Kconfig | 99
arch/i386/Kconfig.cpu | 2
arch/i386/Kconfig.debug | 1
arch/i386/Makefile | 24
arch/i386/boot-xen/Makefile | 21
arch/i386/kernel/Makefile | 30
arch/i386/kernel/acpi/Makefile | 4
arch/i386/kernel/acpi/boot-xen.c | 1170 ++++++++
arch/i386/kernel/apic-xen.c | 160 +
arch/i386/kernel/asm-offsets.c | 5
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 732 +++++
arch/i386/kernel/cpu/mtrr/Makefile | 7
arch/i386/kernel/cpu/mtrr/main-xen.c | 197 +
arch/i386/kernel/early_printk-xen.c | 2
arch/i386/kernel/entry-xen.S | 880 ++++++
arch/i386/kernel/entry.S | 4
arch/i386/kernel/fixup.c | 96
arch/i386/kernel/head-xen.S | 171 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2744 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 122
arch/i386/kernel/irq-xen.c | 306 ++
arch/i386/kernel/irq.c | 4
arch/i386/kernel/ldt-xen.c | 269 +
arch/i386/kernel/microcode-xen.c | 148 +
arch/i386/kernel/mpparse-xen.c | 1176 ++++++++
arch/i386/kernel/pci-dma-xen.c | 344 ++
arch/i386/kernel/process-xen.c | 824 ++++++
arch/i386/kernel/quirks-xen.c | 48
arch/i386/kernel/setup-xen.c | 1854 +++++++++++++
arch/i386/kernel/smp-xen.c | 613 ++++
arch/i386/kernel/swiotlb.c | 674 ++++
arch/i386/kernel/sysenter.c | 90
arch/i386/kernel/time-xen.c | 1097 +++++++
arch/i386/kernel/traps-xen.c | 1137 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/vm86.c | 8
arch/i386/kernel/vsyscall-note-xen.S | 32
arch/i386/kernel/vsyscall.S | 2
arch/i386/mach-xen/Makefile | 5
arch/i386/mach-xen/setup.c | 49
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 683 ++++
arch/i386/mm/highmem-xen.c | 123
arch/i386/mm/hypervisor.c | 424 +++
arch/i386/mm/init-xen.c | 882 ++++++
arch/i386/mm/ioremap-xen.c | 486 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 652 ++++
arch/i386/mm/pgtable.c | 12
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 441 +++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1205 ++++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 51
arch/ia64/Makefile | 16
arch/ia64/hp/sim/Makefile | 2
arch/ia64/kernel/entry.S | 32
arch/ia64/kernel/head.S | 6
arch/ia64/kernel/pal.S | 5
arch/ia64/kernel/sal.c | 3
arch/ia64/kernel/setup.c | 32
arch/ia64/xen/Makefile | 5
arch/ia64/xen/drivers/Makefile | 20
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/drivers/coreMakefile | 26
arch/ia64/xen/drivers/evtchn_ia64.c | 273 +
arch/ia64/xen/drivers/patches/blkback.c.patch | 33
arch/ia64/xen/drivers/patches/console.c.patch | 11
arch/ia64/xen/drivers/patches/devmem.c.patch | 2
arch/ia64/xen/drivers/patches/gnttab.c.patch | 33
arch/ia64/xen/drivers/patches/privcmd.c.patch | 30
arch/ia64/xen/drivers/xenia64_init.c | 55
arch/ia64/xen/hypercall.S | 365 ++
arch/ia64/xen/xen_ksyms.c | 12
arch/ia64/xen/xenconsole.c | 19
arch/ia64/xen/xenentry.S | 850 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2032 ++++++++++++++
arch/ia64/xen/xenminstate.h | 367 ++
arch/ia64/xen/xenpal.S | 73
arch/ia64/xen/xensetup.S | 35
arch/um/kernel/physmem.c | 4
arch/x86_64/Kconfig | 60
arch/x86_64/Makefile | 20
arch/x86_64/ia32/Makefile | 20
arch/x86_64/ia32/ia32entry-xen.S | 725 +++++
arch/x86_64/ia32/syscall32-xen.c | 128
arch/x86_64/ia32/syscall32_syscall-xen.S | 28
arch/x86_64/ia32/vsyscall-int80.S | 58
arch/x86_64/ia32/vsyscall-sigreturn.S | 2
arch/x86_64/kernel/Makefile | 20
arch/x86_64/kernel/acpi/Makefile | 1
arch/x86_64/kernel/apic-xen.c | 198 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/e820-xen.c | 777 +++++
arch/x86_64/kernel/early_printk-xen.c | 304 ++
arch/x86_64/kernel/entry-xen.S | 1141 ++++++++
arch/x86_64/kernel/entry.S | 2
arch/x86_64/kernel/genapic-xen.c | 144 +
arch/x86_64/kernel/genapic_xen.c | 162 +
arch/x86_64/kernel/head-xen.S | 163 +
arch/x86_64/kernel/head64-xen.c | 140 +
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 58
arch/x86_64/kernel/irq-xen.c | 163 +
arch/x86_64/kernel/irq.c | 4
arch/x86_64/kernel/ldt-xen.c | 282 ++
arch/x86_64/kernel/mpparse-xen.c | 1002 +++++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 54
arch/x86_64/kernel/process-xen.c | 802 +++++
arch/x86_64/kernel/setup-xen.c | 1679 ++++++++++++
arch/x86_64/kernel/setup64-xen.c | 360 ++
arch/x86_64/kernel/smp-xen.c | 596 ++++
arch/x86_64/kernel/smp.c | 4
arch/x86_64/kernel/traps-xen.c | 1025 +++++++
arch/x86_64/kernel/vsyscall-xen.c | 239 +
arch/x86_64/kernel/x8664_ksyms-xen.c | 155 +
arch/x86_64/kernel/xen_entry.S | 40
arch/x86_64/mm/Makefile | 10
arch/x86_64/mm/fault-xen.c | 644 ++++
arch/x86_64/mm/init-xen.c | 1176 ++++++++
arch/x86_64/mm/pageattr-xen.c | 390 ++
arch/x86_64/oprofile/Makefile | 5
arch/x86_64/pci/Makefile | 12
drivers/Makefile | 1
drivers/acpi/Kconfig | 3
drivers/char/mem.c | 6
drivers/char/tpm/Kconfig | 14
drivers/char/tpm/Makefile | 1
drivers/char/tpm/tpm.c | 44
drivers/char/tpm/tpm.h | 7
drivers/char/tpm/tpm_atmel.c | 230 -
drivers/char/tpm/tpm_nsc.c | 395 --
drivers/char/tpm/tpm_xen.c | 536 +++
drivers/char/tty_io.c | 7
drivers/firmware/Kconfig | 2
drivers/pci/Kconfig | 1
drivers/serial/Kconfig | 1
drivers/video/Kconfig | 2
drivers/xen/Kconfig | 223 +
drivers/xen/Makefile | 22
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 592 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 597 ++++
drivers/xen/blkback/common.h | 145 +
drivers/xen/blkback/interface.c | 181 +
drivers/xen/blkback/vbd.c | 126
drivers/xen/blkback/xenbus.c | 421 +++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 819 +++++
drivers/xen/blkfront/block.h | 165 +
drivers/xen/blkfront/vbd.c | 327 ++
drivers/xen/blktap/Makefile | 3
drivers/xen/blktap/blktap.c | 910 ++++++
drivers/xen/blktap/common.h | 110
drivers/xen/blktap/interface.c | 143 +
drivers/xen/blktap/xenbus.c | 233 +
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 192 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 648 ++++
drivers/xen/console/xencons_ring.c | 151 +
drivers/xen/core/Makefile | 11
drivers/xen/core/evtchn.c | 867 ++++++
drivers/xen/core/features.c | 29
drivers/xen/core/gnttab.c | 471 +++
drivers/xen/core/hypervisor_sysfs.c | 57
drivers/xen/core/reboot.c | 381 ++
drivers/xen/core/skbuff.c | 144 +
drivers/xen/core/smpboot.c | 576 ++++
drivers/xen/core/xen_proc.c | 29
drivers/xen/core/xen_sysfs.c | 311 ++
drivers/xen/evtchn/Makefile | 2
drivers/xen/evtchn/evtchn.c | 464 +++
drivers/xen/net_driver_util.c | 68
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 133
drivers/xen/netback/interface.c | 328 ++
drivers/xen/netback/loopback.c | 254 +
drivers/xen/netback/netback.c | 864 ++++++
drivers/xen/netback/xenbus.c | 366 ++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 1522 +++++++++++
drivers/xen/pciback/Makefile | 10
drivers/xen/pciback/conf_space.c | 345 ++
drivers/xen/pciback/conf_space.h | 97
drivers/xen/pciback/conf_space_header.c | 267 +
drivers/xen/pciback/passthrough.c | 157 +
drivers/xen/pciback/pci_stub.c | 695 +++++
drivers/xen/pciback/pciback.h | 78
drivers/xen/pciback/pciback_ops.c | 74
drivers/xen/pciback/vpci.c | 204 +
drivers/xen/pciback/xenbus.c | 441 +++
drivers/xen/pcifront/Makefile | 7
drivers/xen/pcifront/pci.c | 46
drivers/xen/pcifront/pci_op.c | 272 +
drivers/xen/pcifront/pcifront.h | 40
drivers/xen/pcifront/xenbus.c | 294 ++
drivers/xen/privcmd/Makefile | 2
drivers/xen/privcmd/privcmd.c | 303 ++
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 91
drivers/xen/tpmback/interface.c | 192 +
drivers/xen/tpmback/tpmback.c | 1055 +++++++
drivers/xen/tpmback/xenbus.c | 329 ++
drivers/xen/tpmfront/Makefile | 2
drivers/xen/tpmfront/tpmfront.c | 767 +++++
drivers/xen/tpmfront/tpmfront.h | 40
drivers/xen/util.c | 80
drivers/xen/xenbus/Makefile | 12
drivers/xen/xenbus/xenbus_backend_client.c | 165 +
drivers/xen/xenbus/xenbus_client.c | 284 ++
drivers/xen/xenbus/xenbus_comms.c | 218 +
drivers/xen/xenbus/xenbus_comms.h | 53
drivers/xen/xenbus/xenbus_dev.c | 255 +
drivers/xen/xenbus/xenbus_probe.c | 1093 +++++++
drivers/xen/xenbus/xenbus_xs.c | 856 ++++++
fs/Kconfig | 1
include/asm-i386/a.out.h | 2
include/asm-i386/apic.h | 2
include/asm-i386/asm-offsets.h | 48
include/asm-i386/elf.h | 7
include/asm-i386/fixmap.h | 13
include/asm-i386/mach-default/mach_traps.h | 12
include/asm-i386/mach-xen/asm/agp.h | 37
include/asm-i386/mach-xen/asm/desc.h | 164 +
include/asm-i386/mach-xen/asm/dma-mapping.h | 156 +
include/asm-i386/mach-xen/asm/fixmap.h | 156 +
include/asm-i386/mach-xen/asm/floppy.h | 147 +
include/asm-i386/mach-xen/asm/highmem.h | 81
include/asm-i386/mach-xen/asm/hw_irq.h | 73
include/asm-i386/mach-xen/asm/hypercall.h | 357 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 224 +
include/asm-i386/mach-xen/asm/io.h | 390 ++
include/asm-i386/mach-xen/asm/kmap_types.h | 32
include/asm-i386/mach-xen/asm/mmu.h | 21
include/asm-i386/mach-xen/asm/mmu_context.h | 105
include/asm-i386/mach-xen/asm/page.h | 326 ++
include/asm-i386/mach-xen/asm/param.h | 24
include/asm-i386/mach-xen/asm/pci.h | 154 +
include/asm-i386/mach-xen/asm/pgalloc.h | 64
include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
include/asm-i386/mach-xen/asm/pgtable-2level.h | 85
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
include/asm-i386/mach-xen/asm/pgtable-3level.h | 183 +
include/asm-i386/mach-xen/asm/pgtable.h | 520 +++
include/asm-i386/mach-xen/asm/processor.h | 756 +++++
include/asm-i386/mach-xen/asm/ptrace.h | 90
include/asm-i386/mach-xen/asm/scatterlist.h | 22
include/asm-i386/mach-xen/asm/segment.h | 117
include/asm-i386/mach-xen/asm/setup.h | 64
include/asm-i386/mach-xen/asm/smp.h | 104
include/asm-i386/mach-xen/asm/spinlock.h | 200 +
include/asm-i386/mach-xen/asm/swiotlb.h | 43
include/asm-i386/mach-xen/asm/synch_bitops.h | 141 +
include/asm-i386/mach-xen/asm/system.h | 576 ++++
include/asm-i386/mach-xen/asm/tlbflush.h | 102
include/asm-i386/mach-xen/asm/vga.h | 20
include/asm-i386/mach-xen/irq_vectors.h | 125
include/asm-i386/mach-xen/mach_traps.h | 33
include/asm-i386/mach-xen/setup_arch_post.h | 54
include/asm-i386/mach-xen/setup_arch_pre.h | 5
include/asm-i386/page.h | 4
include/asm-i386/pgtable-2level-defs.h | 2
include/asm-i386/pgtable-3level-defs.h | 2
include/asm-ia64/fixmap.h | 2
include/asm-ia64/gcc_intrin.h | 60
include/asm-ia64/hypercall.h | 274 +
include/asm-ia64/hypervisor.h | 138 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/meminit.h | 5
include/asm-ia64/pal.h | 1
include/asm-ia64/privop.h | 59
include/asm-ia64/processor.h | 1
include/asm-ia64/synch_bitops.h | 61
include/asm-ia64/system.h | 4
include/asm-ia64/xen/privop.h | 277 ++
include/asm-um/page.h | 2
include/asm-x86_64/apic.h | 2
include/asm-x86_64/hw_irq.h | 2
include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
include/asm-x86_64/mach-xen/asm/bootsetup.h | 42
include/asm-x86_64/mach-xen/asm/desc.h | 263 +
include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 +
include/asm-x86_64/mach-xen/asm/dmi.h | 29
include/asm-x86_64/mach-xen/asm/fixmap.h | 114
include/asm-x86_64/mach-xen/asm/floppy.h | 206 +
include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 +
include/asm-x86_64/mach-xen/asm/hypercall.h | 357 ++
include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
include/asm-x86_64/mach-xen/asm/io.h | 328 ++
include/asm-x86_64/mach-xen/asm/irq.h | 39
include/asm-x86_64/mach-xen/asm/mmu.h | 33
include/asm-x86_64/mach-xen/asm/mmu_context.h | 134
include/asm-x86_64/mach-xen/asm/msr.h | 399 ++
include/asm-x86_64/mach-xen/asm/nmi.h | 75
include/asm-x86_64/mach-xen/asm/page.h | 317 ++
include/asm-x86_64/mach-xen/asm/param.h | 23
include/asm-x86_64/mach-xen/asm/pci.h | 174 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 226 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 564 ++++
include/asm-x86_64/mach-xen/asm/processor.h | 494 +++
include/asm-x86_64/mach-xen/asm/ptrace.h | 125
include/asm-x86_64/mach-xen/asm/smp.h | 153 +
include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
include/asm-x86_64/mach-xen/asm/system.h | 428 +++
include/asm-x86_64/mach-xen/asm/timer.h | 67
include/asm-x86_64/mach-xen/asm/tlbflush.h | 104
include/asm-x86_64/mach-xen/asm/vga.h | 20
include/asm-x86_64/mach-xen/asm/xor.h | 328 ++
include/asm-x86_64/mach-xen/irq_vectors.h | 123
include/asm-x86_64/mach-xen/mach_time.h | 111
include/asm-x86_64/mach-xen/mach_timer.h | 48
include/asm-x86_64/mach-xen/setup_arch_post.h | 41
include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
include/linux/gfp.h | 6
include/linux/highmem.h | 6
include/linux/mm.h | 13
include/linux/pfn.h | 2
include/linux/skbuff.h | 13
include/xen/balloon.h | 73
include/xen/driver_util.h | 26
include/xen/evtchn.h | 126
include/xen/features.h | 20
include/xen/foreign_page.h | 40
include/xen/gnttab.h | 160 +
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/acm.h | 181 +
include/xen/interface/acm_ops.h | 98
include/xen/interface/arch-ia64.h | 337 ++
include/xen/interface/arch-x86_32.h | 200 +
include/xen/interface/arch-x86_64.h | 273 +
include/xen/interface/callback.h | 57
include/xen/interface/dom0_ops.h | 531 +++
include/xen/interface/event_channel.h | 211 +
include/xen/interface/features.h | 53
include/xen/interface/grant_table.h | 311 ++
include/xen/interface/hvm/hvm_info_table.h | 24
include/xen/interface/hvm/ioreq.h | 94
include/xen/interface/hvm/vmx_assist.h | 97
include/xen/interface/io/blkif.h | 85
include/xen/interface/io/console.h | 33
include/xen/interface/io/netif.h | 84
include/xen/interface/io/pciif.h | 55
include/xen/interface/io/ring.h | 265 +
include/xen/interface/io/tpmif.h | 56
include/xen/interface/io/xenbus.h | 42
include/xen/interface/io/xs_wire.h | 97
include/xen/interface/memory.h | 155 +
include/xen/interface/nmi.h | 59
include/xen/interface/physdev.h | 71
include/xen/interface/sched.h | 100
include/xen/interface/sched_ctl.h | 64
include/xen/interface/trace.h | 86
include/xen/interface/vcpu.h | 119
include/xen/interface/version.h | 64
include/xen/interface/xen-compat.h | 31
include/xen/interface/xen.h | 461 +++
include/xen/interface/xenoprof.h | 91
include/xen/net_driver_util.h | 58
include/xen/pcifront.h | 39
include/xen/public/evtchn.h | 101
include/xen/public/privcmd.h | 94
include/xen/tpmfe.h | 40
include/xen/xen_proc.h | 23
include/xen/xenbus.h | 306 ++
include/xen/xencons.h | 14
kernel/Kconfig.preempt | 1
kernel/irq/manage.c | 24
lib/Kconfig.debug | 31
lib/Makefile | 3
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 116
mm/mmap.c | 4
mm/page_alloc.c | 6
net/core/dev.c | 51
net/core/skbuff.c | 41
net/ipv4/netfilter/ip_nat_proto_tcp.c | 9
net/ipv4/netfilter/ip_nat_proto_udp.c | 12
scripts/Makefile.xen | 14
389 files changed, 80372 insertions(+), 856 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-xen.patch 19 Apr 2006 03:45:17 -0000 1.11
+++ linux-2.6-xen.patch 20 Apr 2006 17:22:37 -0000 1.12
@@ -1,7 +1,32 @@
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/arch/i386/Kconfig tip2/arch/i386/Kconfig
---- src/linux-2.6.17-rc1/arch/i386/Kconfig 2006-04-12 22:59:33.000000000 +0200
-+++ tip2/arch/i386/Kconfig 2006-04-10 15:29:39.000000000 +0200
-@@ -62,6 +62,15 @@ config X86_PC
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/boot-xen/Makefile i386/arch/i386/boot-xen/Makefile
+--- ../hg/linux-2.6/arch/i386/boot-xen/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ i386/arch/i386/boot-xen/Makefile 2006-04-20 07:09:43.000000000 -0400
+@@ -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 -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/i386/Kconfig i386/arch/i386/Kconfig
+--- ../hg/linux-2.6/arch/i386/Kconfig 2006-04-17 13:34:05.000000000 -0400
++++ i386/arch/i386/Kconfig 2006-04-20 07:09:43.000000000 -0400
+@@ -91,6 +91,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -17,7 +42,7 @@
config X86_ELAN
bool "AMD Elan"
help
-@@ -164,6 +173,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -193,6 +202,7 @@ source "arch/i386/Kconfig.cpu"
config HPET_TIMER
bool "HPET Timer Support"
@@ -110,7 +135,7 @@
source "drivers/firmware/Kconfig"
choice
-@@ -572,7 +593,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -578,7 +599,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
config HIGHPTE
bool "Allocate 3rd-level pagetables from highmem"
@@ -119,7 +144,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
-@@ -581,6 +602,7 @@ config HIGHPTE
+@@ -587,6 +608,7 @@ config HIGHPTE
config MATH_EMULATION
bool "Math emulation"
@@ -127,7 +152,7 @@
---help---
Linux can emulate a math coprocessor (used for floating point
operations) if you don't have one. 486DX and Pentium processors have
-@@ -606,6 +628,8 @@ config MATH_EMULATION
+@@ -612,6 +634,8 @@ config MATH_EMULATION
config MTRR
bool "MTRR (Memory Type Range Register) support"
@@ -136,7 +161,7 @@
---help---
On Intel P6 family processors (Pentium Pro, Pentium II and later)
the Memory Type Range Registers (MTRRs) may be used to control
-@@ -640,7 +664,7 @@ config MTRR
+@@ -646,7 +670,7 @@ config MTRR
config EFI
bool "Boot from EFI support (EXPERIMENTAL)"
@@ -145,7 +170,7 @@
default n
---help---
This enables the the kernel to boot on EFI platforms using
-@@ -658,7 +682,7 @@ config EFI
+@@ -664,7 +688,7 @@ config EFI
config IRQBALANCE
bool "Enable kernel irq balancing"
@@ -154,7 +179,7 @@
default y
help
The default yes will allow the kernel to do irq load balancing.
-@@ -706,7 +730,7 @@ source kernel/Kconfig.hz
+@@ -712,7 +736,7 @@ source kernel/Kconfig.hz
config KEXEC
bool "kexec system call (EXPERIMENTAL)"
@@ -163,7 +188,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
-@@ -750,7 +774,7 @@ config PHYSICAL_START
+@@ -756,7 +780,7 @@ config PHYSICAL_START
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
@@ -172,7 +197,7 @@
---help---
Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu.
-@@ -770,18 +795,20 @@ endmenu
+@@ -767,18 +791,20 @@ endmenu
menu "Power management options (ACPI, APM)"
@@ -196,7 +221,7 @@
---help---
APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with
-@@ -966,6 +993,7 @@ choice
+@@ -963,6 +989,7 @@ choice
config PCI_GOBIOS
bool "BIOS"
@@ -204,7 +229,7 @@
config PCI_GOMMCONFIG
bool "MMConfig"
-@@ -973,6 +1001,13 @@ config PCI_GOMMCONFIG
+@@ -970,6 +997,13 @@ config PCI_GOMMCONFIG
config PCI_GODIRECT
bool "Direct"
@@ -218,7 +243,7 @@
config PCI_GOANY
bool "Any"
-@@ -980,7 +1015,7 @@ endchoice
+@@ -977,7 +1011,7 @@ endchoice
config PCI_BIOS
bool
@@ -227,7 +252,7 @@
default y
config PCI_DIRECT
-@@ -993,6 +1028,18 @@ config PCI_MMCONFIG
+@@ -990,6 +1024,18 @@ config PCI_MMCONFIG
depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
default y
@@ -246,7 +271,7 @@
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
-@@ -1003,7 +1050,7 @@ config ISA_DMA_API
+@@ -1000,7 +1046,7 @@ config ISA_DMA_API
config ISA
bool "ISA support"
@@ -255,7 +280,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
-@@ -1030,7 +1077,7 @@ config EISA
+@@ -1027,7 +1073,7 @@ config EISA
source "drivers/eisa/Kconfig"
config MCA
@@ -264,7 +289,7 @@
default y if X86_VOYAGER
help
MicroChannel Architecture is found in some IBM PS/2 machines and
-@@ -1092,6 +1139,8 @@ source "security/Kconfig"
+@@ -1089,6 +1135,8 @@ source "security/Kconfig"
source "crypto/Kconfig"
@@ -273,7 +298,7 @@
source "lib/Kconfig"
#
-@@ -1117,7 +1166,7 @@ config X86_SMP
+@@ -1114,7 +1162,7 @@ config X86_SMP
config X86_HT
bool
@@ -282,7 +307,7 @@
default y
[...11954 lines suppressed...]
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
@@ -83950,196 +84515,3 @@
+ )
+# filterxen($1 = allobj, $2 = noobjs)
+filterxen = $(filter-out $(2), $(1))
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff src/linux-2.6.17-rc1/include/xen/interface/version.h tip2/include/xen/interface/version.h
---- src/linux-2.6.17-rc1/include/xen/interface/version.h 1970-01-01 01:00:00.000000000 +0100
-+++ tip2/include/xen/interface/version.h 2006-04-10 15:30:55.000000000 +0200
-@@ -0,0 +1,64 @@
-+/******************************************************************************
-+ * version.h
-+ *
-+ * Xen version, type, and compile information.
-+ *
-+ * Copyright (c) 2005, Nguyen Anh Quynh <aquynh at gmail.com>
-+ * Copyright (c) 2005, Keir Fraser <keir at xensource.com>
-+ */
-+
-+#ifndef __XEN_PUBLIC_VERSION_H__
-+#define __XEN_PUBLIC_VERSION_H__
-+
-+/* NB. All ops return zero on success, except XENVER_version. */
-+
-+/* arg == NULL; returns major:minor (16:16). */
-+#define XENVER_version 0
-+
-+/* arg == xen_extraversion_t. */
-+#define XENVER_extraversion 1
-+typedef char xen_extraversion_t[16];
-+#define XEN_EXTRAVERSION_LEN (sizeof(xen_extraversion_t))
-+
-+/* arg == xen_compile_info_t. */
-+#define XENVER_compile_info 2
-+typedef struct xen_compile_info {
-+ char compiler[64];
-+ char compile_by[16];
-+ char compile_domain[32];
-+ char compile_date[32];
-+} xen_compile_info_t;
-+
-+#define XENVER_capabilities 3
-+typedef char xen_capabilities_info_t[1024];
-+#define XEN_CAPABILITIES_INFO_LEN (sizeof(xen_capabilities_info_t))
-+
-+#define XENVER_changeset 4
-+typedef char xen_changeset_info_t[64];
-+#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
-+
-+#define XENVER_platform_parameters 5
-+typedef struct xen_platform_parameters {
-+ unsigned long virt_start;
-+} xen_platform_parameters_t;
-+
-+#define XENVER_get_features 6
-+typedef struct xen_feature_info {
-+ unsigned int submap_idx; /* IN: which 32-bit submap to return */
-+ uint32_t submap; /* OUT: 32-bit submap */
-+} xen_feature_info_t;
-+
-+/* Declares the features reported by XENVER_get_features. */
-+#include "features.h"
-+
-+#endif /* __XEN_PUBLIC_VERSION_H__ */
-+
-+/*
-+ * Local variables:
-+ * mode: C
-+ * c-set-style: "BSD"
-+ * c-basic-offset: 4
-+ * tab-width: 4
-+ * indent-tabs-mode: nil
-+ * End:
-+ */
-diff -uNp linux-2.6.16.noarch/arch/x86_64/Makefile.orig linux-2.6.16.noarch/arch/x86_64/Makefile
---- linux-2.6.16.noarch/arch/x86_64/Makefile.orig 2006-04-13 13:51:16.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/Makefile 2006-04-13 13:46:18.000000000 +0200
-@@ -31,6 +31,10 @@ cflags-$(CONFIG_MK8) += $(call cc-option
- cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
- cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
-
-+cppflags-$(CONFIG_XEN) += \
-+ -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
-+CPPFLAGS += $(cppflags-y)
-+
- cflags-y += -m64
- cflags-y += -mno-red-zone
- cflags-y += -mcmodel=kernel
-@@ -72,6 +76,21 @@ boot := arch/x86_64/boot
- PHONY += bzImage bzlilo install archmrproper \
- fdimage fdimage144 fdimage288 isoimage archclean
-
-+ifdef CONFIG_XEN
-+CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
-+head-y := arch/x86_64/kernel/head-xen.o arch/x86_64/kernel/head64-xen.o arch/x86_64/kernel/init_task.o
-+LDFLAGS_vmlinux := -e _start
-+boot := arch/i386/boot-xen
-+.PHONY: vmlinuz
-+#Default target when executing "make"
-+all: vmlinuz
-+
-+vmlinuz: vmlinux
-+ $(Q)$(MAKE) $(build)=$(boot) $@
-+
-+install:
-+ $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
-+else
- #Default target when executing "make"
- all: bzImage
-
-@@ -92,6 +111,7 @@ fdimage fdimage144 fdimage288 isoimage:
-
- install:
- $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@
-+endif
-
- archclean:
- $(Q)$(MAKE) $(clean)=$(boot)
-diff -uNp linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig linux-2.6.16.noarch/arch/x86_64/ia32/Makefile
---- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig 2006-04-13 13:51:34.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-04-13 13:48:11.000000000 +0200
-@@ -26,12 +26,28 @@ quiet_cmd_syscall = SYSCALL $@
- -Wl,-soname=linux-gate.so.1 -o $@ \
- -Wl,-T,$(filter-out FORCE,$^)
-
-+$(obj)/vsyscall-int80.so \
- $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
- $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
- $(call if_changed,syscall)
-
--AFLAGS_vsyscall-sysenter.o = -m32
--AFLAGS_vsyscall-syscall.o = -m32
-+AFLAGS_vsyscall-sysenter.o = -m32 -Iarch/i386/kernel
-+AFLAGS_vsyscall-syscall.o = -m32 -Iarch/i386/kernel
-+
-+ifdef CONFIG_XEN
-+AFLAGS_vsyscall-int80.o = -m32 -Iarch/i386/kernel
-+CFLAGS_syscall32-xen.o += -DUSE_INT80
-+AFLAGS_syscall32_syscall-xen.o += -DUSE_INT80
-+
-+$(obj)/syscall32_syscall-xen.o: \
-+ $(foreach F,int80 sysenter syscall,$(obj)/vsyscall-$F.so)
-+
-+targets := $(foreach F,int80 sysenter syscall,vsyscall-$F.o vsyscall-$F.so)
-+
-+include $(srctree)/scripts/Makefile.xen
-+
-+obj-y := $(call cherrypickxen, $(obj-y))
-+endif
- AFLAGS_syscall32_syscall.o += -m64
- AFLAGS_ia32entry.o += -m64
-
-diff -uNp linux-2.6.16.noarch/arch/x86_64/kernel/Makefile.orig linux-2.6.16.noarch/arch/x86_64/kernel/Makefile
---- linux-2.6.16.noarch/arch/x86_64/kernel/Makefile.orig 2006-04-17 22:41:11.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/kernel/Makefile 2006-04-17 22:35:26.000000000 +0200
-@@ -20,11 +20,13 @@ obj-$(CONFIG_MICROCODE) += microcode.o
- obj-$(CONFIG_X86_CPUID) += cpuid.o
- obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o
- obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
-+obj-$(CONFIG_X86_XEN_GENAPIC) += genapic.o genapic_xen.o
- obj-$(CONFIG_X86_IO_APIC) += io_apic.o mpparse.o \
- genapic.o genapic_cluster.o genapic_flat.o
- obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
- obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
--obj-$(CONFIG_PM) += suspend.o
-+obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
-+obj-$(CONFIG_ACPI_SLEEP) += suspend.o
- obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o
- obj-$(CONFIG_CPU_FREQ) += cpufreq/
- obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-@@ -49,3 +51,18 @@ intel_cacheinfo-y += ../../i386/kernel/
- quirks-y += ../../i386/kernel/quirks.o
- i8237-y += ../../i386/kernel/i8237.o
- msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../i386/kernel/msr.o
-+
-+ifdef CONFIG_XEN
-+time-y += ../../i386/kernel/time-xen.o
-+pci-dma-y += ../../i386/kernel/pci-dma-xen.o
-+microcode-$(subst m,y,$(CONFIG_MICROCODE)) := ../../i386/kernel/microcode-xen.o
-+quirks-y := ../../i386/kernel/quirks-xen.o
-+
-+n-obj-xen := i8259.o reboot.o i8237.o smpboot.o trampoline.o
-+
-+include $(srctree)/scripts/Makefile.xen
-+
-+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
-+obj-y := $(call cherrypickxen, $(obj-y))
-+extra-y := $(call cherrypickxen, $(extra-y))
-+endif
---- linux-2.6.16.noarch/arch/i386/Kconfig.debug~ 2006-04-18 22:40:38.000000000 -0500
-+++ linux-2.6.16.noarch/arch/i386/Kconfig.debug 2006-04-18 22:41:11.000000000 -0500
-@@ -84,6 +84,7 @@ config X86_MPPARSE
- config DOUBLEFAULT
- default y
- bool "Enable doublefault exception handler" if EMBEDDED
-+ depends on !X86_NO_TSS
- help
- This option allows trapping of rare doublefault exceptions that
- would otherwise cause a system to silently reboot. Disabling this
More information about the fedora-cvs-commits
mailing list