[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/kernel/FC-5 linux-2.6-xen.patch,1.14,1.15
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/kernel/FC-5 linux-2.6-xen.patch,1.14,1.15
- Date: Tue, 4 Jul 2006 09:47:17 -0400
Author: quintela
Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2183
Modified Files:
linux-2.6-xen.patch
Log Message:
new xen patch
linux-2.6-xen.patch:
arch/i386/Kconfig | 92
arch/i386/Kconfig.cpu | 2
arch/i386/Kconfig.debug | 1
arch/i386/Makefile | 24
arch/i386/boot-xen/Makefile | 21
arch/i386/kernel/Makefile | 22
arch/i386/kernel/acpi/Makefile | 4
arch/i386/kernel/acpi/boot-xen.c | 1167 ++++++++
arch/i386/kernel/apic-xen.c | 160 +
arch/i386/kernel/asm-offsets.c | 10
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 | 903 ++++++
arch/i386/kernel/entry.S | 10
arch/i386/kernel/fixup.c | 86
arch/i386/kernel/head-xen.S | 181 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2751 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
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 | 1186 ++++++++
arch/i386/kernel/pci-dma-xen.c | 344 ++
arch/i386/kernel/process-xen.c | 812 +++++
arch/i386/kernel/quirks-xen.c | 48
arch/i386/kernel/setup-xen.c | 1827 +++++++++++++
arch/i386/kernel/smp-xen.c | 613 ++++
arch/i386/kernel/swiotlb.c | 672 ++++
arch/i386/kernel/sysenter.c | 102
arch/i386/kernel/time-xen.c | 1110 ++++++++
arch/i386/kernel/traps-xen.c | 1136 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/vm86.c | 12
arch/i386/kernel/vsyscall-note-xen.S | 32
arch/i386/mach-xen/Makefile | 5
arch/i386/mach-xen/setup.c | 49
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 734 +++++
arch/i386/mm/highmem-xen.c | 123
arch/i386/mm/hypervisor.c | 468 +++
arch/i386/mm/init-xen.c | 850 ++++++
arch/i386/mm/ioremap-xen.c | 476 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 694 +++++
arch/i386/mm/pgtable.c | 12
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 432 +++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1204 ++++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 58
arch/ia64/Makefile | 18
arch/ia64/hp/sim/Makefile | 2
arch/ia64/kernel/entry.S | 32
arch/ia64/kernel/gate.S | 376 --
arch/ia64/kernel/gate.lds.S | 96
arch/ia64/kernel/head.S | 6
arch/ia64/kernel/iosapic.c | 65
arch/ia64/kernel/irq_ia64.c | 208 +
arch/ia64/kernel/pal.S | 5
arch/ia64/kernel/patch.c | 197 -
arch/ia64/kernel/setup.c | 61
arch/ia64/mm/ioremap.c | 3
arch/ia64/xen/Makefile | 8
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/hypercall.S | 353 ++
arch/ia64/xen/hypervisor.c | 784 +++++
arch/ia64/xen/util.c | 130
arch/ia64/xen/xenentry.S | 883 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2171 +++++++++++++++
arch/ia64/xen/xenminstate.h | 369 ++
arch/ia64/xen/xenpal.S | 76
arch/ia64/xen/xensetup.S | 24
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 | 726 +++++
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 | 198 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/e820-xen.c | 753 +++++
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 | 176 +
arch/x86_64/kernel/head64-xen.c | 159 +
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2232 ++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 99
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 | 1012 +++++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 54
arch/x86_64/kernel/process-xen.c | 791 +++++
arch/x86_64/kernel/setup-xen.c | 1710 ++++++++++++
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 | 1035 +++++++
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 | 690 +++++
arch/x86_64/mm/fault-xen.c~ | 692 +++++
arch/x86_64/mm/init-xen.c | 1202 ++++++++
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/mem.c | 6
drivers/char/tpm/Kconfig | 14
drivers/char/tpm/Makefile | 2
drivers/char/tpm/tpm.c | 44
drivers/char/tpm/tpm.h | 7
drivers/char/tpm/tpm_vtpm.c | 546 +++
drivers/char/tpm/tpm_vtpm.h | 38
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 | 39
drivers/oprofile/cpu_buffer.c | 26
drivers/oprofile/cpu_buffer.h | 8
drivers/oprofile/event_buffer.h | 3
drivers/oprofile/oprof.c | 19
drivers/oprofile/oprof.h | 2
drivers/oprofile/oprofile_files.c | 82
drivers/pci/Kconfig | 1
drivers/serial/Kconfig | 1
drivers/video/Kconfig | 2
drivers/xen/Kconfig | 248 +
drivers/xen/Makefile | 16
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 609 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 568 ++++
drivers/xen/blkback/common.h | 133
drivers/xen/blkback/interface.c | 165 +
drivers/xen/blkback/vbd.c | 119
drivers/xen/blkback/xenbus.c | 410 ++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 841 ++++++
drivers/xen/blkfront/block.h | 156 +
drivers/xen/blkfront/vbd.c | 318 ++
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 182 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 640 ++++
drivers/xen/console/xencons_ring.c | 141 +
drivers/xen/core/Makefile | 13
drivers/xen/core/cpu_hotplug.c | 185 +
drivers/xen/core/evtchn.c | 846 ++++++
drivers/xen/core/features.c | 30
drivers/xen/core/gnttab.c | 442 +++
drivers/xen/core/hypervisor_sysfs.c | 60
drivers/xen/core/reboot.c | 364 ++
drivers/xen/core/skbuff.c | 141 +
drivers/xen/core/smpboot.c | 433 +++
drivers/xen/core/xen_proc.c | 19
drivers/xen/core/xen_sysfs.c | 316 ++
drivers/xen/evtchn/Makefile | 2
drivers/xen/evtchn/evtchn.c | 458 +++
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 124
drivers/xen/netback/interface.c | 314 ++
drivers/xen/netback/loopback.c | 255 +
drivers/xen/netback/netback.c | 1039 +++++++
drivers/xen/netback/xenbus.c | 396 ++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 1551 +++++++++++
drivers/xen/pciback/Makefile | 13
drivers/xen/pciback/conf_space.c | 403 ++
drivers/xen/pciback/conf_space.h | 123
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/passthrough.c | 157 +
drivers/xen/pciback/pci_stub.c | 690 +++++
drivers/xen/pciback/pciback.h | 91
drivers/xen/pciback/pciback_ops.c | 95
drivers/xen/pciback/vpci.c | 204 +
drivers/xen/pciback/xenbus.c | 454 +++
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 | 285 ++
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 82
drivers/xen/tpmback/interface.c | 177 +
drivers/xen/tpmback/tpmback.c | 1074 +++++++
drivers/xen/tpmback/xenbus.c | 306 ++
drivers/xen/util.c | 70
drivers/xen/xenbus/Makefile | 12
drivers/xen/xenbus/xenbus_backend_client.c | 135
drivers/xen/xenbus/xenbus_client.c | 281 ++
drivers/xen/xenbus/xenbus_comms.c | 208 +
drivers/xen/xenbus/xenbus_comms.h | 43
drivers/xen/xenbus/xenbus_dev.c | 245 +
drivers/xen/xenbus/xenbus_probe.c | 1094 +++++++
drivers/xen/xenbus/xenbus_xs.c | 846 ++++++
fs/Kconfig | 1
include/asm-i386/a.out.h | 2
include/asm-i386/apic.h | 2
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 | 154 +
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 | 77
include/asm-i386/mach-xen/asm/hypercall.h | 372 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 226 +
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 | 25
include/asm-i386/mach-xen/asm/mmu_context.h | 108
include/asm-i386/mach-xen/asm/page.h | 336 ++
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 | 88
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
include/asm-i386/mach-xen/asm/pgtable-3level.h | 197 +
include/asm-i386/mach-xen/asm/pgtable.h | 509 +++
include/asm-i386/mach-xen/asm/processor.h | 753 +++++
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 | 578 ++++
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 | 101
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/agp.h | 31
include/asm-ia64/dma-mapping.h | 72
include/asm-ia64/fixmap.h | 2
include/asm-ia64/gcc_intrin.h | 60
include/asm-ia64/hw_irq.h | 11
include/asm-ia64/hypercall.h | 533 +++
include/asm-ia64/hypervisor.h | 207 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/io.h | 50
include/asm-ia64/iosapic.h | 2
include/asm-ia64/irq.h | 31
include/asm-ia64/machvec.h | 15
include/asm-ia64/meminit.h | 5
include/asm-ia64/page.h | 124
include/asm-ia64/pal.h | 1
include/asm-ia64/pgalloc.h | 2
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/e820.h | 63
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 | 145 +
include/asm-x86_64/mach-xen/asm/hypercall.h | 372 ++
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 | 37
include/asm-x86_64/mach-xen/asm/mmu_context.h | 136
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 | 327 ++
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 | 58
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/mm.h | 10
include/linux/oprofile.h | 8
include/linux/pfn.h | 2
include/linux/skbuff.h | 13
include/xen/balloon.h | 63
include/xen/cpu_hotplug.h | 44
include/xen/driver_util.h | 16
include/xen/evtchn.h | 114
include/xen/features.h | 20
include/xen/foreign_page.h | 30
include/xen/gnttab.h | 151 +
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/acm.h | 188 +
include/xen/interface/acm_ops.h | 103
include/xen/interface/arch-ia64.h | 418 +++
include/xen/interface/arch-x86_32.h | 231 +
include/xen/interface/arch-x86_64.h | 297 ++
include/xen/interface/callback.h | 74
include/xen/interface/dom0_ops.h | 588 ++++
include/xen/interface/event_channel.h | 233 +
include/xen/interface/features.h | 53
include/xen/interface/grant_table.h | 317 ++
include/xen/interface/hvm/hvm_info_table.h | 24
include/xen/interface/hvm/ioreq.h | 98
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 | 92
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/sched.h | 103
include/xen/interface/sched_ctl.h | 69
include/xen/interface/trace.h | 86
include/xen/interface/vcpu.h | 121
include/xen/interface/version.h | 67
include/xen/interface/xen-compat.h | 47
include/xen/interface/xen.h | 505 +++
include/xen/interface/xenoprof.h | 94
include/xen/pcifront.h | 39
include/xen/public/evtchn.h | 91
include/xen/public/privcmd.h | 79
include/xen/xen_proc.h | 13
include/xen/xenbus.h | 299 ++
include/xen/xencons.h | 14
kernel/Kconfig.preempt | 1
kernel/fork.c | 3
kernel/irq/manage.c | 26
kernel/irq/spurious.c | 3
lib/Makefile | 3
log | 2293 ++++++++++++++++
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 119
mm/mmap.c | 4
mm/page_alloc.c | 6
net/core/dev.c | 63
net/core/skbuff.c | 41
net/ipv4/netfilter/ip_nat_proto_tcp.c | 9
net/ipv4/netfilter/ip_nat_proto_udp.c | 12
net/ipv4/xfrm4_output.c | 6
net/ipv6/addrconf.c | 2
scripts/Makefile.xen | 14
403 files changed, 84789 insertions(+), 927 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.14 -r 1.15 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-xen.patch 18 Jun 2006 04:45:05 -0000 1.14
+++ linux-2.6-xen.patch 4 Jul 2006 13:47:13 -0000 1.15
@@ -1,6 +1,6 @@
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/boot-xen/Makefile 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/boot-xen/Makefile new/arch/i386/boot-xen/Makefile
+--- linux-2.6/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/boot-xen/Makefile 2006-05-09 12:32:33.000000000 +0200
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
+ 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 -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig 2006-05-27 02:37:47.000000000 +0200
-+++ merge/arch/i386/Kconfig 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
+--- linux-2.6/arch/i386/Kconfig 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/Kconfig 2006-05-23 18:37:09.000000000 +0200
@@ -91,6 +91,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -315,9 +315,9 @@
config KTIME_SCALAR
bool
default y
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu merge/arch/i386/Kconfig.cpu
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu 2006-04-14 19:01:33.000000000 +0200
-+++ merge/arch/i386/Kconfig.cpu 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig.cpu new/arch/i386/Kconfig.cpu
+--- linux-2.6/arch/i386/Kconfig.cpu 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/Kconfig.cpu 2006-05-09 12:32:33.000000000 +0200
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -327,9 +327,9 @@
default y
config X86_WP_WORKS_OK
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug merge/arch/i386/Kconfig.debug
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug 2006-04-20 13:58:44.000000000 +0200
-+++ merge/arch/i386/Kconfig.debug 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig.debug new/arch/i386/Kconfig.debug
+--- linux-2.6/arch/i386/Kconfig.debug 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/Kconfig.debug 2006-05-09 12:32:33.000000000 +0200
@@ -84,6 +84,7 @@ config X86_MPPARSE
config DOUBLEFAULT
default y
@@ -338,9 +338,9 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c merge/arch/i386/kernel/acpi/boot-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/acpi/boot-xen.c 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/acpi/boot-xen.c new/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/acpi/boot-xen.c 2006-05-23 18:37:09.000000000 +0200
@@ -0,0 +1,1167 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1509,9 +1509,9 @@
+
+ return 0;
+}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile merge/arch/i386/kernel/acpi/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile 2006-03-10 14:25:05.000000000 +0100
-+++ merge/arch/i386/kernel/acpi/Makefile 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/acpi/Makefile new/arch/i386/kernel/acpi/Makefile
+--- linux-2.6/arch/i386/kernel/acpi/Makefile 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/acpi/Makefile 2006-05-09 12:32:33.000000000 +0200
@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -1520,9 +1520,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c merge/arch/i386/kernel/apic-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/apic-xen.c 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/apic-xen.c new/arch/i386/kernel/apic-xen.c
+--- linux-2.6/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/apic-xen.c 2006-05-09 12:32:33.000000000 +0200
@@ -0,0 +1,160 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1684,9 +1684,9 @@
+
+ return 0;
+}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c merge/arch/i386/kernel/asm-offsets.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c 2005-11-07 20:02:43.000000000 +0100
-+++ merge/arch/i386/kernel/asm-offsets.c 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/asm-offsets.c new/arch/i386/kernel/asm-offsets.c
+--- linux-2.6/arch/i386/kernel/asm-offsets.c 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/asm-offsets.c 2006-05-09 12:32:34.000000000 +0200
@@ -13,6 +13,7 @@
#include <asm/fixmap.h>
#include <asm/processor.h>
@@ -1713,9 +1713,9 @@
- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/common-xen.c 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/common-xen.c new/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/cpu/common-xen.c 2006-05-23 18:37:09.000000000 +0200
@@ -0,0 +1,732 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -2449,9 +2449,9 @@
+ per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
+}
+#endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile merge/arch/i386/kernel/cpu/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile 2005-11-07 20:02:43.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/Makefile 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/Makefile new/arch/i386/kernel/cpu/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/Makefile 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/cpu/Makefile 2006-05-09 12:32:34.000000000 +0200
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
@@ -2461,9 +2461,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c merge/arch/i386/kernel/cpu/mtrr/main-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c new/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-05-09 12:32:34.000000000 +0200
@@ -0,0 +1,197 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -2662,9 +2662,9 @@
+}
+
+subsys_initcall(mtrr_init);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile merge/arch/i386/kernel/cpu/mtrr/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile 2005-11-07 20:02:43.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/mtrr/Makefile 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile new/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/cpu/mtrr/Makefile 2006-05-09 12:32:34.000000000 +0200
@@ -3,3 +3,10 @@ obj-y += amd.o
obj-y += cyrix.o
obj-y += centaur.o
@@ -2676,15 +2676,15 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c merge/arch/i386/kernel/early_printk-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/early_printk-xen.c 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/early_printk-xen.c new/arch/i386/kernel/early_printk-xen.c
+--- linux-2.6/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/early_printk-xen.c 2006-05-09 12:32:34.000000000 +0200
@@ -0,0 +1,2 @@
+
+#include "../../x86_64/kernel/early_printk-xen.c"
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S merge/arch/i386/kernel/entry.S
---- ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S 2006-04-04 08:17:22.000000000 +0200
-+++ merge/arch/i386/kernel/entry.S 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/entry.S new/arch/i386/kernel/entry.S
+--- linux-2.6/arch/i386/kernel/entry.S 2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/entry.S 2006-05-09 12:32:34.000000000 +0200
@@ -177,7 +177,7 @@ need_resched:
# sysenter call handler stub
@@ -2730,9 +2730,9 @@
pushfl; \
pushl $__KERNEL_CS; \
pushl $sysenter_past_esp
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S merge/arch/i386/kernel/entry-xen.S
---- ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/entry-xen.S 2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/entry-xen.S new/arch/i386/kernel/entry-xen.S
+--- linux-2.6/arch/i386/kernel/entry-xen.S 1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/entry-xen.S 2006-05-09 12:32:34.000000000 +0200
@@ -0,0 +1,903 @@
+/*
+ * linux/arch/i386/entry.S
@@ -3637,9 +3637,9 @@
+#include "syscall_table.S"
+
+syscall_table_size=(.-sys_call_table)
[...26418 lines suppressed...]
++ LD [M] net/netfilter/xt_tcpudp.ko
++ CC net/sunrpc/auth_gss/auth_rpcgss.mod.o
++ LD [M] net/sunrpc/auth_gss/auth_rpcgss.ko
++ CC net/sunrpc/auth_gss/rpcsec_gss_krb5.mod.o
++ LD [M] net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
++ CC net/sunrpc/auth_gss/rpcsec_gss_spkm3.mod.o
++ LD [M] net/sunrpc/auth_gss/rpcsec_gss_spkm3.ko
++ CC net/sunrpc/sunrpc.mod.o
++ LD [M] net/sunrpc/sunrpc.ko
++ CC sound/soundcore.mod.o
++ LD [M] sound/soundcore.ko
+diff -urNp --exclude=.hg linux-2.6/mm/highmem.c new/mm/highmem.c
+--- linux-2.6/mm/highmem.c 2006-07-03 14:15:20.000000000 +0200
++++ new/mm/highmem.c 2006-05-09 12:35:59.000000000 +0200
@@ -142,6 +142,17 @@ start:
return vaddr;
}
@@ -86374,9 +88927,9 @@
void fastcall *kmap_high(struct page *page)
{
unsigned long vaddr;
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/Kconfig merge/mm/Kconfig
---- ../upstream/hg/linux-2.6/mm/Kconfig 2006-04-04 08:18:24.000000000 +0200
-+++ merge/mm/Kconfig 2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/Kconfig new/mm/Kconfig
+--- linux-2.6/mm/Kconfig 2006-07-03 14:15:20.000000000 +0200
++++ new/mm/Kconfig 2006-05-09 12:40:16.000000000 +0200
@@ -126,11 +126,14 @@ comment "Memory hotplug is currently inc
# 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.
@@ -86392,9 +88945,9 @@
default "4"
#
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/memory.c merge/mm/memory.c
---- ../upstream/hg/linux-2.6/mm/memory.c 2006-04-04 08:18:24.000000000 +0200
-+++ merge/mm/memory.c 2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/memory.c new/mm/memory.c
+--- linux-2.6/mm/memory.c 2006-07-03 14:15:20.000000000 +0200
++++ new/mm/memory.c 2006-06-28 14:32:14.000000000 +0200
@@ -402,7 +402,8 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
@@ -86405,15 +88958,7 @@
return NULL;
}
-@@ -964,6 +965,7 @@ int get_user_pages(struct task_struct *t
- {
- int i;
- unsigned int vm_flags;
-+ int xenpage = 0;
-
- /*
- * Require read or write permissions.
-@@ -1017,6 +1019,27 @@ int get_user_pages(struct task_struct *t
+@@ -1017,6 +1018,26 @@ int get_user_pages(struct task_struct *t
continue;
}
@@ -86421,7 +88966,6 @@
+ if (vma && (vma->vm_flags & VM_FOREIGN)) {
+ struct page **map = vma->vm_private_data;
+ int offset = (start - vma->vm_start) >> PAGE_SHIFT;
-+ xenpage =1;
+ if (map[offset] != NULL) {
+ if (pages) {
+ struct page *page = map[offset];
@@ -86441,7 +88985,7 @@
if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
|| !(vm_flags & vma->vm_flags))
return i ? : -EFAULT;
-@@ -1356,6 +1379,102 @@ int remap_pfn_range(struct vm_area_struc
+@@ -1356,6 +1377,102 @@ int remap_pfn_range(struct vm_area_struc
}
EXPORT_SYMBOL(remap_pfn_range);
@@ -86544,9 +89088,9 @@
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/mmap.c merge/mm/mmap.c
---- ../upstream/hg/linux-2.6/mm/mmap.c 2006-04-14 19:01:47.000000000 +0200
-+++ merge/mm/mmap.c 2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/mmap.c new/mm/mmap.c
+--- linux-2.6/mm/mmap.c 2006-07-03 14:15:20.000000000 +0200
++++ new/mm/mmap.c 2006-05-09 12:35:59.000000000 +0200
@@ -1942,6 +1942,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -86558,9 +89102,9 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/page_alloc.c merge/mm/page_alloc.c
---- ../upstream/hg/linux-2.6/mm/page_alloc.c 2006-05-27 02:38:10.000000000 +0200
-+++ merge/mm/page_alloc.c 2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/page_alloc.c new/mm/page_alloc.c
+--- linux-2.6/mm/page_alloc.c 2006-07-03 14:15:20.000000000 +0200
++++ new/mm/page_alloc.c 2006-05-23 18:37:12.000000000 +0200
@@ -438,7 +438,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -86581,9 +89125,9 @@
if (PageAnon(page))
page->mapping = NULL;
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/dev.c merge/net/core/dev.c
---- ../upstream/hg/linux-2.6/net/core/dev.c 2006-05-27 02:38:11.000000000 +0200
-+++ merge/net/core/dev.c 2006-05-30 12:45:46.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/core/dev.c new/net/core/dev.c
+--- linux-2.6/net/core/dev.c 2006-07-03 14:15:21.000000000 +0200
++++ new/net/core/dev.c 2006-06-05 15:54:33.000000000 +0200
@@ -116,6 +116,12 @@
#include <asm/current.h>
#include <linux/audit.h>
@@ -86682,9 +89226,9 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/skbuff.c merge/net/core/skbuff.c
---- ../upstream/hg/linux-2.6/net/core/skbuff.c 2006-04-21 20:21:11.000000000 +0200
-+++ merge/net/core/skbuff.c 2006-05-30 12:44:04.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/core/skbuff.c new/net/core/skbuff.c
+--- linux-2.6/net/core/skbuff.c 2006-07-03 14:15:21.000000000 +0200
++++ new/net/core/skbuff.c 2006-05-09 12:36:02.000000000 +0200
@@ -140,6 +140,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
@@ -86770,9 +89314,9 @@
C(pkt_type);
C(ip_summed);
C(priority);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-01-16 01:22:34.000000000 +0100
-+++ merge/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-05-30 12:44:05.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c new/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-05-23 18:37:13.000000000 +0200
@@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
@@ -86792,9 +89336,9 @@
return 1;
}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
---- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-01-16 01:22:34.000000000 +0100
-+++ merge/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-05-30 12:44:05.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c new/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-05-23 18:37:13.000000000 +0200
@@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
newport = tuple->dst.u.udp.port;
portptr = &hdr->dest;
@@ -86817,9 +89361,9 @@
*portptr = newport;
return 1;
}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
---- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c 2006-05-13 02:59:54.000000000 +0200
-+++ merge/net/ipv4/xfrm4_output.c 2006-05-30 12:44:06.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv4/xfrm4_output.c new/net/ipv4/xfrm4_output.c
+--- linux-2.6/net/ipv4/xfrm4_output.c 2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv4/xfrm4_output.c 2006-05-09 12:36:06.000000000 +0200
@@ -17,6 +17,8 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -86840,9 +89384,28 @@
if (skb->ip_summed == CHECKSUM_HW) {
err = skb_checksum_help(skb, 0);
if (err)
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
---- ../upstream/hg/linux-2.6/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
-+++ merge/scripts/Makefile.xen 2006-05-30 12:44:09.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv6/addrconf.c new/net/ipv6/addrconf.c
+--- linux-2.6/net/ipv6/addrconf.c 2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv6/addrconf.c 2006-06-28 14:32:14.000000000 +0200
+@@ -2461,6 +2461,7 @@ static void addrconf_dad_start(struct in
+ spin_lock_bh(&ifp->lock);
+
+ if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
++ !(dev->flags&IFF_MULTICAST) ||
+ !(ifp->flags&IFA_F_TENTATIVE)) {
+ ifp->flags &= ~IFA_F_TENTATIVE;
+ spin_unlock_bh(&ifp->lock);
+@@ -2545,6 +2546,7 @@ static void addrconf_dad_completed(struc
+ if (ifp->idev->cnf.forwarding == 0 &&
+ ifp->idev->cnf.rtr_solicits > 0 &&
+ (dev->flags&IFF_LOOPBACK) == 0 &&
++ (dev->flags & IFF_MULTICAST) &&
+ (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
+ struct in6_addr all_routers;
+
+diff -urNp --exclude=.hg linux-2.6/scripts/Makefile.xen new/scripts/Makefile.xen
+--- linux-2.6/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
++++ new/scripts/Makefile.xen 2006-05-09 12:40:15.000000000 +0200
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]