rpms/kernel/FC-6 .cvsignore, 1.548, 1.548.2.1 branch, 1.1, 1.1.32.1 kernel-2.6.spec, 1.2898, 1.2898.2.1 linux-2.6-xen.patch, 1.84, 1.84.2.1 sources, 1.512, 1.512.2.1 xen-version-strings.patch, 1.3, 1.3.16.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 23 00:33:25 UTC 2007
- Previous message (by thread): rpms/kernel/FC-6/scripts rebase-xen-hv.sh,1.2,1.2.14.1
- Next message (by thread): rpms/virt-manager/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 virt-manager.spec, 1.14, 1.15 virt-manager-disable-config-hvm.patch, 1.1, NONE virt-manager-hostname-resolution-errors.patch, 1.1, NONE vm-limit-memory.patch, 1.1, NONE vm-non-sparse-file.patch, 1.1, NONE vm-use-ipv4-for-console.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: quintela
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26389
Modified Files:
Tag: private-quintela-xen-3_0_4-branch
.cvsignore branch kernel-2.6.spec linux-2.6-xen.patch sources
xen-version-strings.patch
Log Message:
update to xen 3.0.4 kernel side.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v
retrieving revision 1.548
retrieving revision 1.548.2.1
diff -u -r1.548 -r1.548.2.1
--- .cvsignore 10 Jan 2007 23:18:48 -0000 1.548
+++ .cvsignore 23 Jan 2007 00:33:18 -0000 1.548.2.1
@@ -4,4 +4,4 @@
kernel-2.6.19
linux-2.6.19.tar.bz2
patch-2.6.19.2.bz2
-xen-3.0.3-11774.tar.bz2
+xen-3.0.4-13132.tar.bz2
Index: branch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/branch,v
retrieving revision 1.1
retrieving revision 1.1.32.1
diff -u -r1.1 -r1.1.32.1
--- branch 13 Oct 2006 01:05:02 -0000 1.1
+++ branch 23 Jan 2007 00:33:18 -0000 1.1.32.1
@@ -1 +1 @@
-FC-6
+FC-7
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2898
retrieving revision 1.2898.2.1
diff -u -r1.2898 -r1.2898.2.1
--- kernel-2.6.spec 22 Jan 2007 23:08:26 -0000 1.2898
+++ kernel-2.6.spec 23 Jan 2007 00:33:19 -0000 1.2898.2.1
@@ -35,7 +35,7 @@
%define rpmversion 2.6.%{sublevel}
%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
%define signmodules 0
-%define xen_hv_cset 11774
+%define xen_hv_cset 13132
%define make_target bzImage
%define kernel_image x86
%define xen_flags verbose=y crash_debug=y
@@ -262,7 +262,7 @@
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-3.0.3-%{xen_hv_cset}.tar.bz2
+Source1: xen-3.0.4-%{xen_hv_cset}.tar.bz2
Source2: Config.mk
Source10: COPYING.modules
@@ -491,9 +491,7 @@
Patch10000: linux-2.6-compile-fixes.patch
# Xen hypervisor patches (20000+)
-Patch20000: xen-printf-rate-limit.patch
Patch20001: xen-version-strings.patch
-Patch20002: xen-grant-security.patch
# END OF PATCH DEFINITIONS
@@ -1139,9 +1137,7 @@
%setup -D -T -q -n %{name}-%{version} -a1
cd xen
# Any necessary hypervisor patches go here
-%patch20000 -p1
%patch20001 -p1
-%patch20002 -p1
# Update the Makefile version strings
sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
@@ -2015,6 +2011,10 @@
%changelog
* Tue Jan 23 2007 Juan Quintela <quintela at redhat.com>
+- update to xen 3.0.4 kernel side.
+- update HV to xen-3.0.4-testing cset: 13132:f98a6a9df1b4
+
+* Tue Jan 23 2007 Juan Quintela <quintela at redhat.com>
- update xen kernel patch
* pvfb is now included in it.
* changeset: 43493:67d20a7ca5f9
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 | 1332 ++++++++
arch/i386/kernel/alternative.c | 11
arch/i386/kernel/apic-xen.c | 223 +
arch/i386/kernel/asm-offsets.c | 7
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 747 +++++
arch/i386/kernel/cpu/mtrr/Makefile | 7
arch/i386/kernel/cpu/mtrr/main-xen.c | 198 +
arch/i386/kernel/crash.c | 4
arch/i386/kernel/early_printk-xen.c | 2
arch/i386/kernel/entry-xen.S | 1254 ++++++++
arch/i386/kernel/entry.S | 6
arch/i386/kernel/fixup.c | 95
arch/i386/kernel/head-xen.S | 201 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2965 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
arch/i386/kernel/irq-xen.c | 328 ++
arch/i386/kernel/ldt-xen.c | 270 +
arch/i386/kernel/machine_kexec.c | 40
arch/i386/kernel/microcode-xen.c | 141
arch/i386/kernel/mpparse-xen.c | 1157 +++++++
arch/i386/kernel/pci-dma-xen.c | 377 ++
arch/i386/kernel/process-xen.c | 852 +++++
arch/i386/kernel/quirks-xen.c | 47
arch/i386/kernel/setup-xen.c | 1748 +++++++++++
arch/i386/kernel/smp-xen.c | 635 ++++
arch/i386/kernel/swiotlb.c | 683 ++++
arch/i386/kernel/sysenter.c | 22
arch/i386/kernel/time-xen.c | 1121 +++++++
arch/i386/kernel/traps-xen.c | 1248 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/tsc.c | 2
arch/i386/kernel/vm86.c | 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 | 169 +
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 756 +++++
arch/i386/mm/highmem-xen.c | 121
arch/i386/mm/hypervisor.c | 449 +++
arch/i386/mm/init-xen.c | 879 +++++
arch/i386/mm/ioremap-xen.c | 443 ++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 728 ++++
arch/i386/oprofile/Makefile | 7
arch/i386/oprofile/xenoprof.c | 179 +
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1167 +++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 72
arch/ia64/Makefile | 16
arch/ia64/dig/setup.c | 17
arch/ia64/hp/sim/Makefile | 2
arch/ia64/kernel/asm-offsets.c | 24
arch/ia64/kernel/entry.S | 36
arch/ia64/kernel/gate.S | 116
arch/ia64/kernel/gate.lds.S | 22
arch/ia64/kernel/head.S | 6
arch/ia64/kernel/iosapic.c | 75
arch/ia64/kernel/irq_ia64.c | 328 ++
arch/ia64/kernel/pal.S | 3
arch/ia64/kernel/patch.c | 71
arch/ia64/kernel/perfmon.c | 89
arch/ia64/kernel/setup.c | 131
arch/ia64/mm/ioremap.c | 3
arch/ia64/oprofile/Makefile | 4
arch/ia64/oprofile/init.c | 14
arch/ia64/oprofile/oprofile_perfmon.h | 30
arch/ia64/oprofile/perfmon.c | 35
arch/ia64/oprofile/xenoprof.c | 142
arch/ia64/xen/Makefile | 9
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/hypercall.S | 411 ++
arch/ia64/xen/hypervisor.c | 1104 +++++++
arch/ia64/xen/mem.c | 76
arch/ia64/xen/util.c | 117
arch/ia64/xen/xcom_hcall.c | 365 ++
arch/ia64/xen/xcom_mini.c | 417 ++
arch/ia64/xen/xcom_privcmd.c | 663 ++++
arch/ia64/xen/xencomm.c | 263 +
arch/ia64/xen/xenentry.S | 908 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2178 ++++++++++++++
arch/ia64/xen/xenminstate.h | 368 ++
arch/ia64/xen/xenpal.S | 76
arch/ia64/xen/xensetup.S | 53
arch/um/kernel/physmem.c | 4
arch/x86_64/Kconfig | 62
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 | 20
arch/x86_64/kernel/acpi/Makefile | 1
arch/x86_64/kernel/apic-xen.c | 254 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/crash.c | 6
arch/x86_64/kernel/e820-xen.c | 763 +++++
arch/x86_64/kernel/early_printk-xen.c | 299 ++
arch/x86_64/kernel/entry-xen.S | 1217 ++++++++
arch/x86_64/kernel/genapic-xen.c | 143
arch/x86_64/kernel/genapic_xen.c | 190 +
arch/x86_64/kernel/head-xen.S | 189 +
arch/x86_64/kernel/head64-xen.c | 119
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2182 ++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 99
arch/x86_64/kernel/irq.c | 4
arch/x86_64/kernel/irqflags-xen.c | 100
arch/x86_64/kernel/ldt-xen.c | 283 +
arch/x86_64/kernel/machine_kexec.c | 119
arch/x86_64/kernel/mpparse-xen.c | 850 +++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 55
arch/x86_64/kernel/process-xen.c | 859 +++++
arch/x86_64/kernel/setup-xen.c | 1482 +++++++++
arch/x86_64/kernel/setup64-xen.c | 356 ++
arch/x86_64/kernel/smp-xen.c | 571 +++
arch/x86_64/kernel/traps-xen.c | 1245 ++++++++
arch/x86_64/kernel/vmlinux.lds.S | 2
arch/x86_64/kernel/vsyscall-xen.c | 329 ++
arch/x86_64/kernel/xen_entry.S | 40
arch/x86_64/mm/Makefile | 10
arch/x86_64/mm/fault-xen.c | 717 ++++
arch/x86_64/mm/init-xen.c | 1182 +++++++
arch/x86_64/mm/pageattr-xen.c | 396 ++
arch/x86_64/oprofile/Makefile | 10
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 | 760 +++++
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 | 3
drivers/serial/Kconfig | 1
drivers/xen/Kconfig | 283 +
drivers/xen/Makefile | 19
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 624 ++++
drivers/xen/balloon/common.h | 58
drivers/xen/balloon/sysfs.c | 164 +
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 581 +++
drivers/xen/blkback/common.h | 138
drivers/xen/blkback/interface.c | 171 +
drivers/xen/blkback/vbd.c | 118
drivers/xen/blkback/xenbus.c | 485 +++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 891 ++++++
drivers/xen/blkfront/block.h | 156 +
drivers/xen/blkfront/vbd.c | 375 ++
drivers/xen/blktap/Makefile | 6
drivers/xen/blktap/blktap.c | 1517 ++++++++++
drivers/xen/blktap/blktapmain.c | 1507 ++++++++++
drivers/xen/blktap/common.h | 120
drivers/xen/blktap/interface.c | 164 +
drivers/xen/blktap/xenbus.c | 366 ++
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 203 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 717 ++++
drivers/xen/console/xencons_ring.c | 143
drivers/xen/core/Makefile | 14
drivers/xen/core/cpu_hotplug.c | 188 +
drivers/xen/core/evtchn.c | 861 +++++
drivers/xen/core/features.c | 34
drivers/xen/core/gnttab.c | 487 +++
drivers/xen/core/hypervisor_sysfs.c | 59
drivers/xen/core/machine_kexec.c | 190 +
drivers/xen/core/machine_reboot.c | 185 +
drivers/xen/core/reboot.c | 221 +
drivers/xen/core/skbuff.c | 144
drivers/xen/core/smpboot.c | 461 +++
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/fbfront/Makefile | 2
drivers/xen/fbfront/xenfb.c | 750 +++++
drivers/xen/fbfront/xenkbd.c | 300 ++
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 146
drivers/xen/netback/interface.c | 349 ++
drivers/xen/netback/loopback.c | 320 ++
drivers/xen/netback/netback.c | 1524 ++++++++++
drivers/xen/netback/xenbus.c | 450 +++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 2114 ++++++++++++++
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 | 285 +
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 86
drivers/xen/tpmback/interface.c | 182 +
drivers/xen/tpmback/tpmback.c | 944 ++++++
drivers/xen/tpmback/xenbus.c | 289 +
drivers/xen/util.c | 70
drivers/xen/xenbus/Makefile | 9
drivers/xen/xenbus/xenbus_backend_client.c | 147
drivers/xen/xenbus/xenbus_client.c | 305 ++
drivers/xen/xenbus/xenbus_comms.c | 210 +
drivers/xen/xenbus/xenbus_comms.h | 44
drivers/xen/xenbus/xenbus_dev.c | 361 ++
drivers/xen/xenbus/xenbus_probe.c | 1017 ++++++
drivers/xen/xenbus/xenbus_probe.h | 73
drivers/xen/xenbus/xenbus_probe_backend.c | 271 +
drivers/xen/xenbus/xenbus_xs.c | 859 +++++
drivers/xen/xenoprof/xenoprofile.c | 500 +++
fs/Kconfig | 1
include/asm-i386/apic.h | 2
include/asm-i386/kexec.h | 14
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 | 203 +
include/asm-i386/mach-xen/asm/dma-mapping.h | 151 +
include/asm-i386/mach-xen/asm/fixmap.h | 160 +
include/asm-i386/mach-xen/asm/floppy.h | 147
include/asm-i386/mach-xen/asm/highmem.h | 80
include/asm-i386/mach-xen/asm/hypercall.h | 407 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 245 +
include/asm-i386/mach-xen/asm/io.h | 363 ++
include/asm-i386/mach-xen/asm/irqflags.h | 81
include/asm-i386/mach-xen/asm/kmap_types.h | 31
include/asm-i386/mach-xen/asm/maddr.h | 176 +
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 | 231 +
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.h | 78
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 24
include/asm-i386/mach-xen/asm/pgtable-3level.h | 195 +
include/asm-i386/mach-xen/asm/pgtable.h | 551 +++
include/asm-i386/mach-xen/asm/processor.h | 737 ++++
include/asm-i386/mach-xen/asm/scatterlist.h | 22
include/asm-i386/mach-xen/asm/segment.h | 132
include/asm-i386/mach-xen/asm/setup.h | 81
include/asm-i386/mach-xen/asm/smp.h | 114
include/asm-i386/mach-xen/asm/swiotlb.h | 43
include/asm-i386/mach-xen/asm/synch_bitops.h | 145
include/asm-i386/mach-xen/asm/system.h | 531 +++
include/asm-i386/mach-xen/asm/timer.h | 67
include/asm-i386/mach-xen/asm/tlbflush.h | 99
include/asm-i386/mach-xen/asm/vga.h | 20
include/asm-i386/mach-xen/asm/xenoprof.h | 48
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/pgtable-2level-defs.h | 2
include/asm-i386/pgtable-3level-defs.h | 2
include/asm-i386/spinlock.h | 5
include/asm-ia64/agp.h | 31
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 | 463 +++
include/asm-ia64/hypervisor.h | 224 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/io.h | 56
include/asm-ia64/iosapic.h | 2
include/asm-ia64/irq.h | 33
include/asm-ia64/machvec_dig.h | 15
include/asm-ia64/maddr.h | 102
include/asm-ia64/meminit.h | 5
include/asm-ia64/page.h | 52
include/asm-ia64/pal.h | 1
include/asm-ia64/pgalloc.h | 4
include/asm-ia64/privop.h | 60
include/asm-ia64/processor.h | 1
include/asm-ia64/sal.h | 21
include/asm-ia64/synch_bitops.h | 61
include/asm-ia64/system.h | 4
include/asm-ia64/uaccess.h | 20
include/asm-ia64/xen/privop.h | 303 ++
include/asm-ia64/xen/xcom_hcall.h | 86
include/asm-ia64/xen/xencomm.h | 60
include/asm-ia64/xenoprof.h | 48
include/asm-um/page.h | 2
include/asm-x86_64/acpi.h | 2
include/asm-x86_64/apic.h | 2
include/asm-x86_64/dwarf2.h | 2
include/asm-x86_64/ipi.h | 5
include/asm-x86_64/kexec.h | 13
include/asm-x86_64/mach-xen/asm/agp.h | 35
include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
include/asm-x86_64/mach-xen/asm/bootsetup.h | 40
include/asm-x86_64/mach-xen/asm/desc.h | 263 +
include/asm-x86_64/mach-xen/asm/dma-mapping.h | 200 +
include/asm-x86_64/mach-xen/asm/dmi.h | 29
include/asm-x86_64/mach-xen/asm/e820.h | 59
include/asm-x86_64/mach-xen/asm/fixmap.h | 108
include/asm-x86_64/mach-xen/asm/floppy.h | 207 +
include/asm-x86_64/mach-xen/asm/hw_irq.h | 136
include/asm-x86_64/mach-xen/asm/hypercall.h | 406 ++
include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
include/asm-x86_64/mach-xen/asm/io.h | 301 ++
include/asm-x86_64/mach-xen/asm/irq.h | 34
include/asm-x86_64/mach-xen/asm/irqflags.h | 65
include/asm-x86_64/mach-xen/asm/maddr.h | 150 +
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 | 410 ++
include/asm-x86_64/mach-xen/asm/nmi.h | 96
include/asm-x86_64/mach-xen/asm/page.h | 214 +
include/asm-x86_64/mach-xen/asm/pci.h | 173 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 224 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 562 +++
include/asm-x86_64/mach-xen/asm/processor.h | 499 +++
include/asm-x86_64/mach-xen/asm/smp.h | 132
include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
include/asm-x86_64/mach-xen/asm/system.h | 266 +
include/asm-x86_64/mach-xen/asm/timer.h | 67
include/asm-x86_64/mach-xen/asm/tlbflush.h | 120
include/asm-x86_64/mach-xen/asm/vga.h | 20
include/asm-x86_64/mach-xen/asm/xenoprof.h | 1
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 | 63
include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
include/linux/gfp.h | 6
include/linux/highmem.h | 6
include/linux/interrupt.h | 6
include/linux/kexec.h | 13
include/linux/mm.h | 10
include/linux/oprofile.h | 11
include/linux/pfn.h | 4
include/linux/skbuff.h | 15
include/xen/balloon.h | 57
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 | 151 +
include/xen/hvm.h | 24
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/COPYING | 38
include/xen/interface/acm.h | 205 +
include/xen/interface/acm_ops.h | 120
include/xen/interface/arch-ia64.h | 500 +++
include/xen/interface/arch-powerpc.h | 121
include/xen/interface/arch-x86/xen-x86_32.h | 151 +
include/xen/interface/arch-x86/xen-x86_64.h | 208 +
include/xen/interface/arch-x86/xen.h | 190 +
include/xen/interface/arch-x86_32.h | 27
include/xen/interface/arch-x86_64.h | 27
include/xen/interface/callback.h | 92
include/xen/interface/dom0_ops.h | 120
include/xen/interface/domctl.h | 437 ++
include/xen/interface/elfnote.h | 179 +
include/xen/interface/event_channel.h | 251 +
include/xen/interface/features.h | 71
include/xen/interface/grant_table.h | 380 ++
include/xen/interface/hvm/e820.h | 47
include/xen/interface/hvm/hvm_info_table.h | 41
include/xen/interface/hvm/hvm_op.h | 53
include/xen/interface/hvm/ioreq.h | 97
include/xen/interface/hvm/params.h | 36
include/xen/interface/hvm/vmx_assist.h | 116
include/xen/interface/io/blkif.h | 126
include/xen/interface/io/console.h | 51
include/xen/interface/io/fbif.h | 138
include/xen/interface/io/kbdif.h | 130
include/xen/interface/io/netif.h | 184 +
include/xen/interface/io/pciif.h | 83
include/xen/interface/io/ring.h | 299 ++
include/xen/interface/io/tpmif.h | 77
include/xen/interface/io/xenbus.h | 73
include/xen/interface/io/xs_wire.h | 116
include/xen/interface/kexec.h | 137
include/xen/interface/memory.h | 276 +
include/xen/interface/nmi.h | 78
include/xen/interface/physdev.h | 169 +
include/xen/interface/platform.h | 143
include/xen/interface/sched.h | 121
include/xen/interface/sysctl.h | 169 +
include/xen/interface/trace.h | 102
include/xen/interface/vcpu.h | 142
include/xen/interface/version.h | 91
include/xen/interface/xen-compat.h | 51
include/xen/interface/xen.h | 597 ++++
include/xen/interface/xencomm.h | 41
include/xen/interface/xenoprof.h | 130
include/xen/pcifront.h | 76
include/xen/public/evtchn.h | 88
include/xen/public/privcmd.h | 79
include/xen/xen_proc.h | 12
include/xen/xenbus.h | 307 ++
include/xen/xencons.h | 19
include/xen/xenoprof.h | 42
kernel/Kconfig.preempt | 1
kernel/fork.c | 3
kernel/irq/manage.c | 1
kernel/kexec.c | 48
lib/Kconfig.debug | 2
lib/Makefile | 1
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 120
mm/mmap.c | 4
mm/page_alloc.c | 6
net/core/dev.c | 63
net/core/skbuff.c | 29
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 | 3
scripts/Makefile.xen | 14
463 files changed, 96328 insertions(+), 237 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.84 -r 1.84.2.1 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-xen.patch,v
retrieving revision 1.84
retrieving revision 1.84.2.1
diff -u -r1.84 -r1.84.2.1
--- linux-2.6-xen.patch 22 Jan 2007 23:08:27 -0000 1.84
+++ linux-2.6-xen.patch 23 Jan 2007 00:33:19 -0000 1.84.2.1
@@ -1,6 +1,6 @@
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile source/arch/i386/boot-xen/Makefile
--- /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/boot-xen/Makefile 2006-12-23 17:42:12.000000000 +0100
++++ source/arch/i386/boot-xen/Makefile 2007-01-15 15:48:20.000000000 +0100
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -25,7 +25,7 @@
+ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig source/arch/i386/Kconfig
--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/Kconfig 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/Kconfig 2007-01-15 15:48:20.000000000 +0100
@@ -16,6 +16,7 @@ config X86_32
config GENERIC_TIME
@@ -166,7 +166,7 @@
config KEXEC
bool "kexec system call"
-+ depends on !X86_XEN
++ depends on !XEN_UNPRIVILEGED_GUEST
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
@@ -308,7 +308,7 @@
default y
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu source/arch/i386/Kconfig.cpu
--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/Kconfig.cpu 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/Kconfig.cpu 2007-01-15 15:48:20.000000000 +0100
@@ -252,7 +252,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -327,7 +327,7 @@
default y
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug source/arch/i386/Kconfig.debug
--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/Kconfig.debug 2006-12-23 17:42:12.000000000 +0100
++++ source/arch/i386/Kconfig.debug 2007-01-15 15:48:20.000000000 +0100
@@ -79,6 +79,7 @@ config X86_MPPARSE
config DOUBLEFAULT
default y
@@ -338,7 +338,7 @@
would otherwise cause a system to silently reboot. Disabling this
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c source/arch/i386/kernel/acpi/boot-xen.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/kernel/acpi/boot-xen.c 2006-12-23 17:46:06.000000000 +0100
++++ source/arch/i386/kernel/acpi/boot-xen.c 2007-01-23 00:21:39.000000000 +0100
@@ -0,0 +1,1332 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1674,7 +1674,7 @@
+early_param("acpi_sci", setup_acpi_sci);
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile source/arch/i386/kernel/acpi/Makefile
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/kernel/acpi/Makefile 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/kernel/acpi/Makefile 2007-01-15 15:48:21.000000000 +0100
@@ -8,3 +8,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -1685,7 +1685,7 @@
+endif
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c source/arch/i386/kernel/alternative.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/kernel/alternative.c 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/kernel/alternative.c 2007-01-15 15:48:21.000000000 +0100
@@ -4,7 +4,11 @@
#include <asm/alternative.h>
#include <asm/sections.h>
@@ -1725,7 +1725,7 @@
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c source/arch/i386/kernel/apic-xen.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/kernel/apic-xen.c 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/kernel/apic-xen.c 2007-01-15 15:48:21.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1952,7 +1952,7 @@
+
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c source/arch/i386/kernel/asm-offsets.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/kernel/asm-offsets.c 2006-12-23 17:42:12.000000000 +0100
++++ source/arch/i386/kernel/asm-offsets.c 2007-01-15 15:48:21.000000000 +0100
@@ -66,9 +66,14 @@ void foo(void)
OFFSET(pbe_orig_address, pbe, orig_address);
OFFSET(pbe_next, pbe, next);
@@ -1971,7 +1971,7 @@
DEFINE(VDSO_PRELINK, VDSO_PRELINK);
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c source/arch/i386/kernel/cpu/common-xen.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/kernel/cpu/common-xen.c 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/kernel/cpu/common-xen.c 2007-01-15 15:48:21.000000000 +0100
@@ -0,0 +1,747 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -2722,7 +2722,7 @@
+#endif
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile source/arch/i386/kernel/cpu/Makefile
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/kernel/cpu/Makefile 2006-12-23 17:42:12.000000000 +0100
++++ source/arch/i386/kernel/cpu/Makefile 2007-01-15 15:48:21.000000000 +0100
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
@@ -2734,7 +2734,7 @@
+endif
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c source/arch/i386/kernel/cpu/mtrr/main-xen.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/kernel/cpu/mtrr/main-xen.c 2007-01-15 15:48:21.000000000 +0100
@@ -0,0 +1,198 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -2936,7 +2936,7 @@
+subsys_initcall(mtrr_init);
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile source/arch/i386/kernel/cpu/mtrr/Makefile
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/kernel/cpu/mtrr/Makefile 2006-12-23 17:42:12.000000000 +0100
++++ source/arch/i386/kernel/cpu/mtrr/Makefile 2007-01-15 15:48:21.000000000 +0100
@@ -3,3 +3,10 @@ obj-y += amd.o
obj-y += cyrix.o
obj-y += centaur.o
@@ -2948,15 +2948,47 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
+diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/crash.c source/arch/i386/kernel/crash.c
+--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/crash.c 2006-11-29 22:57:37.000000000 +0100
++++ source/arch/i386/kernel/crash.c 2007-01-15 15:48:21.000000000 +0100
+@@ -93,6 +93,7 @@ static void crash_save_self(struct pt_re
+ crash_save_this_cpu(regs, cpu);
+ }
+
++#ifndef CONFIG_XEN
+ #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
+ static atomic_t waiting_for_crash_ipi;
+
+@@ -174,6 +175,7 @@ static void nmi_shootdown_cpus(void)
+ /* There are no cpus to shootdown */
+ }
+ #endif
++#endif /* CONFIG_XEN */
+
+ void machine_crash_shutdown(struct pt_regs *regs)
+ {
+@@ -190,10 +192,12 @@ void machine_crash_shutdown(struct pt_re
+
+ /* Make a note of crashing cpu. Will be used in NMI callback.*/
+ crashing_cpu = safe_smp_processor_id();
++#ifndef CONFIG_XEN
+ nmi_shootdown_cpus();
+ lapic_shutdown();
+ #if defined(CONFIG_X86_IO_APIC)
+ disable_IO_APIC();
+ #endif
++#endif /* CONFIG_XEN */
+ crash_save_self(regs);
+ }
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c source/arch/i386/kernel/early_printk-xen.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/kernel/early_printk-xen.c 2006-12-23 17:42:12.000000000 +0100
++++ source/arch/i386/kernel/early_printk-xen.c 2007-01-15 15:48:21.000000000 +0100
@@ -0,0 +1,2 @@
+
+#include "../../x86_64/kernel/early_printk-xen.c"
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S source/arch/i386/kernel/entry.S
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S 2006-11-29 22:57:37.000000000 +0100
-+++ source/arch/i386/kernel/entry.S 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/kernel/entry.S 2007-01-15 15:48:21.000000000 +0100
@@ -281,7 +281,7 @@ ENTRY(sysenter_entry)
CFI_SIGNAL_FRAME
CFI_DEF_CFA esp, 0
@@ -2986,7 +3018,7 @@
pushfl; \
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry-xen.S source/arch/i386/kernel/entry-xen.S
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry-xen.S 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/kernel/entry-xen.S 2006-12-23 17:44:39.000000000 +0100
++++ source/arch/i386/kernel/entry-xen.S 2007-01-15 15:48:21.000000000 +0100
@@ -0,0 +1,1254 @@
+/*
+ * linux/arch/i386/entry.S
@@ -4244,8 +4276,8 @@
+syscall_table_size=(.-sys_call_table)
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/fixup.c source/arch/i386/kernel/fixup.c
--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/fixup.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/arch/i386/kernel/fixup.c 2006-12-23 17:42:12.000000000 +0100
-@@ -0,0 +1,92 @@
++++ source/arch/i386/kernel/fixup.c 2007-01-15 15:48:21.000000000 +0100
+@@ -0,0 +1,95 @@
[...40416 lines suppressed...]
+ << PAGE_SHIFT);
+ if (result < 0)
+ goto out;
+@@ -811,6 +823,7 @@ out:
+ return result;
+ }
+
++#ifndef CONFIG_XEN
+ static int kimage_load_crash_segment(struct kimage *image,
+ struct kexec_segment *segment)
+ {
+@@ -833,7 +846,7 @@ static int kimage_load_crash_segment(str
+ char *ptr;
+ size_t uchunk, mchunk;
+
+- page = pfn_to_page(maddr >> PAGE_SHIFT);
++ page = kexec_pfn_to_page(maddr >> PAGE_SHIFT);
+ if (page == 0) {
+ result = -ENOMEM;
+ goto out;
+@@ -881,6 +894,13 @@ static int kimage_load_segment(struct ki
+
+ return result;
+ }
++#else /* CONFIG_XEN */
++static int kimage_load_segment(struct kimage *image,
++ struct kexec_segment *segment)
++{
++ return kimage_load_normal_segment(image, segment);
++}
++#endif
+
+ /*
+ * Exec Kernel system call: for obvious reasons only root may call it.
+@@ -991,6 +1011,11 @@ asmlinkage long sys_kexec_load(unsigned
+ if (result)
+ goto out;
+ }
++#ifdef CONFIG_XEN
++ result = xen_machine_kexec_load(image);
++ if (result)
++ goto out;
++#endif
+ /* Install the new kernel, and Uninstall the old */
+ image = xchg(dest_image, image);
+
+@@ -1045,7 +1070,6 @@ void crash_kexec(struct pt_regs *regs)
+ {
+ int locked;
+
+-
+ /* Take the kexec_lock here to prevent sys_kexec_load
+ * running on one cpu from replacing the crash kernel
+ * we are using after a panic on a different cpu.
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Kconfig.debug source/lib/Kconfig.debug
--- /scratch/src/linux-2.6.19.2/lib/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100
-+++ source/lib/Kconfig.debug 2006-12-23 17:44:56.000000000 +0100
++++ source/lib/Kconfig.debug 2007-01-15 15:49:04.000000000 +0100
@@ -341,7 +341,7 @@ config FRAME_POINTER
config UNWIND_INFO
@@ -94267,20 +100615,18 @@
If you say Y here the resulting kernel image will be slightly larger
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Makefile source/lib/Makefile
--- /scratch/src/linux-2.6.19.2/lib/Makefile 2006-11-29 22:57:37.000000000 +0100
-+++ source/lib/Makefile 2006-12-23 17:44:56.000000000 +0100
-@@ -54,6 +54,9 @@ obj-$(CONFIG_SMP) += percpu_counter.o
++++ source/lib/Makefile 2007-01-15 15:49:04.000000000 +0100
+@@ -54,6 +54,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o
obj-$(CONFIG_AUDIT_GENERIC) += audit.o
obj-$(CONFIG_SWIOTLB) += swiotlb.o
-+ifneq ($(CONFIG_XEN_IA64_DOM0_NON_VP),y)
+swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o
-+endif
hostprogs-y := gen_crc32table
clean-files := crc32table.h
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/highmem.c source/mm/highmem.c
--- /scratch/src/linux-2.6.19.2/mm/highmem.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/mm/highmem.c 2006-12-23 17:44:56.000000000 +0100
++++ source/mm/highmem.c 2007-01-15 15:49:04.000000000 +0100
@@ -148,6 +148,17 @@ start:
return vaddr;
}
@@ -94301,7 +100647,7 @@
unsigned long vaddr;
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/Kconfig source/mm/Kconfig
--- /scratch/src/linux-2.6.19.2/mm/Kconfig 2006-11-29 22:57:37.000000000 +0100
-+++ source/mm/Kconfig 2006-12-23 17:44:56.000000000 +0100
++++ source/mm/Kconfig 2007-01-15 15:49:04.000000000 +0100
@@ -132,11 +132,14 @@ config MEMORY_HOTPLUG_SPARSE
# Default to 4 for wider testing, though 8 might be more appropriate.
# ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -94319,7 +100665,7 @@
#
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/memory.c source/mm/memory.c
--- /scratch/src/linux-2.6.19.2/mm/memory.c 2007-01-15 16:07:25.000000000 +0100
-+++ source/mm/memory.c 2007-01-22 12:58:23.000000000 +0100
++++ source/mm/memory.c 2007-01-23 00:22:40.000000000 +0100
@@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
@@ -94470,7 +100816,7 @@
* which was read non-atomically. Before making any commitment, on
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/mmap.c source/mm/mmap.c
--- /scratch/src/linux-2.6.19.2/mm/mmap.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/mm/mmap.c 2006-12-23 17:44:56.000000000 +0100
++++ source/mm/mmap.c 2007-01-15 15:49:04.000000000 +0100
@@ -1970,6 +1970,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -94484,7 +100830,7 @@
tlb = tlb_gather_mmu(mm, 1);
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/page_alloc.c source/mm/page_alloc.c
--- /scratch/src/linux-2.6.19.2/mm/page_alloc.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/mm/page_alloc.c 2006-12-23 17:44:56.000000000 +0100
++++ source/mm/page_alloc.c 2007-01-15 15:49:04.000000000 +0100
@@ -496,6 +496,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -94514,7 +100860,7 @@
if (free_pages_check(page))
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/dev.c source/net/core/dev.c
--- /scratch/src/linux-2.6.19.2/net/core/dev.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/net/core/dev.c 2006-12-23 17:44:56.000000000 +0100
++++ source/net/core/dev.c 2007-01-15 15:49:05.000000000 +0100
@@ -118,6 +118,12 @@
#include <linux/err.h>
#include <linux/ctype.h>
@@ -94615,7 +100961,7 @@
EXPORT_SYMBOL(br_handle_frame_hook);
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/skbuff.c source/net/core/skbuff.c
--- /scratch/src/linux-2.6.19.2/net/core/skbuff.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/net/core/skbuff.c 2006-12-23 17:44:56.000000000 +0100
++++ source/net/core/skbuff.c 2007-01-15 15:49:05.000000000 +0100
@@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
@@ -94686,9 +101032,23 @@
C(pkt_type);
C(ip_summed);
C(priority);
+@@ -860,12 +879,12 @@ int ___pskb_trim(struct sk_buff *skb, un
+ int offset = skb_headlen(skb);
+ int nfrags = skb_shinfo(skb)->nr_frags;
+ int i;
++
+ int err;
+
+ if (skb_cloned(skb) &&
+ unlikely((err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC))))
+ return err;
+-
+ i = 0;
+ if (offset >= len)
+ goto drop_pages;
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c source/net/ipv4/netfilter/ip_nat_proto_tcp.c
--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-23 17:44:57.000000000 +0100
++++ source/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-01-15 15:49:06.000000000 +0100
@@ -129,9 +129,16 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
@@ -94708,7 +101068,7 @@
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c source/net/ipv4/netfilter/ip_nat_proto_udp.c
--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-23 17:44:57.000000000 +0100
++++ source/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-01-15 15:49:06.000000000 +0100
@@ -115,11 +115,18 @@ udp_manip_pkt(struct sk_buff **pskb,
}
@@ -94730,7 +101090,7 @@
}
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c source/net/ipv4/xfrm4_output.c
--- /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c 2006-11-29 22:57:37.000000000 +0100
-+++ source/net/ipv4/xfrm4_output.c 2006-12-23 17:44:57.000000000 +0100
++++ source/net/ipv4/xfrm4_output.c 2007-01-15 15:49:06.000000000 +0100
@@ -18,6 +18,8 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -94753,7 +101113,7 @@
if (err)
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c source/net/ipv6/addrconf.c
--- /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c 2007-01-15 16:07:25.000000000 +0100
-+++ source/net/ipv6/addrconf.c 2007-01-22 12:58:23.000000000 +0100
++++ source/net/ipv6/addrconf.c 2007-01-23 00:22:40.000000000 +0100
@@ -2545,6 +2545,8 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
@@ -94773,7 +101133,7 @@
diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/scripts/Makefile.xen source/scripts/Makefile.xen
--- /scratch/src/linux-2.6.19.2/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
-+++ source/scripts/Makefile.xen 2006-12-23 17:42:55.000000000 +0100
++++ source/scripts/Makefile.xen 2007-01-15 15:49:08.000000000 +0100
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v
retrieving revision 1.512
retrieving revision 1.512.2.1
diff -u -r1.512 -r1.512.2.1
--- sources 10 Jan 2007 23:22:55 -0000 1.512
+++ sources 23 Jan 2007 00:33:23 -0000 1.512.2.1
@@ -1,3 +1,3 @@
443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2
-a9d44b2651b0898e103395b2a7a4f263 xen-3.0.3-11774.tar.bz2
e8a9a6dc65da3f7b192e7caa969f9a1b patch-2.6.19.2.bz2
+ec35d2aa26cb452832761ff7ce9c4583 xen-3.0.4-13132.tar.bz2
xen-version-strings.patch:
Makefile | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/xen-version-strings.patch,v
retrieving revision 1.3
retrieving revision 1.3.16.1
diff -u -r1.3 -r1.3.16.1
--- xen-version-strings.patch 16 Nov 2006 22:34:29 -0000 1.3
+++ xen-version-strings.patch 23 Jan 2007 00:33:23 -0000 1.3.16.1
@@ -1,11 +1,11 @@
---- xen/Makefile.~1~ 2006-10-16 17:10:57.000000000 +0100
-+++ xen/Makefile 2006-10-16 17:11:08.000000000 +0100
+--- xen/Makefile.orig 2007-01-14 22:08:05.000000000 +0100
++++ xen/Makefile 2007-01-23 01:13:35.000000000 +0100
@@ -2,7 +2,11 @@
# All other places this is stored (eg. compile.h) should be autogenerated.
export XEN_VERSION = 3
export XEN_SUBVERSION = 0
--export XEN_EXTRAVERSION ?= .3-0
-+export XEN_BASEVERSION ?= .3-0
+-export XEN_EXTRAVERSION ?= .4-1$(XEN_VENDORVERSION)
++export XEN_BASEVERSION ?= .4-1$(XEN_VENDORVERSION)
+export XEN_BUILDER ?=
+export XEN_BUILDVERSION ?=
+export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION)
@@ -13,9 +13,9 @@
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version
-@@ -102,7 +106,7 @@
+@@ -108,8 +112,8 @@ include/xen/compile.h: include/xen/compi
-e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
- -e 's!@@changeset@@!$(shell ((hg parents || head -n 7 ../ChangeLog || echo date: unavailable) | awk '{FS="changeset:[ ]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END {print D, CS}') 2>/dev/null)!g' \
+ -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} {rev}:{node|short}") || echo "unavailable") 2>/dev/null)!g' \
< include/xen/compile.h.in > $@.new
- tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) >> $@.new
+ tools/figlet/figlet -d tools/figlet Xen $(XEN_SHORTVERSION) >> $@.new
- Previous message (by thread): rpms/kernel/FC-6/scripts rebase-xen-hv.sh,1.2,1.2.14.1
- Next message (by thread): rpms/virt-manager/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 virt-manager.spec, 1.14, 1.15 virt-manager-disable-config-hvm.patch, 1.1, NONE virt-manager-hostname-resolution-errors.patch, 1.1, NONE vm-limit-memory.patch, 1.1, NONE vm-non-sparse-file.patch, 1.1, NONE vm-use-ipv4-for-console.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list