ChangeSet 1.1502, 2005/05/21 11:29:40+01:00, iap10@xxxxxxxxxxxxxxxxxxxxx
Clean up droppings that occured when pulling the upgrade to 2.4.30 from
2.0-testing into unstable.
Signed-off-by: ian@xxxxxxxxxxxxx
arch/xen/drivers/usbif/Makefile | 10
arch/xen/drivers/usbif/backend/Makefile | 3
arch/xen/drivers/usbif/frontend/Makefile | 3
arch/xen/kernel/ioport.c | 43
arch/xen/kernel/pci-dma.c | 137 --
drivers/usb/hcd.c | 1511 -------------------------------
6 files changed, 1707 deletions(-)
diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/Makefile
b/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/Makefile
--- a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/Makefile 2005-05-22
13:03:48 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-
-O_TARGET := drv.o
-
-subdir-$(CONFIG_XEN_USB_FRONTEND) += frontend
-obj-$(CONFIG_XEN_USB_FRONTEND) += frontend/drv.o
-
-subdir-$(CONFIG_XEN_USB_BACKEND) += backend
-obj-$(CONFIG_XEN_USB_BACKEND) += backend/drv.o
-
-include $(TOPDIR)/Rules.make
diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/Makefile
b/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/Makefile
--- a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/backend/Makefile
2005-05-22 13:03:48 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,3 +0,0 @@
-O_TARGET := drv.o
-obj-y := main.o interface.o control.o # vrh.o don't think I need this!
-include $(TOPDIR)/Rules.make
diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/Makefile
b/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/Makefile
--- a/linux-2.4.29-xen-sparse/arch/xen/drivers/usbif/frontend/Makefile
2005-05-22 13:03:48 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,3 +0,0 @@
-O_TARGET := drv.o
-obj-y := main.o
-include $(TOPDIR)/Rules.make
diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/kernel/ioport.c
b/linux-2.4.29-xen-sparse/arch/xen/kernel/ioport.c
--- a/linux-2.4.29-xen-sparse/arch/xen/kernel/ioport.c 2005-05-22 13:03:48
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,43 +0,0 @@
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/stddef.h>
-#include <linux/slab.h>
-#include <asm-xen/xen-public/physdev.h>
-
-asmlinkage long sys_iopl(unsigned int new_io_pl)
-{
- unsigned int old_io_pl = current->thread.io_pl;
- physdev_op_t op;
-
- if (new_io_pl > 3)
- return -EINVAL;
-
- /* Need "raw I/O" privileges for direct port access. */
- if ((new_io_pl > old_io_pl) && !capable(CAP_SYS_RAWIO))
- return -EPERM;
-
- /* Maintain OS privileges even if user attempts to relinquish them. */
- if (new_io_pl == 0)
- new_io_pl = 1;
-
- /* Change our version of the privilege levels. */
- current->thread.io_pl = new_io_pl;
-
- /* Force the change at ring 0. */
- op.cmd = PHYSDEVOP_SET_IOPL;
- op.u.set_iopl.iopl = new_io_pl;
- HYPERVISOR_physdev_op(&op);
-
- return 0;
-}
-
-asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
-{
- return turn_on ? sys_iopl(3) : 0;
-}
diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/kernel/pci-dma.c
b/linux-2.4.29-xen-sparse/arch/xen/kernel/pci-dma.c
--- a/linux-2.4.29-xen-sparse/arch/xen/kernel/pci-dma.c 2005-05-22 13:03:48
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,137 +0,0 @@
-/*
- * Dynamic DMA mapping support.
- *
- * On i386 there is no hardware dynamic DMA address translation,
- * so consistent alloc/free are merely page allocation/freeing.
- * The rest of the dynamic DMA mapping interface is implemented
- * in asm/pci.h.
- */
-
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/version.h>
-#include <asm/io.h>
-#include <asm-xen/balloon.h>
-
-#define pte_offset_kernel pte_offset
-
-struct dma_coherent_mem {
- void *virt_base;
- u32 device_base;
- int size;
- int flags;
- unsigned long *bitmap;
-};
-
-static void
-xen_contig_memory(unsigned long vstart, unsigned int order)
-{
- /*
- * Ensure multi-page extents are contiguous in machine memory.
- * This code could be cleaned up some, and the number of
- * hypercalls reduced.
- */
- pgd_t *pgd;
- pmd_t *pmd;
- pte_t *pte;
- unsigned long pfn, i, flags;
-
- scrub_pages(vstart, 1 << order);
-
- balloon_lock(flags);
-
- /* 1. Zap current PTEs, giving away the underlying pages. */
- for (i = 0; i < (1<<order); i++) {
- pgd = pgd_offset_k( (vstart + (i*PAGE_SIZE)));
- pmd = pmd_offset(pgd, (vstart + (i*PAGE_SIZE)));
- pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
- pfn = pte->pte_low >> PAGE_SHIFT;
- HYPERVISOR_update_va_mapping(
- vstart + (i*PAGE_SIZE), __pte_ma(0), 0);
- phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
- INVALID_P2M_ENTRY;
- if (HYPERVISOR_dom_mem_op(MEMOP_decrease_reservation,
- &pfn, 1, 0) != 1) BUG();
- }
- /* 2. Get a new contiguous memory extent. */
- if (HYPERVISOR_dom_mem_op(MEMOP_increase_reservation,
- &pfn, 1, order) != 1) BUG();
- /* 3. Map the new extent in place of old pages. */
- for (i = 0; i < (1<<order); i++) {
- pgd = pgd_offset_k( (vstart + (i*PAGE_SIZE)));
- pmd = pmd_offset(pgd, (vstart + (i*PAGE_SIZE)));
- pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
- HYPERVISOR_update_va_mapping(
- vstart + (i*PAGE_SIZE),
- __pte_ma(((pfn+i)<<PAGE_SHIFT)|__PAGE_KERNEL), 0);
- xen_machphys_update(
- pfn+i, (__pa(vstart)>>PAGE_SHIFT)+i);
- phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
- pfn+i;
- }
- /* Flush updates through and flush the TLB. */
- flush_tlb_all();
-
- balloon_unlock(flags);
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
- dma_addr_t *dma_handle)
-#else
-void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, int gfp)
-#endif
-{
- void *ret;
- unsigned int order = get_order(size);
- unsigned long vstart;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- int gfp = GFP_ATOMIC;
-
- if (hwdev == NULL || ((u32)hwdev->dma_mask < 0xffffffff))
- gfp |= GFP_DMA;
-#else
- struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
-
- /* ignore region specifiers */
- gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
-
- if (mem) {
- int page = bitmap_find_free_region(mem->bitmap, mem->size,
- order);
- if (page >= 0) {
- *dma_handle = mem->device_base + (page << PAGE_SHIFT);
- ret = mem->virt_base + (page << PAGE_SHIFT);
- memset(ret, 0, size);
- return ret;
- }
- if (mem->flags & DMA_MEMORY_EXCLUSIVE)
- return NULL;
- }
-
- if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
- gfp |= GFP_DMA;
-#endif
-
- vstart = __get_free_pages(gfp, order);
- ret = (void *)vstart;
- if (ret == NULL)
- return ret;
-
- xen_contig_memory(vstart, order);
-
- memset(ret, 0, size);
- *dma_handle = virt_to_bus(ret);
-
- return ret;
-}
-
-void pci_free_consistent(struct pci_dev *hwdev, size_t size,
- void *vaddr, dma_addr_t dma_handle)
-{
- free_pages((unsigned long)vaddr, get_order(size));
-}
diff -Nru a/linux-2.4.29-xen-sparse/drivers/usb/hcd.c
b/linux-2.4.29-xen-sparse/drivers/usb/hcd.c
--- a/linux-2.4.29-xen-sparse/drivers/usb/hcd.c 2005-05-22 13:03:48 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,1511 +0,0 @@
-/*
- * Copyright (c) 2001-2002 by David Brownell
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/errno.h>
-#include <linux/kmod.h>
-#include <linux/init.h>
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home