rpms/kernel/devel kernel.spec, 1.1294.2.74, 1.1294.2.75 xen.pvops.patch, 1.1.2.47, 1.1.2.48

myoung myoung at fedoraproject.org
Tue Nov 10 00:34:31 UTC 2009


Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10256

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec xen.pvops.patch 
Log Message:
include pvops patch for compile failure



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.74
retrieving revision 1.1294.2.75
diff -u -p -r1.1294.2.74 -r1.1294.2.75
--- kernel.spec	8 Nov 2009 22:36:40 -0000	1.1294.2.74
+++ kernel.spec	10 Nov 2009 00:34:11 -0000	1.1294.2.75
@@ -2172,7 +2172,7 @@ fi
 # and build.
 
 %changelog
-* Sun Nov 08 2009 Michael Young <m.a.young at durham.ac.uk>
+* Mon Nov 09 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops which adds XEN_NETCHANNEL2 and XEN_PCIDEV_FRONTEND
 
 * Sun Nov 08 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31.5-127

xen.pvops.patch:
 arch/x86/Kconfig                                     |   14 
 arch/x86/Makefile                                    |    2 
 arch/x86/include/asm/agp.h                           |   17 
 arch/x86/include/asm/e820.h                          |    2 
 arch/x86/include/asm/fixmap.h                        |   25 
 arch/x86/include/asm/hpet.h                          |    2 
 arch/x86/include/asm/i387.h                          |    1 
 arch/x86/include/asm/io.h                            |   15 
 arch/x86/include/asm/io_apic.h                       |    7 
 arch/x86/include/asm/microcode.h                     |    9 
 arch/x86/include/asm/paravirt.h                      |  720 --------
 arch/x86/include/asm/paravirt_types.h                |  724 ++++++++
 arch/x86/include/asm/pci.h                           |    8 
 arch/x86/include/asm/pci_x86.h                       |    2 
 arch/x86/include/asm/pgtable.h                       |    3 
 arch/x86/include/asm/processor.h                     |    4 
 arch/x86/include/asm/pvclock.h                       |    6 
 arch/x86/include/asm/syscalls.h                      |    8 
 arch/x86/include/asm/tlbflush.h                      |    6 
 arch/x86/include/asm/vgtod.h                         |   64 
 arch/x86/include/asm/vsyscall.h                      |   32 
 arch/x86/include/asm/xen/hypercall.h                 |   44 
 arch/x86/include/asm/xen/interface.h                 |    8 
 arch/x86/include/asm/xen/interface_32.h              |    5 
 arch/x86/include/asm/xen/interface_64.h              |   13 
 arch/x86/include/asm/xen/iommu.h                     |   12 
 arch/x86/include/asm/xen/page.h                      |   16 
 arch/x86/include/asm/xen/pci.h                       |   56 
 arch/x86/include/asm/xen/swiotlb.h                   |   10 
 arch/x86/kernel/Makefile                             |    6 
 arch/x86/kernel/acpi/boot.c                          |   18 
 arch/x86/kernel/acpi/processor.c                     |    4 
 arch/x86/kernel/acpi/sleep.c                         |    2 
 arch/x86/kernel/apic/io_apic.c                       |   49 
 arch/x86/kernel/cpu/mtrr/Makefile                    |    1 
 arch/x86/kernel/cpu/mtrr/amd.c                       |    6 
 arch/x86/kernel/cpu/mtrr/centaur.c                   |    6 
 arch/x86/kernel/cpu/mtrr/cyrix.c                     |    6 
 arch/x86/kernel/cpu/mtrr/generic.c                   |   10 
 arch/x86/kernel/cpu/mtrr/main.c                      |   19 
 arch/x86/kernel/cpu/mtrr/mtrr.h                      |   11 
 arch/x86/kernel/cpu/mtrr/xen.c                       |  104 +
 arch/x86/kernel/e820.c                               |   30 
 arch/x86/kernel/hpet.c                               |    8 
 arch/x86/kernel/ioport.c                             |   40 
 arch/x86/kernel/kvmclock.c                           |    7 
 arch/x86/kernel/microcode_core.c                     |    5 
 arch/x86/kernel/microcode_xen.c                      |  200 ++
 arch/x86/kernel/paravirt.c                           |    1 
 arch/x86/kernel/pci-dma.c                            |    6 
 arch/x86/kernel/pci-swiotlb.c                        |   25 
 arch/x86/kernel/process.c                            |   27 
 arch/x86/kernel/process_32.c                         |   27 
 arch/x86/kernel/process_64.c                         |   33 
 arch/x86/kernel/pvclock.c                            |  187 +-
 arch/x86/kernel/setup.c                              |    4 
 arch/x86/kernel/traps.c                              |   33 
 arch/x86/kernel/tsc.c                                |    4 
 arch/x86/kernel/vsyscall_64.c                        |   91 -
 arch/x86/mm/Makefile                                 |    7 
 arch/x86/mm/init_32.c                                |   42 
 arch/x86/mm/ioremap.c                                |   72 
 arch/x86/mm/pat.c                                    |    2 
 arch/x86/mm/pgtable.c                                |   10 
 arch/x86/mm/physaddr.c                               |   70 
 arch/x86/mm/physaddr.h                               |   10 
 arch/x86/mm/tlb.c                                    |   35 
 arch/x86/pci/Makefile                                |    1 
 arch/x86/pci/common.c                                |   18 
 arch/x86/pci/i386.c                                  |    3 
 arch/x86/pci/init.c                                  |    6 
 arch/x86/pci/xen.c                                   |   66 
 arch/x86/vdso/vclock_gettime.c                       |   46 
 arch/x86/vdso/vgetcpu.c                              |   17 
 arch/x86/xen/Kconfig                                 |   38 
 arch/x86/xen/Makefile                                |    5 
 arch/x86/xen/apic.c                                  |   57 
 arch/x86/xen/enlighten.c                             |   92 -
 arch/x86/xen/grant-table.c                           |   38 
 arch/x86/xen/mmu.c                                   |  460 +++++
 arch/x86/xen/pci-swiotlb.c                           |  997 +++++++++++
 arch/x86/xen/pci.c                                   |  111 +
 arch/x86/xen/setup.c                                 |  115 +
 arch/x86/xen/smp.c                                   |    4 
 arch/x86/xen/time.c                                  |   63 
 arch/x86/xen/vga.c                                   |   67 
 arch/x86/xen/xen-ops.h                               |   27 
 block/blk-core.c                                     |    2 
 drivers/acpi/acpica/hwsleep.c                        |   17 
 drivers/acpi/processor_core.c                        |   29 
 drivers/acpi/processor_idle.c                        |   23 
 drivers/acpi/processor_perflib.c                     |   10 
 drivers/acpi/sleep.c                                 |   19 
 drivers/block/Kconfig                                |    1 
 drivers/block/xen-blkfront.c                         |    2 
 drivers/char/agp/intel-agp.c                         |   17 
 drivers/char/hvc_xen.c                               |  122 +
 drivers/gpu/drm/drm_drv.c                            |    2 
 drivers/gpu/drm/drm_gem.c                            |    2 
 drivers/gpu/drm/drm_scatter.c                        |   67 
 drivers/gpu/drm/ttm/ttm_bo_vm.c                      |    2 
 drivers/input/xen-kbdfront.c                         |    2 
 drivers/net/Kconfig                                  |   51 
 drivers/net/Makefile                                 |    1 
 drivers/net/xen-netchannel2/Makefile                 |   25 
 drivers/net/xen-netchannel2/autobypass.c             |  316 +++
 drivers/net/xen-netchannel2/bypass.c                 |  823 +++++++++
 drivers/net/xen-netchannel2/bypassee.c               |  803 +++++++++
 drivers/net/xen-netchannel2/chan.c                   |  843 +++++++++
 drivers/net/xen-netchannel2/netback2.c               |  482 +++++
 drivers/net/xen-netchannel2/netchan2.c               |   32 
 drivers/net/xen-netchannel2/netchannel2_core.h       |  796 +++++++++
 drivers/net/xen-netchannel2/netchannel2_endpoint.h   |   63 
 drivers/net/xen-netchannel2/netchannel2_uspace.h     |   17 
 drivers/net/xen-netchannel2/netfront2.c              |  514 +++++
 drivers/net/xen-netchannel2/offload.c                |  181 ++
 drivers/net/xen-netchannel2/poll.c                   |   59 
 drivers/net/xen-netchannel2/receiver_map.c           |  787 +++++++++
 drivers/net/xen-netchannel2/recv_packet.c            |  333 +++
 drivers/net/xen-netchannel2/rscb.c                   |  435 +++++
 drivers/net/xen-netchannel2/tools/destroy_bypass.c   |   25 
 drivers/net/xen-netchannel2/tools/establish_bypass.c |   31 
 drivers/net/xen-netchannel2/util.c                   |  241 ++
 drivers/net/xen-netchannel2/xmit_packet.c            |  374 ++++
 drivers/net/xen-netfront.c                           |    2 
 drivers/pci/Kconfig                                  |   10 
 drivers/pci/Makefile                                 |    4 
 drivers/pci/msi.c                                    |    5 
 drivers/pci/xen-iommu.c                              |  274 +++
 drivers/pci/xen-pcifront.c                           | 1131 +++++++++++++
 drivers/video/xen-fbfront.c                          |    2 
 drivers/xen/Kconfig                                  |  114 +
 drivers/xen/Makefile                                 |   24 
 drivers/xen/acpi.c                                   |   23 
 drivers/xen/acpi_processor.c                         |  451 +++++
 drivers/xen/balloon.c                                |  314 ++-
 drivers/xen/biomerge.c                               |   14 
 drivers/xen/blkback/Makefile                         |    3 
 drivers/xen/blkback/blkback.c                        |  665 +++++++
 drivers/xen/blkback/common.h                         |  137 +
 drivers/xen/blkback/interface.c                      |  186 ++
 drivers/xen/blkback/vbd.c                            |  118 +
 drivers/xen/blkback/xenbus.c                         |  541 ++++++
 drivers/xen/events.c                                 |  531 +++++-
 drivers/xen/evtchn.c                                 |   82 
 drivers/xen/features.c                               |    2 
 drivers/xen/gntdev.c                                 |  625 +++++++
 drivers/xen/grant-table.c                            |  489 +++++
 drivers/xen/live_maps.c                              |   61 
 drivers/xen/mce.c                                    |  213 ++
 drivers/xen/netback/Makefile                         |    3 
 drivers/xen/netback/common.h                         |  223 ++
 drivers/xen/netback/interface.c                      |  401 ++++
 drivers/xen/netback/netback.c                        | 1650 +++++++++++++++++++
 drivers/xen/netback/xenbus.c                         |  470 +++++
 drivers/xen/pci.c                                    |  124 +
 drivers/xen/pciback/Makefile                         |   17 
 drivers/xen/pciback/conf_space.c                     |  435 +++++
 drivers/xen/pciback/conf_space.h                     |  126 +
 drivers/xen/pciback/conf_space_capability.c          |   66 
 drivers/xen/pciback/conf_space_capability.h          |   26 
 drivers/xen/pciback/conf_space_capability_msi.c      |   84 
 drivers/xen/pciback/conf_space_capability_pm.c       |  113 +
 drivers/xen/pciback/conf_space_capability_vpd.c      |   40 
 drivers/xen/pciback/conf_space_header.c              |  318 +++
 drivers/xen/pciback/conf_space_quirks.c              |  140 +
 drivers/xen/pciback/conf_space_quirks.h              |   35 
 drivers/xen/pciback/controller.c                     |  442 +++++
 drivers/xen/pciback/passthrough.c                    |  178 ++
 drivers/xen/pciback/pci_stub.c                       | 1307 +++++++++++++++
 drivers/xen/pciback/pciback.h                        |  133 +
 drivers/xen/pciback/pciback_ops.c                    |  130 +
 drivers/xen/pciback/slot.c                           |  191 ++
 drivers/xen/pciback/vpci.c                           |  244 ++
 drivers/xen/pciback/xenbus.c                         |  709 ++++++++
 drivers/xen/xenbus/Makefile                          |    5 
 drivers/xen/xenbus/xenbus_client.c                   |   15 
 drivers/xen/xenbus/xenbus_comms.c                    |    1 
 drivers/xen/xenbus/xenbus_probe.c                    |  384 +---
 drivers/xen/xenbus/xenbus_probe.h                    |   29 
 drivers/xen/xenbus/xenbus_probe_backend.c            |  298 +++
 drivers/xen/xenbus/xenbus_probe_frontend.c           |  292 +++
 drivers/xen/xenbus/xenbus_xs.c                       |  187 ++
 drivers/xen/xenfs/Makefile                           |    3 
 drivers/xen/xenfs/privcmd.c                          |  403 ++++
 drivers/xen/xenfs/super.c                            |   98 +
 drivers/xen/xenfs/xenfs.h                            |    3 
 drivers/xen/xenfs/xenstored.c                        |   67 
 include/acpi/processor.h                             |    2 
 include/asm-generic/pci.h                            |    2 
 include/drm/drmP.h                                   |    2 
 include/linux/interrupt.h                            |    1 
 include/linux/page-flags.h                           |   18 
 include/linux/sched.h                                |   15 
 include/linux/swiotlb.h                              |    1 
 include/xen/Kbuild                                   |    1 
 include/xen/acpi.h                                   |   84 
 include/xen/balloon.h                                |    8 
 include/xen/blkif.h                                  |  122 +
 include/xen/events.h                                 |   32 
 include/xen/gntdev.h                                 |  119 +
 include/xen/grant_table.h                            |   80 
 include/xen/interface/grant_table.h                  |  195 ++
 include/xen/interface/io/netchannel2.h               |  342 +++
 include/xen/interface/io/pciif.h                     |  124 +
 include/xen/interface/io/ring.h                      |    3 
 include/xen/interface/io/uring.h                     |  426 ++++
 include/xen/interface/io/xenbus.h                    |    8 
 include/xen/interface/memory.h                       |   92 +
 include/xen/interface/physdev.h                      |   51 
 include/xen/interface/platform.h                     |  336 +++
 include/xen/interface/vcpu.h                         |   41 
 include/xen/interface/xen-mca.h                      |  429 ++++
 include/xen/interface/xen.h                          |   44 
 include/xen/live_maps.h                              |  165 +
 include/xen/privcmd.h                                |   80 
 include/xen/swiotlb.h                                |  102 +
 include/xen/xen-ops.h                                |   11 
 include/xen/xenbus.h                                 |    4 
 kernel/irq/manage.c                                  |    3 
 kernel/sched.c                                       |   14 
 lib/swiotlb.c                                        |    5 
 mm/page_alloc.c                                      |   14 
 223 files changed, 29441 insertions(+), 1779 deletions(-)

Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.47
retrieving revision 1.1.2.48
diff -u -p -r1.1.2.47 -r1.1.2.48
--- xen.pvops.patch	8 Nov 2009 22:36:41 -0000	1.1.2.47
+++ xen.pvops.patch	10 Nov 2009 00:34:12 -0000	1.1.2.48
@@ -2285,10 +2285,10 @@ index 018a0a4..f334014 100644
  unsigned long arbitrary_virt_to_mfn(void *vaddr);
 diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
 new file mode 100644
-index 0000000..57ac283
+index 0000000..b72c858
 --- /dev/null
 +++ b/arch/x86/include/asm/xen/pci.h
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,56 @@
 +#ifndef _ASM_X86_XEN_PCI_H
 +#define _ASM_X86_XEN_PCI_H
 +
@@ -2332,7 +2332,10 @@ index 0000000..57ac283
 +			     struct msix_entry *entries, int nvec);
 +void pci_frontend_disable_msix(struct pci_dev *dev);
 +#else
-+static inline int pci_frontend_enable_msi(struct pci_dev *dev) { return -1; }
++static inline int pci_frontend_enable_msi(struct pci_dev *dev, int *pirq)
++{
++	return -1;
++}
 +static inline void pci_frontend_disable_msi(struct pci_dev *dev) { }
 +static inline int pci_frontend_enable_msix(struct pci_dev *dev,
 +					   struct msix_entry *entries, int nvec)




More information about the fedora-extras-commits mailing list