rpms/kernel/devel kernel-2.6.spec, 1.2608.2.1, 1.2608.2.2 linux-2.6-xen.patch, 1.60, 1.60.2.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 1 01:23:32 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2966
Modified Files:
Tag: private-quintela-3hypercalls-branch
kernel-2.6.spec linux-2.6-xen.patch
Log Message:
- xen update (3hypercall incompatibility included)
- linux-2.6 changeset: 34021:96406d23184b
- linux-2.6-xen-fedora changeset: 35845:316332216763
- xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2608.2.1
retrieving revision 1.2608.2.2
diff -u -r1.2608.2.1 -r1.2608.2.2
--- kernel-2.6.spec 31 Aug 2006 22:54:22 -0000 1.2608.2.1
+++ kernel-2.6.spec 1 Sep 2006 01:23:24 -0000 1.2608.2.2
@@ -497,8 +497,6 @@
# Xen hypervisor patches (20000+)
Patch20000: xen-missing-includes.patch
-Patch20001: xen-ia64-gnttab_make_dirty.patch
-Patch20002: xen-ia64-shadow.patch
# END OF PATCH DEFINITIONS
@@ -1124,8 +1122,6 @@
cd xen
# Any necessary hypervisor patches go here
%patch20000 -p1
-%patch20001 -p2
-%patch20002 -p2
%endif
@@ -1817,6 +1813,10 @@
%changelog
* Fri Sep 1 2006 Juan Quintela <quintela at redhat.com>
- update xen HV to cset 11394.
+- xen update (3hypercall incompatibility included)
+- linux-2.6 changeset: 34021:96406d23184b
+- linux-2.6-xen-fedora changeset: 35845:316332216763
+- xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
* Wed Aug 30 2006 Juan Quintela <quintela at redhat.com>
- update xen-hv to cset 11256 (pre 3 hypercall breakage).
linux-2.6-xen.patch:
arch/i386/Kconfig | 85
arch/i386/Kconfig.cpu | 4
arch/i386/Kconfig.debug | 1
arch/i386/Makefile | 24
arch/i386/boot-xen/Makefile | 21
arch/i386/kernel/Makefile | 21
arch/i386/kernel/acpi/Makefile | 4
arch/i386/kernel/acpi/boot-xen.c | 1168 ++++++++
arch/i386/kernel/alternative.c | 8
arch/i386/kernel/apic-xen.c | 160 +
arch/i386/kernel/asm-offsets.c | 7
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 739 +++++
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 | 1209 ++++++++
arch/i386/kernel/entry.S | 6
arch/i386/kernel/fixup.c | 92
arch/i386/kernel/head-xen.S | 200 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2771 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
arch/i386/kernel/irq-xen.c | 324 ++
arch/i386/kernel/ldt-xen.c | 270 +
arch/i386/kernel/microcode-xen.c | 147 +
arch/i386/kernel/mpparse-xen.c | 1185 ++++++++
arch/i386/kernel/pci-dma-xen.c | 379 ++
arch/i386/kernel/process-xen.c | 812 +++++
arch/i386/kernel/quirks-xen.c | 47
arch/i386/kernel/setup-xen.c | 1847 +++++++++++++
arch/i386/kernel/smp-xen.c | 624 ++++
arch/i386/kernel/swiotlb.c | 672 ++++
arch/i386/kernel/sysenter.c | 22
arch/i386/kernel/time-xen.c | 1101 +++++++
arch/i386/kernel/traps-xen.c | 1180 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/tsc.c | 2
arch/i386/kernel/vm86.c | 12
arch/i386/kernel/vmlinux.lds.S | 12
arch/i386/kernel/vsyscall-note-xen.S | 32
arch/i386/lib/delay.c | 3
arch/i386/mach-xen/Makefile | 5
arch/i386/mach-xen/irqflags.c | 99
arch/i386/mach-xen/setup.c | 153 +
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 770 +++++
arch/i386/mm/highmem-xen.c | 133
arch/i386/mm/hypervisor.c | 457 +++
arch/i386/mm/init-xen.c | 851 ++++++
arch/i386/mm/ioremap-xen.c | 439 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 699 +++++
arch/i386/mm/pgtable.c | 12
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 570 ++++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1206 ++++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 66
arch/ia64/Makefile | 16
arch/ia64/dig/setup.c | 34
arch/ia64/hp/sim/Makefile | 2
arch/ia64/kernel/asm-offsets.c | 25
arch/ia64/kernel/entry.S | 32
arch/ia64/kernel/gate.S | 113
arch/ia64/kernel/gate.lds.S | 22
arch/ia64/kernel/head.S | 6
arch/ia64/kernel/iosapic.c | 65
arch/ia64/kernel/irq_ia64.c | 259 +
arch/ia64/kernel/pal.S | 5
arch/ia64/kernel/patch.c | 71
arch/ia64/kernel/setup.c | 125
arch/ia64/mm/ioremap.c | 3
arch/ia64/xen/Makefile | 8
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/hypercall.S | 413 ++
arch/ia64/xen/hypervisor.c | 833 ++++++
arch/ia64/xen/util.c | 115
arch/ia64/xen/xenentry.S | 867 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2169 +++++++++++++++
arch/ia64/xen/xenminstate.h | 368 ++
arch/ia64/xen/xenpal.S | 76
arch/ia64/xen/xensetup.S | 54
arch/um/kernel/physmem.c | 4
arch/x86_64/Kconfig | 63
arch/x86_64/Makefile | 20
arch/x86_64/ia32/Makefile | 20
arch/x86_64/ia32/ia32entry-xen.S | 743 +++++
arch/x86_64/ia32/syscall32-xen.c | 128
arch/x86_64/ia32/syscall32_syscall-xen.S | 28
arch/x86_64/ia32/vsyscall-int80.S | 58
arch/x86_64/ia32/vsyscall-sigreturn.S | 2
arch/x86_64/kernel/Makefile | 19
arch/x86_64/kernel/acpi/Makefile | 1
arch/x86_64/kernel/apic-xen.c | 197 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/e820-xen.c | 754 +++++
arch/x86_64/kernel/early_printk-xen.c | 304 ++
arch/x86_64/kernel/entry-xen.S | 1210 ++++++++
arch/x86_64/kernel/genapic-xen.c | 143 +
arch/x86_64/kernel/genapic_xen.c | 176 +
arch/x86_64/kernel/head-xen.S | 191 +
arch/x86_64/kernel/head64-xen.c | 161 +
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2263 ++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 99
arch/x86_64/kernel/irq-xen.c | 198 +
arch/x86_64/kernel/irqflags-xen.c | 100
arch/x86_64/kernel/ldt-xen.c | 282 ++
arch/x86_64/kernel/mpparse-xen.c | 1011 +++++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 54
arch/x86_64/kernel/process-xen.c | 794 +++++
arch/x86_64/kernel/setup-xen.c | 1657 +++++++++++
arch/x86_64/kernel/setup64-xen.c | 360 ++
arch/x86_64/kernel/smp-xen.c | 600 ++++
arch/x86_64/kernel/traps-xen.c | 1166 ++++++++
arch/x86_64/kernel/vmlinux.lds.S | 16
arch/x86_64/kernel/vsyscall-xen.c | 239 +
arch/x86_64/kernel/xen_entry.S | 40
arch/x86_64/mm/Makefile | 10
arch/x86_64/mm/fault-xen.c | 723 +++++
arch/x86_64/mm/init-xen.c | 1200 ++++++++
arch/x86_64/mm/pageattr-xen.c | 396 ++
arch/x86_64/oprofile/Makefile | 5
arch/x86_64/pci/Makefile | 12
drivers/Makefile | 1
drivers/acpi/Kconfig | 3
drivers/char/hangcheck-timer.c | 2
drivers/char/mem.c | 6
drivers/char/tpm/Kconfig | 12
drivers/char/tpm/Makefile | 2
drivers/char/tpm/tpm.c | 55
drivers/char/tpm/tpm.h | 7
drivers/char/tpm/tpm_vtpm.c | 547 +++
drivers/char/tpm/tpm_vtpm.h | 68
drivers/char/tpm/tpm_xen.c | 756 +++++
drivers/char/tty_io.c | 7
drivers/firmware/Kconfig | 2
drivers/ide/ide-lib.c | 8
drivers/oprofile/buffer_sync.c | 66
drivers/oprofile/cpu_buffer.c | 51
drivers/oprofile/cpu_buffer.h | 9
drivers/oprofile/event_buffer.h | 7
drivers/oprofile/oprof.c | 32
drivers/oprofile/oprof.h | 3
drivers/oprofile/oprofile_files.c | 207 +
drivers/pci/Kconfig | 1
drivers/serial/Kconfig | 1
drivers/xen/Kconfig | 260 +
drivers/xen/Makefile | 17
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 625 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 567 ++++
drivers/xen/blkback/common.h | 133
drivers/xen/blkback/interface.c | 171 +
drivers/xen/blkback/vbd.c | 119
drivers/xen/blkback/xenbus.c | 464 +++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 842 ++++++
drivers/xen/blkfront/block.h | 154 +
drivers/xen/blkfront/vbd.c | 318 ++
drivers/xen/blktap/Makefile | 3
drivers/xen/blktap/blktap.c | 1444 ++++++++++
drivers/xen/blktap/common.h | 119
drivers/xen/blktap/interface.c | 159 +
drivers/xen/blktap/xenbus.c | 353 ++
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 180 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 644 ++++
drivers/xen/console/xencons_ring.c | 141 +
drivers/xen/core/Makefile | 13
drivers/xen/core/cpu_hotplug.c | 188 +
drivers/xen/core/evtchn.c | 868 ++++++
drivers/xen/core/features.c | 30
drivers/xen/core/gnttab.c | 483 +++
drivers/xen/core/hypervisor_sysfs.c | 59
drivers/xen/core/reboot.c | 384 ++
drivers/xen/core/skbuff.c | 139 +
drivers/xen/core/smpboot.c | 429 +++
drivers/xen/core/xen_proc.c | 18
drivers/xen/core/xen_sysfs.c | 378 ++
drivers/xen/evtchn/Makefile | 2
drivers/xen/evtchn/evtchn.c | 456 +++
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 141 +
drivers/xen/netback/interface.c | 339 ++
drivers/xen/netback/loopback.c | 260 +
drivers/xen/netback/netback.c | 1498 ++++++++++
drivers/xen/netback/xenbus.c | 461 +++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 2077 ++++++++++++++
drivers/xen/pciback/Makefile | 15
drivers/xen/pciback/conf_space.c | 425 +++
drivers/xen/pciback/conf_space.h | 126
drivers/xen/pciback/conf_space_capability.c | 71
drivers/xen/pciback/conf_space_capability.h | 23
drivers/xen/pciback/conf_space_capability_pm.c | 113
drivers/xen/pciback/conf_space_capability_vpd.c | 42
drivers/xen/pciback/conf_space_header.c | 299 ++
drivers/xen/pciback/conf_space_quirks.c | 128
drivers/xen/pciback/conf_space_quirks.h | 35
drivers/xen/pciback/passthrough.c | 157 +
drivers/xen/pciback/pci_stub.c | 916 ++++++
drivers/xen/pciback/pciback.h | 93
drivers/xen/pciback/pciback_ops.c | 95
drivers/xen/pciback/slot.c | 151 +
drivers/xen/pciback/vpci.c | 204 +
drivers/xen/pciback/xenbus.c | 458 +++
drivers/xen/pcifront/Makefile | 7
drivers/xen/pcifront/pci.c | 46
drivers/xen/pcifront/pci_op.c | 273 +
drivers/xen/pcifront/pcifront.h | 40
drivers/xen/pcifront/xenbus.c | 295 ++
drivers/xen/privcmd/Makefile | 2
drivers/xen/privcmd/privcmd.c | 266 +
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 84
drivers/xen/tpmback/interface.c | 177 +
drivers/xen/tpmback/tpmback.c | 944 ++++++
drivers/xen/tpmback/xenbus.c | 287 ++
drivers/xen/util.c | 70
drivers/xen/xenbus/Makefile | 12
drivers/xen/xenbus/xenbus_backend_client.c | 135
drivers/xen/xenbus/xenbus_client.c | 278 ++
drivers/xen/xenbus/xenbus_comms.c | 203 +
drivers/xen/xenbus/xenbus_comms.h | 45
drivers/xen/xenbus/xenbus_dev.c | 356 ++
drivers/xen/xenbus/xenbus_probe.c | 1150 ++++++++
drivers/xen/xenbus/xenbus_xs.c | 853 ++++++
fs/Kconfig | 1
include/asm-generic/vmlinux.lds.h | 3
include/asm-i386/apic.h | 2
include/asm-i386/fixmap.h | 4
include/asm-i386/mach-default/mach_traps.h | 12
include/asm-i386/mach-xen/asm/agp.h | 37
include/asm-i386/mach-xen/asm/desc.h | 164 +
include/asm-i386/mach-xen/asm/dma-mapping.h | 151 +
include/asm-i386/mach-xen/asm/fixmap.h | 156 +
include/asm-i386/mach-xen/asm/floppy.h | 147 +
include/asm-i386/mach-xen/asm/highmem.h | 80
include/asm-i386/mach-xen/asm/hw_irq.h | 72
include/asm-i386/mach-xen/asm/hypercall.h | 389 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 234 +
include/asm-i386/mach-xen/asm/io.h | 389 ++
include/asm-i386/mach-xen/asm/irqflags.h | 80
include/asm-i386/mach-xen/asm/kmap_types.h | 31
include/asm-i386/mach-xen/asm/maddr.h | 160 +
include/asm-i386/mach-xen/asm/mmu.h | 29
include/asm-i386/mach-xen/asm/mmu_context.h | 108
include/asm-i386/mach-xen/asm/page.h | 220 +
include/asm-i386/mach-xen/asm/param.h | 23
include/asm-i386/mach-xen/asm/pci.h | 153 +
include/asm-i386/mach-xen/asm/pgalloc.h | 63
include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
include/asm-i386/mach-xen/asm/pgtable-2level.h | 87
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
include/asm-i386/mach-xen/asm/pgtable-3level.h | 185 +
include/asm-i386/mach-xen/asm/pgtable.h | 508 +++
include/asm-i386/mach-xen/asm/processor.h | 741 +++++
include/asm-i386/mach-xen/asm/ptrace.h | 90
include/asm-i386/mach-xen/asm/scatterlist.h | 22
include/asm-i386/mach-xen/asm/segment.h | 117
include/asm-i386/mach-xen/asm/setup.h | 79
include/asm-i386/mach-xen/asm/smp.h | 103
include/asm-i386/mach-xen/asm/spinlock.h | 199 +
include/asm-i386/mach-xen/asm/swiotlb.h | 41
include/asm-i386/mach-xen/asm/synch_bitops.h | 141 +
include/asm-i386/mach-xen/asm/system.h | 489 +++
include/asm-i386/mach-xen/asm/timer.h | 70
include/asm-i386/mach-xen/asm/tlbflush.h | 101
include/asm-i386/mach-xen/asm/vga.h | 20
include/asm-i386/mach-xen/irq_vectors.h | 125
include/asm-i386/mach-xen/mach_traps.h | 33
include/asm-i386/mach-xen/setup_arch.h | 5
include/asm-i386/page.h | 2
include/asm-i386/pgtable-2level-defs.h | 2
include/asm-i386/pgtable-3level-defs.h | 2
include/asm-ia64/agp.h | 44
include/asm-ia64/dma-mapping.h | 98
include/asm-ia64/fixmap.h | 2
include/asm-ia64/gcc_intrin.h | 60
include/asm-ia64/hw_irq.h | 10
include/asm-ia64/hypercall.h | 426 +++
include/asm-ia64/hypervisor.h | 214 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/io.h | 34
include/asm-ia64/iosapic.h | 2
include/asm-ia64/irq.h | 31
include/asm-ia64/machvec.h | 16
include/asm-ia64/maddr.h | 88
include/asm-ia64/meminit.h | 5
include/asm-ia64/page.h | 51
include/asm-ia64/pal.h | 1
include/asm-ia64/pgalloc.h | 4
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 | 304 ++
include/asm-um/page.h | 2
include/asm-x86_64/apic.h | 2
include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
include/asm-x86_64/mach-xen/asm/bootsetup.h | 42
include/asm-x86_64/mach-xen/asm/desc.h | 263 +
include/asm-x86_64/mach-xen/asm/dma-mapping.h | 208 +
include/asm-x86_64/mach-xen/asm/dmi.h | 29
include/asm-x86_64/mach-xen/asm/e820.h | 64
include/asm-x86_64/mach-xen/asm/fixmap.h | 113
include/asm-x86_64/mach-xen/asm/floppy.h | 206 +
include/asm-x86_64/mach-xen/asm/hw_irq.h | 136
include/asm-x86_64/mach-xen/asm/hypercall.h | 389 ++
include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
include/asm-x86_64/mach-xen/asm/io.h | 327 ++
include/asm-x86_64/mach-xen/asm/irq.h | 38
include/asm-x86_64/mach-xen/asm/irqflags.h | 65
include/asm-x86_64/mach-xen/asm/maddr.h | 139 +
include/asm-x86_64/mach-xen/asm/mmu.h | 38
include/asm-x86_64/mach-xen/asm/mmu_context.h | 135
include/asm-x86_64/mach-xen/asm/msr.h | 399 ++
include/asm-x86_64/mach-xen/asm/nmi.h | 93
include/asm-x86_64/mach-xen/asm/page.h | 208 +
include/asm-x86_64/mach-xen/asm/param.h | 22
include/asm-x86_64/mach-xen/asm/pci.h | 173 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 226 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 558 ++++
include/asm-x86_64/mach-xen/asm/processor.h | 498 +++
include/asm-x86_64/mach-xen/asm/ptrace.h | 125
include/asm-x86_64/mach-xen/asm/smp.h | 150 +
include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
include/asm-x86_64/mach-xen/asm/system.h | 264 +
include/asm-x86_64/mach-xen/asm/timer.h | 67
include/asm-x86_64/mach-xen/asm/tlbflush.h | 103
include/asm-x86_64/mach-xen/asm/vga.h | 20
include/asm-x86_64/mach-xen/asm/xor.h | 328 ++
include/asm-x86_64/mach-xen/irq_vectors.h | 123
include/asm-x86_64/mach-xen/mach_time.h | 111
include/asm-x86_64/mach-xen/mach_timer.h | 48
include/asm-x86_64/mach-xen/setup_arch_post.h | 58
include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
include/linux/elfnote.h | 90
include/linux/gfp.h | 6
include/linux/highmem.h | 6
include/linux/interrupt.h | 6
include/linux/mm.h | 10
include/linux/oprofile.h | 11
include/linux/skbuff.h | 15
include/xen/balloon.h | 67
include/xen/cpu_hotplug.h | 43
include/xen/driver_util.h | 15
include/xen/evtchn.h | 113
include/xen/features.h | 20
include/xen/foreign_page.h | 30
include/xen/gnttab.h | 150 +
include/xen/hvm.h | 24
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/acm.h | 187 +
include/xen/interface/acm_ops.h | 102
include/xen/interface/arch-ia64.h | 448 +++
include/xen/interface/arch-powerpc.h | 115
include/xen/interface/arch-x86_32.h | 255 +
include/xen/interface/arch-x86_64.h | 322 ++
include/xen/interface/callback.h | 74
include/xen/interface/dom0_ops.h | 102
include/xen/interface/domctl.h | 392 ++
include/xen/interface/elfnote.h | 133
include/xen/interface/event_channel.h | 233 +
include/xen/interface/features.h | 53
include/xen/interface/grant_table.h | 362 ++
include/xen/interface/hvm/e820.h | 32
include/xen/interface/hvm/hvm_info_table.h | 22
include/xen/interface/hvm/ioreq.h | 99
include/xen/interface/hvm/params.h | 24
include/xen/interface/hvm/vmx_assist.h | 98
include/xen/interface/io/blkif.h | 87
include/xen/interface/io/console.h | 33
include/xen/interface/io/netif.h | 166 +
include/xen/interface/io/pciif.h | 55
include/xen/interface/io/ring.h | 273 +
include/xen/interface/io/tpmif.h | 59
include/xen/interface/io/xenbus.h | 45
include/xen/interface/io/xs_wire.h | 97
include/xen/interface/memory.h | 243 +
include/xen/interface/nmi.h | 60
include/xen/interface/physdev.h | 149 +
include/xen/interface/platform.h | 125
include/xen/interface/sched.h | 103
include/xen/interface/sysctl.h | 151 +
include/xen/interface/trace.h | 87
include/xen/interface/vcpu.h | 121
include/xen/interface/version.h | 73
include/xen/interface/xen-compat.h | 26
include/xen/interface/xen.h | 569 ++++
include/xen/interface/xencomm.h | 37
include/xen/interface/xenoprof.h | 103
include/xen/pcifront.h | 76
include/xen/public/evtchn.h | 91
include/xen/public/privcmd.h | 79
include/xen/xen_proc.h | 12
include/xen/xenbus.h | 300 ++
include/xen/xencons.h | 14
kernel/Kconfig.preempt | 1
kernel/fork.c | 3
kernel/irq/manage.c | 1
lib/Kconfig.debug | 2
lib/Makefile | 3
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 118
mm/mmap.c | 4
mm/page_alloc.c | 6
net/core/dev.c | 63
net/core/skbuff.c | 27
net/ipv4/netfilter/ip_nat_proto_tcp.c | 7
net/ipv4/netfilter/ip_nat_proto_udp.c | 7
net/ipv4/xfrm4_output.c | 6
net/ipv6/addrconf.c | 2
scripts/Makefile.xen | 14
424 files changed, 88274 insertions(+), 215 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.60 -r 1.60.2.1 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.60
retrieving revision 1.60.2.1
diff -u -r1.60 -r1.60.2.1
--- linux-2.6-xen.patch 31 Aug 2006 01:33:34 -0000 1.60
+++ linux-2.6-xen.patch 1 Sep 2006 01:23:25 -0000 1.60.2.1
@@ -1,5 +1,5 @@
-- linux-2.6 changeset: 33957:421a6d428e95
-- linux-2.6-xen-fedora changeset: 35758:d5f82efe9c25
+- linux-2.6 changeset: 34021:96406d23184b
+- linux-2.6-xen-fedora changeset: 35845:316332216763
- linux-2.6-xen changeset: 22861:0b726fcb6780
- xen-unstable changeset: 11204:5fc1fe79083517824d89309cc618f21302724e29
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
@@ -10447,8 +10447,8 @@
+#endif
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/setup-xen.c linux-2.6-xen-fedora/arch/i386/kernel/setup-xen.c
--- linux-2.6/arch/i386/kernel/setup-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/setup-xen.c 2006-08-30 17:53:05.000000000 +0200
-@@ -0,0 +1,1845 @@
++++ linux-2.6-xen-fedora/arch/i386/kernel/setup-xen.c 2006-09-01 00:17:33.000000000 +0200
+@@ -0,0 +1,1847 @@
+/*
+ * linux/arch/i386/kernel/setup.c
+ *
@@ -11869,8 +11869,10 @@
+ * so we try it repeatedly and let the resource manager
+ * test it.
+ */
++#ifndef CONFIG_XEN
+ request_resource(res, code_resource);
+ request_resource(res, data_resource);
++#endif
+#ifdef CONFIG_KEXEC
+ request_resource(res, &crashk_res);
+#endif
@@ -14766,9 +14768,9 @@
+}
+__initcall(xen_sysctl_init);
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/traps.c linux-2.6-xen-fedora/arch/i386/kernel/traps.c
---- linux-2.6/arch/i386/kernel/traps.c 2006-08-23 22:51:06.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/traps.c 2006-08-25 02:47:30.000000000 +0200
-@@ -639,18 +639,11 @@ static void mem_parity_error(unsigned ch
+--- linux-2.6/arch/i386/kernel/traps.c 2006-08-31 14:45:21.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/traps.c 2006-09-01 02:57:38.000000000 +0200
+@@ -642,18 +642,11 @@ static void mem_parity_error(unsigned ch
static void io_check_error(unsigned char reason, struct pt_regs * regs)
{
@@ -18702,8 +18704,8 @@
+
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/mm/ioremap-xen.c linux-2.6-xen-fedora/arch/i386/mm/ioremap-xen.c
--- linux-2.6/arch/i386/mm/ioremap-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/mm/ioremap-xen.c 2006-08-30 19:39:13.000000000 +0200
-@@ -0,0 +1,475 @@
++++ linux-2.6-xen-fedora/arch/i386/mm/ioremap-xen.c 2006-09-01 02:57:38.000000000 +0200
+@@ -0,0 +1,439 @@
+/*
+ * arch/i386/mm/ioremap.c
+ *
@@ -18728,15 +18730,6 @@
+#define ISA_START_ADDRESS 0x0
+#define ISA_END_ADDRESS 0x100000
+
-+#if 0 /* not PAE safe */
-+/* These hacky macros avoid phys->machine translations. */
-+#define __direct_pte(x) ((pte_t) { (x) } )
-+#define __direct_mk_pte(page_nr,pgprot) \
-+ __direct_pte(((page_nr) << PAGE_SHIFT) | pgprot_val(pgprot))
-+#define direct_mk_pte_phys(physpage, pgprot) \
-+ __direct_mk_pte((physpage) >> PAGE_SHIFT, pgprot)
-+#endif
-+
+static int direct_remap_area_pte_fn(pte_t *pte,
+ struct page *pmd_page,
+ unsigned long address,
@@ -18772,17 +18765,16 @@
+
+ for (i = 0; i < size; i += PAGE_SIZE) {
+ if ((v - u) == (PAGE_SIZE / sizeof(mmu_update_t))) {
-+ /* Fill in the PTE pointers. */
++ /* Flush a full batch after filling in the PTE ptrs. */
+ rc = apply_to_page_range(mm, start_address,
+ address - start_address,
+ direct_remap_area_pte_fn, &w);
+ if (rc)
+ goto out;
-+ w = u;
+ rc = -EFAULT;
+ if (HYPERVISOR_mmu_update(u, v - u, NULL, domid) < 0)
+ goto out;
-+ v = u;
++ v = w = u;
+ start_address = address;
+ }
+
@@ -18798,7 +18790,7 @@
+ }
+
+ if (v != u) {
-+ /* get the ptep's filled in */
++ /* Final batch. */
+ rc = apply_to_page_range(mm, start_address,
+ address - start_address,
+ direct_remap_area_pte_fn, &w);
@@ -18885,32 +18877,6 @@
+
+EXPORT_SYMBOL(touch_pte_range);
+
-+void *vm_map_xen_pages (unsigned long maddr, int vm_size, pgprot_t prot)
-+{
-+ int error;
-+
-+ struct vm_struct *vma;
-+ vma = get_vm_area (vm_size, VM_IOREMAP | VM_PFNMAP);
-+
-+ if (vma == NULL) {
-+ printk ("ioremap.c,vm_map_xen_pages(): "
-+ "Failed to get VMA area\n");
-+ return NULL;
-+ }
-+
-+ error = direct_kernel_remap_pfn_range((unsigned long) vma->addr,
-+ maddr >> PAGE_SHIFT, vm_size,
-+ prot, DOMID_SELF );
-+ if (error == 0) {
-+ return vma->addr;
-+ } else {
-+ printk ("ioremap.c,vm_map_xen_pages(): "
-+ "Failed to map xen shared pages into kernel space\n");
-+ return NULL;
-+ }
-+}
-+EXPORT_SYMBOL(vm_map_xen_pages);
-+
+/*
+ * Does @address reside within a non-highmem page that is local to this virtual
+ * machine (i.e., not an I/O page, nor a memory page belonging to another VM).
@@ -19962,8 +19928,8 @@
+endif
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/oprofile/xenoprof.c linux-2.6-xen-fedora/arch/i386/oprofile/xenoprof.c
--- linux-2.6/arch/i386/oprofile/xenoprof.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/oprofile/xenoprof.c 2006-07-26 16:46:14.000000000 +0200
-@@ -0,0 +1,555 @@
++++ linux-2.6-xen-fedora/arch/i386/oprofile/xenoprof.c 2006-09-01 02:57:38.000000000 +0200
+@@ -0,0 +1,570 @@
+/**
+ * @file xenoprof.c
+ *
@@ -20000,8 +19966,6 @@
+static int xenoprof_start(void);
+static void xenoprof_stop(void);
+
-+void * vm_map_xen_pages(unsigned long maddr, int vm_size, pgprot_t prot);
-+
+static int xenoprof_enabled = 0;
+static unsigned int num_events = 0;
+static int is_primary = 0;
@@ -20339,9 +20303,9 @@
+{
+ int ret;
+ int i, j;
-+ int vm_size;
+ int npages;
+ struct xenoprof_buf *buf;
++ struct vm_struct *area;
+ pgprot_t prot = __pgprot(_KERNPG_TABLE);
+
+ if (!is_primary)
@@ -20357,20 +20321,30 @@
+ for (i = 0; i < pdoms; i++) {
+ passive_domains[i].domain_id = p_domains[i];
+ passive_domains[i].max_samples = 2048;
-+ ret = HYPERVISOR_xenoprof_op(XENOPROF_set_passive, &passive_domains[i]);
++ ret = HYPERVISOR_xenoprof_op(XENOPROF_set_passive,
++ &passive_domains[i]);
+ if (ret)
-+ return ret;
++ goto out;
+
+ npages = (passive_domains[i].bufsize * passive_domains[i].nbuf - 1) / PAGE_SIZE + 1;
-+ vm_size = npages * PAGE_SIZE;
+
-+ p_shared_buffer[i] = (char *)vm_map_xen_pages(passive_domains[i].buf_maddr,
-+ vm_size, prot);
-+ if (!p_shared_buffer[i]) {
++ area = get_vm_area(npages * PAGE_SIZE, VM_IOREMAP);
++ if (area == NULL) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
++ ret = direct_kernel_remap_pfn_range(
++ (unsigned long)area->addr,
++ passive_domains[i].buf_maddr >> PAGE_SHIFT,
++ npages * PAGE_SIZE, prot, DOMID_SELF);
++ if (ret) {
++ vunmap(area->addr);
[...2247 lines suppressed...]
++ /* IN/OUT variables */
++ struct xenctl_cpumap cpu_mask;
++ uint32_t evt_mask;
++ /* OUT variables */
++ uint64_t buffer_mfn;
++ uint32_t size;
++};
++typedef struct xen_sysctl_tbuf_op xen_sysctl_tbuf_op_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_tbuf_op_t);
++
++/*
++ * Get physical information about the host machine
++ */
++#define XEN_SYSCTL_physinfo 3
++struct xen_sysctl_physinfo {
++ uint32_t threads_per_core;
++ uint32_t cores_per_socket;
++ uint32_t sockets_per_node;
++ uint32_t nr_nodes;
++ uint32_t cpu_khz;
++ uint64_t total_pages;
++ uint64_t free_pages;
++ uint64_t scrub_pages;
++ uint32_t hw_cap[8];
++};
++typedef struct xen_sysctl_physinfo xen_sysctl_physinfo_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_physinfo_t);
++
++/*
++ * Get the ID of the current scheduler.
++ */
++#define XEN_SYSCTL_sched_id 4
++struct xen_sysctl_sched_id {
++ /* OUT variable */
++ uint32_t sched_id;
++};
++typedef struct xen_sysctl_sched_id xen_sysctl_sched_id_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_sched_id_t);
++
++/* Interface for controlling Xen software performance counters. */
++#define XEN_SYSCTL_perfc_op 5
++/* Sub-operations: */
++#define XEN_SYSCTL_PERFCOP_reset 1 /* Reset all counters to zero. */
++#define XEN_SYSCTL_PERFCOP_query 2 /* Get perfctr information. */
++struct xen_sysctl_perfc_desc {
++ char name[80]; /* name of perf counter */
++ uint32_t nr_vals; /* number of values for this counter */
++};
++typedef struct xen_sysctl_perfc_desc xen_sysctl_perfc_desc_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_perfc_desc_t);
++typedef uint32_t xen_sysctl_perfc_val_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_perfc_val_t);
++
++struct xen_sysctl_perfc_op {
++ /* IN variables. */
++ uint32_t cmd; /* XEN_SYSCTL_PERFCOP_??? */
++ /* OUT variables. */
++ uint32_t nr_counters; /* number of counters description */
++ uint32_t nr_vals; /* number of values */
++ /* counter information (or NULL) */
++ XEN_GUEST_HANDLE(xen_sysctl_perfc_desc_t) desc;
++ /* counter values (or NULL) */
++ XEN_GUEST_HANDLE(xen_sysctl_perfc_val_t) val;
++};
++typedef struct xen_sysctl_perfc_op xen_sysctl_perfc_op_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_perfc_op_t);
++
++#define XEN_SYSCTL_getdomaininfolist 6
++struct xen_sysctl_getdomaininfolist {
++ /* IN variables. */
++ domid_t first_domain;
++ uint32_t max_domains;
++ XEN_GUEST_HANDLE(xen_domctl_getdomaininfo_t) buffer;
++ /* OUT variables. */
++ uint32_t num_domains;
++};
++typedef struct xen_sysctl_getdomaininfolist xen_sysctl_getdomaininfolist_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_getdomaininfolist_t);
++
++struct xen_sysctl {
++ uint32_t cmd;
++ uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */
++ union {
++ struct xen_sysctl_readconsole readconsole;
++ struct xen_sysctl_tbuf_op tbuf_op;
++ struct xen_sysctl_physinfo physinfo;
++ struct xen_sysctl_sched_id sched_id;
++ struct xen_sysctl_perfc_op perfc_op;
++ struct xen_sysctl_getdomaininfolist getdomaininfolist;
++ uint8_t pad[128];
++ } u;
++};
++typedef struct xen_sysctl xen_sysctl_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_t);
++
++#endif /* __XEN_PUBLIC_SYSCTL_H__ */
++
++/*
++ * Local variables:
++ * mode: C
++ * c-set-style: "BSD"
++ * c-basic-offset: 4
++ * tab-width: 4
++ * indent-tabs-mode: nil
++ * End:
++ */
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/interface/trace.h linux-2.6-xen-fedora/include/xen/interface/trace.h
--- linux-2.6/include/xen/interface/trace.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6-xen-fedora/include/xen/interface/trace.h 2006-07-26 16:46:37.000000000 +0200
@@ -90509,7 +90555,7 @@
+#endif /* _XEN_XENCOMM_H_ */
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/interface/xen-compat.h linux-2.6-xen-fedora/include/xen/interface/xen-compat.h
--- linux-2.6/include/xen/interface/xen-compat.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/interface/xen-compat.h 2006-08-25 02:47:31.000000000 +0200
++++ linux-2.6-xen-fedora/include/xen/interface/xen-compat.h 2006-09-01 00:17:34.000000000 +0200
@@ -0,0 +1,26 @@
+/******************************************************************************
+ * xen-compat.h
@@ -90522,7 +90568,7 @@
+#ifndef __XEN_PUBLIC_XEN_COMPAT_H__
+#define __XEN_PUBLIC_XEN_COMPAT_H__
+
-+#define __XEN_LATEST_INTERFACE_VERSION__ 0x00030203
++#define __XEN_LATEST_INTERFACE_VERSION__ 0x00030204
+
+#if defined(__XEN__) || defined(__XEN_TOOLS__)
+/* Xen is built with matching headers and implements the latest interface. */
@@ -90539,8 +90585,8 @@
+#endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/interface/xen.h linux-2.6-xen-fedora/include/xen/interface/xen.h
--- linux-2.6/include/xen/interface/xen.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/interface/xen.h 2006-08-25 02:47:31.000000000 +0200
-@@ -0,0 +1,558 @@
++++ linux-2.6-xen-fedora/include/xen/interface/xen.h 2006-09-01 00:17:34.000000000 +0200
+@@ -0,0 +1,569 @@
+/******************************************************************************
+ * xen.h
+ *
@@ -90577,7 +90623,7 @@
+#define __HYPERVISOR_set_callbacks 4
+#define __HYPERVISOR_fpu_taskswitch 5
+#define __HYPERVISOR_sched_op_compat 6 /* compat since 0x00030101 */
-+#define __HYPERVISOR_dom0_op 7
++#define __HYPERVISOR_platform_op 7
+#define __HYPERVISOR_set_debugreg 8
+#define __HYPERVISOR_get_debugreg 9
+#define __HYPERVISOR_update_descriptor 10
@@ -90604,6 +90650,9 @@
+#define __HYPERVISOR_event_channel_op 32
+#define __HYPERVISOR_physdev_op 33
+#define __HYPERVISOR_hvm_op 34
++#define __HYPERVISOR_sysctl 35
++#define __HYPERVISOR_domctl 36
++#define __HYPERVISOR_kexec_op 37
+
+/* Architecture-specific hypercall definitions. */
+#define __HYPERVISOR_arch_0 48
@@ -90633,6 +90682,11 @@
+#define __HYPERVISOR_physdev_op __HYPERVISOR_physdev_op_compat
+#endif
+
++/* New platform_op hypercall introduced in 0x00030204. */
++#if __XEN_INTERFACE_VERSION__ < 0x00030204
++#define __HYPERVISOR_dom0_op __HYPERVISOR_platform_op
++#endif
++
+/*
+ * VIRTUAL INTERRUPTS
+ *
@@ -91073,14 +91127,17 @@
+ uint8_t rsvd_size;
+} dom0_vga_console_info_t;
+
-+typedef uint64_t cpumap_t;
-+
+typedef uint8_t xen_domain_handle_t[16];
+
+/* Turn a plain number into a C unsigned long constant. */
+#define __mk_unsigned_long(x) x ## UL
+#define mk_unsigned_long(x) __mk_unsigned_long(x)
+
++DEFINE_XEN_GUEST_HANDLE(uint8_t);
++DEFINE_XEN_GUEST_HANDLE(uint16_t);
++DEFINE_XEN_GUEST_HANDLE(uint32_t);
++DEFINE_XEN_GUEST_HANDLE(uint64_t);
++
+#else /* __ASSEMBLY__ */
+
+/* In assembly code we cannot use C numeric constant suffixes. */
@@ -92312,8 +92369,8 @@
err = skb_checksum_help(skb, 0);
if (err)
diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
---- linux-2.6/net/ipv6/addrconf.c 2006-08-23 22:51:07.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c 2006-08-25 02:47:32.000000000 +0200
+--- linux-2.6/net/ipv6/addrconf.c 2006-08-31 14:45:22.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c 2006-09-01 02:57:39.000000000 +0200
@@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
More information about the fedora-cvs-commits
mailing list