rpms/kernel/devel xen-ia64-gnttab_make_dirty.patch, NONE, 1.1 xen-ia64-shadow.patch, NONE, 1.1 .cvsignore, 1.513, 1.514 kernel-2.6.spec, 1.2590, 1.2591 linux-2.6-xen.patch, 1.56, 1.57 sources, 1.476, 1.477

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Aug 25 21:25:52 UTC 2006


Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24131

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen.patch sources 
Added Files:
	xen-ia64-gnttab_make_dirty.patch xen-ia64-shadow.patch 
Log Message:
update xen HV to xen-unstable cset 11251 and fix ia64 arch

xen-ia64-gnttab_make_dirty.patch:
 grant_table.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-ia64-gnttab_make_dirty.patch ---
# HG changeset patch
# User awilliam at xenbuild.aw
# Date Wed Aug 23 11:16:11 2006 -0600
# Node ID 56ec2377b32e18ab3f0da752c08047491a54ecb7
# parent: 5264cc30d711ab7ba0e1c252853a4dba6faa7fa9
[IA64] replace gnttab_log_dirty with gnttab_mark_dirty

Signed-off-by: Alex Williamson <alex.williamson at hp.com>



--- a/xen/include/asm-ia64/grant_table.h	Wed Aug 23 11:15:29 2006 -0600
+++ b/xen/include/asm-ia64/grant_table.h	Wed Aug 23 11:16:11 2006 -0600
@@ -35,7 +35,7 @@ void guest_physmap_add_page(struct domai
                           gnttab_shared_maddr((d), (t), (i)));          \
         (IA64_GRANT_TABLE_PADDR >> PAGE_SHIFT) + (i);})
 
-#define gnttab_log_dirty(d, f) ((void)0)
+#define gnttab_mark_dirty(d, f) ((void)0)
 
 static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr)
 {


xen-ia64-shadow.patch:
 domain.c |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE xen-ia64-shadow.patch ---
# HG changeset patch
# User awilliam at xenbuild.aw
# Date Wed Aug 23 11:16:41 2006 -0600
# Node ID 7aaab04fd22e6ae3bc7c763c9a286bf3b435ac37
# parent: ac41222866e90ceb8b927c9fd0d42761ebc1d8b1
[IA64] DOM0_SHADOW_CONTROL_OP_GET/SET_ALLOCATION stubs

Signed-off-by: Alex Williamson <alex.williamson at hp.com>



--- a/xen/arch/ia64/xen/domain.c	Wed Aug 23 11:16:26 2006 -0600
+++ b/xen/arch/ia64/xen/domain.c	Wed Aug 23 11:16:41 2006 -0600
@@ -727,6 +727,15 @@ int shadow_mode_control(struct domain *d
 		}
 		break;
 	}
+	case DOM0_SHADOW_CONTROL_OP_GET_ALLOCATION:
+		sc->mb = 0;
+		break;
+	case DOM0_SHADOW_CONTROL_OP_SET_ALLOCATION:
+		if (sc->mb > 0) {
+			BUG();
+			rc = -ENOMEM;
+		}
+		break;
 	default:
 		rc = -EINVAL;
 		break;



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- .cvsignore	20 Aug 2006 07:29:57 -0000	1.513
+++ .cvsignore	25 Aug 2006 21:25:44 -0000	1.514
@@ -4,5 +4,5 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc4.bz2
-xen-11057.tar.bz2
 patch-2.6.18-rc4-git1.bz2
+xen-11251.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2590
retrieving revision 1.2591
diff -u -r1.2590 -r1.2591
--- kernel-2.6.spec	25 Aug 2006 20:09:27 -0000	1.2590
+++ kernel-2.6.spec	25 Aug 2006 21:25:44 -0000	1.2591
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 11057
+%define xen_hv_cset 11251
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags debug=y verbose=y crash_debug=y
@@ -495,6 +495,8 @@
 # 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
 
@@ -1111,6 +1113,8 @@
 cd xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
+%patch20001 -p2
+%patch20002 -p2
 %endif
 
 
@@ -1796,6 +1800,10 @@
 %endif
 
 %changelog
+* Fri Aug 25 2006 Juan Quintela <quintela at redhat.com>
+- update xen HV to xen-unstable cset 11251.
+- fix ia64 xen HV compilation.
+
 * Fri Aug 25 2006 Don Zickus <dzickus at redhat.com>
 - build fix for ia64 kdump
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 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                   |  740 +++++
 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                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 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                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1848 +++++++++++++
 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/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 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                          |  478 +++
 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                       |  555 ++++
 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                            |  123 
 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                          |  810 +++++
 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/Kconfig.debug                           |    1 
 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                         |   18 
 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                       |  752 +++++
 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                    |  164 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 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/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                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1656 +++++++++++
 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/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/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    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                     | 2067 ++++++++++++++
 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                       |  289 ++
 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                   | 1149 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  853 ++++++
 fs/Kconfig                                          |    1 
 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/hypercall.h           |  379 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  234 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 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              |  575 ++++
 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              |    6 
 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                              |   39 
 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                        |  496 +++
 include/asm-ia64/hypervisor.h                       |  192 +
 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                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  114 
 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                       |  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            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  379 ++
 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/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           |  559 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 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            |  346 ++
 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/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/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   65 
 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                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  448 +++
 include/xen/interface/arch-powerpc.h                |  115 
 include/xen/interface/arch-x86_32.h                 |  256 +
 include/xen/interface/arch-x86_64.h                 |  322 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  619 ++++
 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/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 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                         |  558 ++++
 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 
 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                                   |   42 
 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 
 414 files changed, 87662 insertions(+), 217 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.56 -r 1.57 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- linux-2.6-xen.patch	19 Aug 2006 22:49:07 -0000	1.56
+++ linux-2.6-xen.patch	25 Aug 2006 21:25:44 -0000	1.57
@@ -1,7 +1,7 @@
-- linux-2.6 changeset: 33525:dcc321d1340a
-- linux-2.6-xen-fedora changeset: 35247:400b0cf28ee4
-- linux-2.6-xen changeset: 22813:80c2ccf5c330
-- xen-unstable changeset: 11069:0340e579f06544431e915d17596ac144145a077e
+- linux-2.6 changeset: 33681:2695586981b9
+- linux-2.6-xen-fedora changeset: 35458:b1b8e00e7a17
+- 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
 --- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-26 16:46:14.000000000 +0200
@@ -1538,8 +1538,20 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
 --- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-19 21:10:30.000000000 +0200
-@@ -151,7 +151,11 @@ void apply_alternatives(struct alt_instr
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-08-25 21:11:59.000000000 +0200
+@@ -4,7 +4,11 @@
+ #include <asm/alternative.h>
+ #include <asm/sections.h>
+ 
++#ifdef CONFIG_X86_64_XEN
++static int no_replacement    = 1;
++#else
+ static int no_replacement    = 0;
++#endif
+ static int smp_alt_once      = 0;
+ static int debug_alternative = 0;
+ 
+@@ -151,7 +155,11 @@ void apply_alternatives(struct alt_instr
  #ifdef CONFIG_X86_64
  		/* vsyscall code is not mapped yet. resolve it manually. */
  		if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) {
@@ -2492,7 +2504,7 @@
 +endif
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/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
-+++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-26 16:46:14.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-08-25 02:47:30.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2675,7 +2687,7 @@
 +{
 +	struct cpuinfo_x86 *c = &boot_cpu_data;
 +
-+	if (!(xen_start_info->flags & SIF_PRIVILEGED))
++	if (!is_initial_xendomain())
 +		return -ENODEV;
 +
 +	if ((!cpu_has(c, X86_FEATURE_MTRR)) &&
@@ -4291,7 +4303,7 @@
 +
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/arch/i386/kernel/io_apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/io_apic-xen.c
 --- linux-2.6/arch/i386/kernel/io_apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/io_apic-xen.c	2006-07-26 16:46:14.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/io_apic-xen.c	2006-08-25 02:47:30.000000000 +0200
 @@ -0,0 +1,2772 @@
 +/*
 + *	Intel IO-APIC support for multi-Pentium hosts.
@@ -6799,7 +6811,7 @@
 +{
 +	if(sis_apic_bug == -1)
 +		sis_apic_bug = 0;
-+	if (xen_start_info->flags & SIF_INITDOMAIN) {
++	if (is_initial_xendomain()) {
 +		dom0_op_t op = { .cmd = DOM0_PLATFORM_QUIRK };
 +		op.u.platform_quirk.quirk_id = sis_apic_bug ?
 +			QUIRK_IOAPIC_BAD_REGSEL : QUIRK_IOAPIC_GOOD_REGSEL;
@@ -10433,8 +10445,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-13 01:28:21.000000000 +0200
-@@ -0,0 +1,1831 @@
++++ linux-2.6-xen-fedora/arch/i386/kernel/setup-xen.c	2006-08-25 21:11:59.000000000 +0200
+@@ -0,0 +1,1848 @@
 +/*
 + *  linux/arch/i386/kernel/setup.c
 + *
@@ -10623,7 +10635,6 @@
 +	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM
 +};
 +
-+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 +static struct resource system_rom_resource = {
 +	.name	= "System ROM",
 +	.start	= 0xf0000,
@@ -10679,7 +10690,6 @@
 +	.end	= 0xc7fff,
 +	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
 +};
-+#endif
 +
 +static struct resource video_ram_resource = {
 +	.name	= "Video RAM area",
@@ -10738,7 +10748,6 @@
 +#define STANDARD_IO_RESOURCES \
 +	(sizeof standard_io_resources / sizeof standard_io_resources[0])
 +
-+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 +#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
 +
 +static int __init romchecksum(unsigned char *rom, unsigned long length)
@@ -10756,9 +10765,11 @@
 +	unsigned char *rom;
 +	int	      i;
 +
++#ifdef CONFIG_XEN
 +	/* Nothing to do if not running in dom0. */
-+	if (!(xen_start_info->flags & SIF_INITDOMAIN))
++	if (!is_initial_xendomain())
 +		return;
++#endif
 +
 +	/* video rom */
 +	upper = adapter_rom_resources[0].start;
@@ -10816,7 +10827,6 @@
 +		start = adapter_rom_resources[i++].end & ~2047UL;
 +	}
 +}
-+#endif
 +
 +/*
 + * Point at the empty zero page to start with. We map the real shared_info
@@ -11834,9 +11844,7 @@
 +	e820_setup_gap(map, memmap.nr_entries);
 +#endif
 +
-+#if defined(CONFIG_XEN_PRIVILEGED_GUEST) || !defined(CONFIG_XEN)
 +	probe_roms();
-+#endif
 +
 +	for (i = 0; i < nr_map; i++) {
 +		struct resource *res;
@@ -11885,7 +11893,7 @@
 +	int i;
 +
 +	/* Nothing to do if not running in dom0. */
-+	if (!(xen_start_info->flags & SIF_INITDOMAIN))
++	if (!is_initial_xendomain())
 +		return 0;
 +
 +	printk("Setting up standard PCI resources\n");
@@ -11989,7 +11997,7 @@
 +
 +	/* Force a quick death if the kernel panics (not domain 0). */
 +	extern int panic_timeout;
-+	if (!panic_timeout && !(xen_start_info->flags & SIF_INITDOMAIN))
++	if (!panic_timeout && !is_initial_xendomain())
 +		panic_timeout = 1;
 +
 +	/* Register a call for panic conditions. */
@@ -12033,7 +12041,7 @@
 +	}
 +	bootloader_type = LOADER_TYPE;
 +
-+	if (xen_start_info->flags & SIF_INITDOMAIN) {
++	if (is_initial_xendomain()) {
 +		/* This is drawn from a dump from vgacon:startup in
 +		 * standard Linux. */
 +		screen_info.orig_video_mode = 3; 
@@ -12042,6 +12050,35 @@
 +		screen_info.orig_video_cols = 80;
 +		screen_info.orig_video_ega_bx = 3;
 +		screen_info.orig_video_points = 16;
++		if (xen_start_info->console.dom0.info_size >=
++		    sizeof(struct dom0_vga_console_info)) {
++			const struct dom0_vga_console_info *info =
++				(struct dom0_vga_console_info *)(
++					(char *)xen_start_info +
++					xen_start_info->console.dom0.info_off);
++			screen_info.orig_video_mode = info->txt_mode;
++			screen_info.orig_video_isVGA = info->video_type;
++			screen_info.orig_video_lines = info->video_height;
++			screen_info.orig_video_cols = info->video_width;
++			screen_info.orig_video_points = info->txt_points;
++			screen_info.lfb_width = info->video_width;
++			screen_info.lfb_height = info->video_height;
++			screen_info.lfb_depth = info->lfb_depth;
++			screen_info.lfb_base = info->lfb_base;
++			screen_info.lfb_size = info->lfb_size;
++			screen_info.lfb_linelength = info->lfb_linelen;
++			screen_info.red_size = info->red_size;
++			screen_info.red_pos = info->red_pos;
++			screen_info.green_size = info->green_size;
++			screen_info.green_pos = info->green_pos;
++			screen_info.blue_size = info->blue_size;
++			screen_info.blue_pos = info->blue_pos;
++			screen_info.rsvd_size = info->rsvd_size;
[...5902 lines suppressed...]
++#if __XEN_INTERFACE_VERSION__ < 0x00030203
++#define console_mfn    console.domU.mfn
++#define console_evtchn console.domU.evtchn
++#endif
++
 +/* These flags are passed in the 'flags' field of start_info_t. */
 +#define SIF_PRIVILEGED    (1<<0)  /* Is the domain privileged? */
 +#define SIF_INITDOMAIN    (1<<1)  /* Is this the initial control domain? */
 +
++typedef struct dom0_vga_console_info {
++    uint8_t video_type;
++    uint8_t txt_points;
++    uint16_t txt_mode;
++    uint16_t txt_x;
++    uint16_t txt_y;
++    uint16_t video_width;
++    uint16_t video_height;
++    uint16_t lfb_linelen;
++    uint16_t lfb_depth;
++    unsigned long lfb_base;
++    unsigned long lfb_size;
++    uint8_t red_pos;
++    uint8_t red_size;
++    uint8_t green_pos;
++    uint8_t green_size;
++    uint8_t blue_pos;
++    uint8_t blue_size;
++    uint8_t rsvd_pos;
++    uint8_t rsvd_size;
++} dom0_vga_console_info_t;
++
 +typedef uint64_t cpumap_t;
 +
 +typedef uint8_t xen_domain_handle_t[16];
@@ -90639,8 +90450,6 @@
 +
 +#endif /* !__ASSEMBLY__ */
 +
-+#include "xen-compat.h"
-+
 +#endif /* __XEN_PUBLIC_XEN_H__ */
 +
 +/*
@@ -91019,8 +90828,8 @@
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/xenbus.h linux-2.6-xen-fedora/include/xen/xenbus.h
 --- linux-2.6/include/xen/xenbus.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/xen/xenbus.h	2006-08-19 18:08:16.000000000 +0200
-@@ -0,0 +1,299 @@
++++ linux-2.6-xen-fedora/include/xen/xenbus.h	2006-08-25 02:47:31.000000000 +0200
+@@ -0,0 +1,300 @@
 +/******************************************************************************
 + * xenbus.h
 + *
@@ -91297,7 +91106,7 @@
 +
 +/**
 + * Return the state of the driver rooted at the given store path, or
-+ * XenbusStateClosed if no state can be read.
++ * XenbusStateUnknown if no state can be read.
 + */
 +enum xenbus_state xenbus_read_driver_state(const char *path);
 +
@@ -91318,6 +91127,7 @@
 +void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
 +		      ...);
 +
++int __init xenbus_dev_init(void);
 +
 +#endif /* _XEN_XENBUS_H */
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/include/xen/xencons.h linux-2.6-xen-fedora/include/xen/xencons.h
@@ -91444,26 +91254,17 @@
  #
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
 --- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-08-13 01:28:24.000000000 +0200
-@@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
- 	 * and that the resulting page looks ok.
- 	 */
- 	if (unlikely(!pfn_valid(pfn))) {
--		print_bad_pte(vma, pte, addr);
-+		if (!(vma->vm_flags & VM_RESERVED))
-+			print_bad_pte(vma, pte, addr);
- 		return NULL;
- 	}
- 
-@@ -891,6 +892,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL(zap_page_range);
++++ linux-2.6-xen-fedora/mm/memory.c	2006-08-25 21:11:59.000000000 +0200
+@@ -390,7 +390,7 @@ struct page *vm_normal_page(struct vm_ar
  
- /*
-  * Do a quick page-table lookup for a single page.
-@@ -1030,6 +1032,26 @@ int get_user_pages(struct task_struct *t
+ 	if (unlikely(vma->vm_flags & VM_PFNMAP)) {
+ 		unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT;
+-		if (pfn == vma->vm_pgoff + off)
++		if ((pfn == vma->vm_pgoff + off) || !pfn_valid(pfn))
+ 			return NULL;
+ 		if (!is_cow_mapping(vma->vm_flags))
+ 			return NULL;
+@@ -1030,6 +1030,26 @@ int get_user_pages(struct task_struct *t
  			continue;
  		}
  
@@ -91490,7 +91291,7 @@
  		if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
  				|| !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1369,6 +1391,102 @@ int remap_pfn_range(struct vm_area_struc
+@@ -1369,6 +1389,102 @@ int remap_pfn_range(struct vm_area_struc
  }
  EXPORT_SYMBOL(remap_pfn_range);
  
@@ -91631,11 +91432,11 @@
  	if (PageAnon(page))
  		page->mapping = NULL;
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
---- linux-2.6/net/core/dev.c	2006-08-04 13:45:06.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-13 01:28:24.000000000 +0200
-@@ -117,6 +117,12 @@
- #include <linux/dmaengine.h>
+--- linux-2.6/net/core/dev.c	2006-08-23 22:51:07.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-08-25 02:47:31.000000000 +0200
+@@ -118,6 +118,12 @@
  #include <linux/err.h>
+ #include <linux/ctype.h>
  
 +#ifdef CONFIG_XEN
 +#include <net/ip.h>
@@ -91646,7 +91447,7 @@
  /*
   *	The list of packet types we will receive (as opposed to discard)
   *	and the routines to invoke.
-@@ -1382,6 +1388,43 @@ out_kfree_skb:
+@@ -1391,6 +1397,43 @@ out_kfree_skb:
  	}						\
  }
  
@@ -91690,7 +91491,7 @@
  /**
   *	dev_queue_xmit - transmit a buffer
   *	@skb: buffer to transmit
-@@ -1414,6 +1457,12 @@ int dev_queue_xmit(struct sk_buff *skb)
+@@ -1423,6 +1466,12 @@ int dev_queue_xmit(struct sk_buff *skb)
  	struct Qdisc *q;
  	int rc = -ENOMEM;
  
@@ -91703,7 +91504,7 @@
  	/* GSO will handle the following emulations directly. */
  	if (netif_needs_gso(dev, skb))
  		goto gso;
-@@ -1803,6 +1852,19 @@ int netif_receive_skb(struct sk_buff *sk
+@@ -1796,6 +1845,19 @@ int netif_receive_skb(struct sk_buff *sk
  	}
  #endif
  
@@ -91723,7 +91524,7 @@
  	list_for_each_entry_rcu(ptype, &ptype_all, list) {
  		if (!ptype->dev || ptype->dev == skb->dev) {
  			if (pt_prev) 
-@@ -3589,6 +3651,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
+@@ -3582,6 +3644,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif
  EXPORT_SYMBOL(net_enable_timestamp);
  EXPORT_SYMBOL(net_disable_timestamp);
  EXPORT_SYMBOL(dev_get_flags);
@@ -91732,8 +91533,8 @@
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
 diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
---- linux-2.6/net/core/skbuff.c	2006-08-04 13:45:06.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-13 01:28:24.000000000 +0200
+--- linux-2.6/net/core/skbuff.c	2006-08-23 22:51:07.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-08-25 02:47:31.000000000 +0200
 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -91809,7 +91610,7 @@
  	skb = NULL;
  	goto out;
  }
-@@ -462,6 +480,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -464,6 +482,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(local_df);
  	n->cloned = 1;
  	n->nohdr = 0;
@@ -91878,8 +91679,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-04 13:45:06.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-08-13 01:28:24.000000000 +0200
+--- 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
 @@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- sources	20 Aug 2006 07:29:57 -0000	1.476
+++ sources	25 Aug 2006 21:25:48 -0000	1.477
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 780289cba0d4529ff80956e145ce567a  patch-2.6.18-rc4.bz2
-64a8783435b7628c39829984ba2e551f  xen-11057.tar.bz2
 4091e21a532aab769d5e92601697797e  patch-2.6.18-rc4-git1.bz2
+18b970072562000b8838eab9eefaa2e9  xen-11251.tar.bz2




More information about the fedora-cvs-commits mailing list