From 6d339b368c732aed16550969f7f674f26b7a7294 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 2 Apr 2008 13:40:20 -0700 Subject: [PATCH] --- yaml --- r: 88103 b: refs/heads/master c: cdc647a9b75741659bfc6acc44a6b3a646ad53bf h: refs/heads/master i: 88101: ab91a3e6f75ec8be068289e46d1d61846d0df99d 88099: b44bb54fb75852d01b3dc50043bc7519905418b2 88095: 1bda9a71c2350b107cd1a2af558a8cbbdf6034dd v: v3 --- [refs] | 2 +- trunk/Documentation/SubmittingPatches | 2 +- .../Documentation/unaligned-memory-access.txt | 4 +-- trunk/arch/alpha/kernel/pci_iommu.c | 8 ++--- trunk/arch/x86/kernel/machine_kexec_64.c | 1 - trunk/drivers/block/nbd.c | 6 ---- trunk/drivers/char/ip2/i2lib.c | 12 ++++---- trunk/drivers/char/rio/riotable.c | 4 +-- trunk/drivers/char/rio/riotty.c | 4 --- trunk/drivers/ide/arm/ide_arm.c | 2 -- trunk/drivers/ide/cris/ide-cris.c | 2 -- trunk/drivers/ide/h8300/ide-h8300.c | 3 -- trunk/drivers/ide/ide-iops.c | 2 +- trunk/drivers/ide/ide-pnp.c | 2 -- trunk/drivers/ide/legacy/buddha.c | 2 -- trunk/drivers/ide/legacy/falconide.c | 2 -- trunk/drivers/ide/legacy/gayle.c | 2 -- trunk/drivers/ide/legacy/macide.c | 2 -- trunk/drivers/ide/legacy/q40ide.c | 2 -- trunk/drivers/ide/pci/cmd640.c | 2 -- trunk/drivers/ide/ppc/mpc8xx.c | 2 -- trunk/drivers/ide/ppc/pmac.c | 2 -- trunk/drivers/net/sky2.c | 6 ---- trunk/drivers/serial/atmel_serial.c | 30 ++++++------------- trunk/drivers/usb/host/ehci-hub.c | 5 ++-- trunk/fs/efs/inode.c | 2 +- trunk/include/asm-alpha/current.h | 2 +- trunk/include/asm-alpha/dma-mapping.h | 2 +- trunk/include/asm-alpha/kvm.h | 6 ---- trunk/include/asm-alpha/pci.h | 8 +---- trunk/include/asm-arm/kvm.h | 6 ---- trunk/include/asm-avr32/kvm.h | 6 ---- trunk/include/asm-blackfin/kvm.h | 6 ---- trunk/include/asm-cris/kvm.h | 6 ---- trunk/include/asm-frv/kvm.h | 6 ---- trunk/include/asm-generic/Kbuild.asm | 2 -- trunk/include/asm-h8300/kvm.h | 6 ---- trunk/include/asm-ia64/kvm.h | 6 ---- trunk/include/asm-m32r/kvm.h | 6 ---- trunk/include/asm-m68k/kvm.h | 6 ---- trunk/include/asm-m68knommu/kvm.h | 6 ---- trunk/include/asm-mips/kvm.h | 6 ---- trunk/include/asm-mn10300/kvm.h | 6 ---- trunk/include/asm-parisc/kvm.h | 6 ---- trunk/include/asm-powerpc/kvm.h | 6 ---- trunk/include/asm-s390/kvm.h | 6 ---- trunk/include/asm-sh/kvm.h | 6 ---- trunk/include/asm-sparc/kvm.h | 6 ---- trunk/include/asm-sparc64/kvm.h | 6 ---- trunk/include/asm-um/kvm.h | 6 ---- trunk/include/asm-v850/kvm.h | 6 ---- trunk/include/asm-xtensa/kvm.h | 6 ---- trunk/include/linux/Kbuild | 2 +- trunk/kernel/marker.c | 9 ------ 54 files changed, 31 insertions(+), 239 deletions(-) delete mode 100644 trunk/include/asm-alpha/kvm.h delete mode 100644 trunk/include/asm-arm/kvm.h delete mode 100644 trunk/include/asm-avr32/kvm.h delete mode 100644 trunk/include/asm-blackfin/kvm.h delete mode 100644 trunk/include/asm-cris/kvm.h delete mode 100644 trunk/include/asm-frv/kvm.h delete mode 100644 trunk/include/asm-h8300/kvm.h delete mode 100644 trunk/include/asm-ia64/kvm.h delete mode 100644 trunk/include/asm-m32r/kvm.h delete mode 100644 trunk/include/asm-m68k/kvm.h delete mode 100644 trunk/include/asm-m68knommu/kvm.h delete mode 100644 trunk/include/asm-mips/kvm.h delete mode 100644 trunk/include/asm-mn10300/kvm.h delete mode 100644 trunk/include/asm-parisc/kvm.h delete mode 100644 trunk/include/asm-powerpc/kvm.h delete mode 100644 trunk/include/asm-s390/kvm.h delete mode 100644 trunk/include/asm-sh/kvm.h delete mode 100644 trunk/include/asm-sparc/kvm.h delete mode 100644 trunk/include/asm-sparc64/kvm.h delete mode 100644 trunk/include/asm-um/kvm.h delete mode 100644 trunk/include/asm-v850/kvm.h delete mode 100644 trunk/include/asm-xtensa/kvm.h diff --git a/[refs] b/[refs] index 2deee9540b19..690b9084961e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06f11f37aa84e83b48cdf36037c4414f5a83c13f +refs/heads/master: cdc647a9b75741659bfc6acc44a6b3a646ad53bf diff --git a/trunk/Documentation/SubmittingPatches b/trunk/Documentation/SubmittingPatches index 47a539c7642d..08a1ed1cb5d8 100644 --- a/trunk/Documentation/SubmittingPatches +++ b/trunk/Documentation/SubmittingPatches @@ -512,7 +512,7 @@ They provide type safety, have no length limitations, no formatting limitations, and under gcc they are as cheap as macros. Macros should only be used for cases where a static inline is clearly -suboptimal [there are a few, isolated cases of this in fast paths], +suboptimal [there a few, isolated cases of this in fast paths], or where it is impossible to use a static inline function [such as string-izing]. diff --git a/trunk/Documentation/unaligned-memory-access.txt b/trunk/Documentation/unaligned-memory-access.txt index b0472ac5226a..6223eace3c09 100644 --- a/trunk/Documentation/unaligned-memory-access.txt +++ b/trunk/Documentation/unaligned-memory-access.txt @@ -57,7 +57,7 @@ here; a summary of the common scenarios is presented below: unaligned access to be corrected. - Some architectures are not capable of unaligned memory access, but will silently perform a different memory access to the one that was requested, - resulting in a subtle code bug that is hard to detect! + resulting a a subtle code bug that is hard to detect! It should be obvious from the above that if your code causes unaligned memory accesses to happen, your code will not work correctly on certain @@ -209,7 +209,7 @@ memory and you wish to avoid unaligned access, its usage is as follows: u32 value = get_unaligned((u32 *) data); -These macros work for memory accesses of any length (not just 32 bits as +These macros work work for memory accesses of any length (not just 32 bits as in the examples above). Be aware that when compared to standard access of aligned memory, using these macros to access unaligned memory can be costly in terms of performance. diff --git a/trunk/arch/alpha/kernel/pci_iommu.c b/trunk/arch/alpha/kernel/pci_iommu.c index dd6e334ab9e1..4e1c08636edd 100644 --- a/trunk/arch/alpha/kernel/pci_iommu.c +++ b/trunk/arch/alpha/kernel/pci_iommu.c @@ -424,13 +424,11 @@ EXPORT_SYMBOL(pci_unmap_page); else DMA_ADDRP is undefined. */ void * -__pci_alloc_consistent(struct pci_dev *pdev, size_t size, - dma_addr_t *dma_addrp, gfp_t gfp) +pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp) { void *cpu_addr; long order = get_order(size); - - gfp &= ~GFP_DMA; + gfp_t gfp = GFP_ATOMIC; try_again: cpu_addr = (void *)__get_free_pages(gfp, order); @@ -460,7 +458,7 @@ __pci_alloc_consistent(struct pci_dev *pdev, size_t size, return cpu_addr; } -EXPORT_SYMBOL(__pci_alloc_consistent); +EXPORT_SYMBOL(pci_alloc_consistent); /* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must be values that were returned from pci_alloc_consistent. SIZE must diff --git a/trunk/arch/x86/kernel/machine_kexec_64.c b/trunk/arch/x86/kernel/machine_kexec_64.c index 576a03db4511..236d2f8f7ddc 100644 --- a/trunk/arch/x86/kernel/machine_kexec_64.c +++ b/trunk/arch/x86/kernel/machine_kexec_64.c @@ -233,7 +233,6 @@ NORET_TYPE void machine_kexec(struct kimage *image) void arch_crash_save_vmcoreinfo(void) { - VMCOREINFO_SYMBOL(phys_base); VMCOREINFO_SYMBOL(init_level4_pgt); #ifdef CONFIG_NUMA diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c index 60cc54368b66..b53fdb0a282c 100644 --- a/trunk/drivers/block/nbd.c +++ b/trunk/drivers/block/nbd.c @@ -153,12 +153,6 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size, struct kvec iov; sigset_t blocked, oldset; - if (unlikely(!sock)) { - printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n", - lo->disk->disk_name, (send ? "send" : "recv")); - return -EINVAL; - } - /* Allow interception of SIGKILL only * Don't allow other signals to interrupt the transmission */ siginitsetinv(&blocked, sigmask(SIGKILL)); diff --git a/trunk/drivers/char/ip2/i2lib.c b/trunk/drivers/char/ip2/i2lib.c index 9c25320121ef..d6567b32fb5c 100644 --- a/trunk/drivers/char/ip2/i2lib.c +++ b/trunk/drivers/char/ip2/i2lib.c @@ -644,12 +644,12 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands, // Normal Expected path - We still hold LOCK break; /* from for()- Enough room: goto proceed */ } - ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize); - WRITE_UNLOCK_IRQRESTORE(lock_var_p, flags); - } else - ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize); + } + + ip2trace (CHANN, ITRC_QUEUE, 3, 1, totalsize ); - /* Prepare to wait for buffers to empty */ + // Prepare to wait for buffers to empty + WRITE_UNLOCK_IRQRESTORE(lock_var_p,flags); serviceOutgoingFifo(pB); // Dump what we got if (timeout == 0) { @@ -1830,8 +1830,6 @@ i2StripFifo(i2eBordStrPtr pB) default: // Neither packet? should be impossible ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1, PTYPE_OF(pB->i2eLeadoffWord) ); - WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock, - bflags); break; } // End of switch on type of packets diff --git a/trunk/drivers/char/rio/riotable.c b/trunk/drivers/char/rio/riotable.c index 9b52892a501f..991119c9f473 100644 --- a/trunk/drivers/char/rio/riotable.c +++ b/trunk/drivers/char/rio/riotable.c @@ -425,10 +425,8 @@ int RIOApel(struct rio_info *p) MapP = &p->RIOConnectTable[Next++]; MapP->HostUniqueNum = HostP->UniqueNum; - if ((HostP->Flags & RUN_STATE) != RC_RUNNING) { - rio_spin_unlock_irqrestore(&HostP->HostLock, flags); + if ((HostP->Flags & RUN_STATE) != RC_RUNNING) continue; - } MapP->RtaUniqueNum = 0; MapP->ID = 0; MapP->Flags = SLOT_IN_USE; diff --git a/trunk/drivers/char/rio/riotty.c b/trunk/drivers/char/rio/riotty.c index cfa54361473f..a4f0b1e3e7fa 100644 --- a/trunk/drivers/char/rio/riotty.c +++ b/trunk/drivers/char/rio/riotty.c @@ -319,7 +319,6 @@ int riotopen(struct tty_struct *tty, struct file *filp) PortP->State |= RIO_WOPEN; rio_spin_unlock_irqrestore(&PortP->portSem, flags); if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) { - rio_spin_lock_irqsave(&PortP->portSem, flags); /* ** ACTION: verify that this is a good thing ** to do here. -- ??? @@ -335,7 +334,6 @@ int riotopen(struct tty_struct *tty, struct file *filp) func_exit(); return -EINTR; } - rio_spin_lock_irqsave(&PortP->portSem, flags); } PortP->State &= ~RIO_WOPEN; } @@ -495,7 +493,6 @@ int riotclose(void *ptr) if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) { RIOPreemptiveCmd(p, PortP, FCLOSE); - rio_spin_lock_irqsave(&PortP->portSem, flags); goto close_end; } @@ -511,7 +508,6 @@ int riotclose(void *ptr) if (p->RIOHalted) { RIOClearUp(PortP); - rio_spin_lock_irqsave(&PortP->portSem, flags); goto close_end; } if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) { diff --git a/trunk/drivers/ide/arm/ide_arm.c b/trunk/drivers/ide/arm/ide_arm.c index be9ff7334c52..43a70e91363e 100644 --- a/trunk/drivers/ide/arm/ide_arm.c +++ b/trunk/drivers/ide/arm/ide_arm.c @@ -46,5 +46,3 @@ static int __init ide_arm_init(void) } module_init(ide_arm_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/cris/ide-cris.c b/trunk/drivers/ide/cris/ide-cris.c index c8ffbaf29a88..e79bf8f9b7db 100644 --- a/trunk/drivers/ide/cris/ide-cris.c +++ b/trunk/drivers/ide/cris/ide-cris.c @@ -1067,5 +1067,3 @@ static void cris_dma_start(ide_drive_t *drive) } module_init(init_e100_ide); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/h8300/ide-h8300.c b/trunk/drivers/ide/h8300/ide-h8300.c index 4108ec4ffa7f..520aec075700 100644 --- a/trunk/drivers/ide/h8300/ide-h8300.c +++ b/trunk/drivers/ide/h8300/ide-h8300.c @@ -110,7 +110,6 @@ static int __init h8300_ide_init(void) ide_init_port_data(hwif, index); ide_init_port_hw(hwif, &hw); hwif_setup(hwif); - hwif->host_flags = IDE_HFLAG_NO_IO_32BIT; printk(KERN_INFO "ide%d: H8/300 generic IDE interface\n", index); idx[0] = index; @@ -126,5 +125,3 @@ static int __init h8300_ide_init(void) } module_init(h8300_ide_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/ide-iops.c b/trunk/drivers/ide/ide-iops.c index e77cee0e5d65..01b92208f09d 100644 --- a/trunk/drivers/ide/ide-iops.c +++ b/trunk/drivers/ide/ide-iops.c @@ -658,7 +658,7 @@ int ide_driveid_update(ide_drive_t *drive) local_irq_restore(flags); return 0; } - hwif->ata_input_data(drive, id, SECTOR_WORDS); + ata_input_data(drive, id, SECTOR_WORDS); (void)ide_read_status(drive); /* clear drive IRQ */ local_irq_enable(); local_irq_restore(flags); diff --git a/trunk/drivers/ide/ide-pnp.c b/trunk/drivers/ide/ide-pnp.c index c14bb5380c25..b163b2e52212 100644 --- a/trunk/drivers/ide/ide-pnp.c +++ b/trunk/drivers/ide/ide-pnp.c @@ -86,5 +86,3 @@ static void __exit pnpide_exit(void) module_init(pnpide_init); module_exit(pnpide_exit); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/legacy/buddha.c b/trunk/drivers/ide/legacy/buddha.c index fdd3791e465f..50ffa871d5e9 100644 --- a/trunk/drivers/ide/legacy/buddha.c +++ b/trunk/drivers/ide/legacy/buddha.c @@ -241,5 +241,3 @@ static int __init buddha_init(void) } module_init(buddha_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/legacy/falconide.c b/trunk/drivers/ide/legacy/falconide.c index e950afa5939c..8949ce71bddc 100644 --- a/trunk/drivers/ide/legacy/falconide.c +++ b/trunk/drivers/ide/legacy/falconide.c @@ -93,5 +93,3 @@ static int __init falconide_init(void) } module_init(falconide_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/legacy/gayle.c b/trunk/drivers/ide/legacy/gayle.c index e3b4638cc883..b7d81090d5da 100644 --- a/trunk/drivers/ide/legacy/gayle.c +++ b/trunk/drivers/ide/legacy/gayle.c @@ -195,5 +195,3 @@ static int __init gayle_init(void) } module_init(gayle_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/legacy/macide.c b/trunk/drivers/ide/legacy/macide.c index eaf5dbe58bc2..9a79098d9eb4 100644 --- a/trunk/drivers/ide/legacy/macide.c +++ b/trunk/drivers/ide/legacy/macide.c @@ -137,5 +137,3 @@ static int __init macide_init(void) } module_init(macide_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/legacy/q40ide.c b/trunk/drivers/ide/legacy/q40ide.c index 2da28759686e..1381b91bc316 100644 --- a/trunk/drivers/ide/legacy/q40ide.c +++ b/trunk/drivers/ide/legacy/q40ide.c @@ -153,5 +153,3 @@ static int __init q40ide_init(void) } module_init(q40ide_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/pci/cmd640.c b/trunk/drivers/ide/pci/cmd640.c index 29fbc5ead03b..ec667982809c 100644 --- a/trunk/drivers/ide/pci/cmd640.c +++ b/trunk/drivers/ide/pci/cmd640.c @@ -881,5 +881,3 @@ module_param_named(probe_vlb, cmd640_vlb, bool, 0); MODULE_PARM_DESC(probe_vlb, "probe for VLB version of CMD640 chipset"); module_init(cmd640x_init); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/ppc/mpc8xx.c b/trunk/drivers/ide/ppc/mpc8xx.c index ebaba01c7551..38fbfb8d5445 100644 --- a/trunk/drivers/ide/ppc/mpc8xx.c +++ b/trunk/drivers/ide/ppc/mpc8xx.c @@ -853,5 +853,3 @@ static int __init mpc8xx_ide_probe(void) } module_init(mpc8xx_ide_probe); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/ide/ppc/pmac.c b/trunk/drivers/ide/ppc/pmac.c index d9ca52e6cdab..78c9eeb85634 100644 --- a/trunk/drivers/ide/ppc/pmac.c +++ b/trunk/drivers/ide/ppc/pmac.c @@ -1771,5 +1771,3 @@ static int __devinit pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ module_init(pmac_ide_probe); - -MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 853bce0ac478..54c662690f65 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -4329,14 +4329,10 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) if (!hw) return 0; - del_timer_sync(&hw->watchdog_timer); - cancel_work_sync(&hw->restart_work); - for (i = 0; i < hw->ports; i++) { struct net_device *dev = hw->dev[i]; struct sky2_port *sky2 = netdev_priv(dev); - netif_device_detach(dev); if (netif_running(dev)) sky2_down(dev); @@ -4387,8 +4383,6 @@ static int sky2_resume(struct pci_dev *pdev) for (i = 0; i < hw->ports; i++) { struct net_device *dev = hw->dev[i]; - - netif_device_attach(dev); if (netif_running(dev)) { err = sky2_up(dev); if (err) { diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c index 430997e33fc4..d57bf3e708d8 100644 --- a/trunk/drivers/serial/atmel_serial.c +++ b/trunk/drivers/serial/atmel_serial.c @@ -96,7 +96,6 @@ /* PDC registers */ #define UART_PUT_PTCR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_PTCR) -#define UART_GET_TCR(port) __raw_readl((port)->membase + ATMEL_PDC_TCR) #define UART_GET_PTSR(port) __raw_readl((port)->membase + ATMEL_PDC_PTSR) #define UART_PUT_RPR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_RPR) @@ -107,7 +106,6 @@ #define UART_PUT_TPR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_TPR) #define UART_PUT_TCR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_TCR) -#define UART_GET_TCR(port) __raw_readl((port)->membase + ATMEL_PDC_TCR) static int (*atmel_open_hook)(struct uart_port *); static void (*atmel_close_hook)(struct uart_port *); @@ -564,22 +562,17 @@ static void atmel_tx_dma(struct uart_port *port) struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx; int count; - /* nothing left to transmit? */ - if (UART_GET_TCR(port)) - return; - xmit->tail += pdc->ofs; xmit->tail &= UART_XMIT_SIZE - 1; port->icount.tx += pdc->ofs; pdc->ofs = 0; - /* more to transmit - setup next transfer */ - - /* disable PDC transmit */ - UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); - if (!uart_circ_empty(xmit)) { + /* more to transmit - setup next transfer */ + + /* disable PDC transmit */ + UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); dma_sync_single_for_device(port->dev, pdc->dma_addr, pdc->dma_size, @@ -593,6 +586,11 @@ static void atmel_tx_dma(struct uart_port *port) /* re-enable PDC transmit and interrupts */ UART_PUT_PTCR(port, ATMEL_PDC_TXTEN); UART_PUT_IER(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE); + } else { + /* nothing left to transmit - disable the transmitter */ + + /* disable PDC transmit */ + UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); } if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) @@ -1276,7 +1274,6 @@ static void atmel_console_write(struct console *co, const char *s, u_int count) { struct uart_port *port = &atmel_ports[co->index].uart; unsigned int status, imr; - unsigned int pdc_tx; /* * First, save IMR and then disable interrupts @@ -1284,10 +1281,6 @@ static void atmel_console_write(struct console *co, const char *s, u_int count) imr = UART_GET_IMR(port); UART_PUT_IDR(port, ATMEL_US_RXRDY | ATMEL_US_TXRDY); - /* Store PDC transmit status and disable it */ - pdc_tx = UART_GET_PTSR(port) & ATMEL_PDC_TXTEN; - UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); - uart_console_write(port, s, count, atmel_console_putchar); /* @@ -1297,11 +1290,6 @@ static void atmel_console_write(struct console *co, const char *s, u_int count) do { status = UART_GET_CSR(port); } while (!(status & ATMEL_US_TXRDY)); - - /* Restore PDC transmit status */ - if (pdc_tx) - UART_PUT_PTCR(port, ATMEL_PDC_TXTEN); - /* set interrupts back the way they were */ UART_PUT_IER(port, imr); } diff --git a/trunk/drivers/usb/host/ehci-hub.c b/trunk/drivers/usb/host/ehci-hub.c index 40e8240b7851..4e065e556e4b 100644 --- a/trunk/drivers/usb/host/ehci-hub.c +++ b/trunk/drivers/usb/host/ehci-hub.c @@ -135,8 +135,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) hcd->state = HC_STATE_QUIESCING; } ehci->command = ehci_readl(ehci, &ehci->regs->command); - if (ehci->reclaim) - end_unlink_async(ehci); ehci_work(ehci); /* Unlike other USB host controller types, EHCI doesn't have @@ -180,6 +178,9 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) ehci_halt (ehci); hcd->state = HC_STATE_SUSPENDED; + if (ehci->reclaim) + end_unlink_async(ehci); + /* allow remote wakeup */ mask = INTR_MASK; if (!device_may_wakeup(&hcd->self.root_hub->dev)) diff --git a/trunk/fs/efs/inode.c b/trunk/fs/efs/inode.c index a8e7797b9477..79e19e5958e1 100644 --- a/trunk/fs/efs/inode.c +++ b/trunk/fs/efs/inode.c @@ -140,7 +140,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) brelse(bh); #ifdef DEBUG - printk(KERN_DEBUG "EFS: efs_iget(): inode %lu, extents %d, mode %o\n", + printk(KERN_DEBUG "EFS: read_inode(): inode %lu, extents %d, mode %o\n", inode->i_ino, in->numextents, inode->i_mode); #endif diff --git a/trunk/include/asm-alpha/current.h b/trunk/include/asm-alpha/current.h index 094d285a1b34..8d88a13c1bec 100644 --- a/trunk/include/asm-alpha/current.h +++ b/trunk/include/asm-alpha/current.h @@ -3,7 +3,7 @@ #include -#define get_current() (current_thread_info()->task) +#define get_current() (current_thread_info()->task + 0) #define current get_current() #endif /* _ALPHA_CURRENT_H */ diff --git a/trunk/include/asm-alpha/dma-mapping.h b/trunk/include/asm-alpha/dma-mapping.h index db351d1296f4..75a1aff5b57b 100644 --- a/trunk/include/asm-alpha/dma-mapping.h +++ b/trunk/include/asm-alpha/dma-mapping.h @@ -11,7 +11,7 @@ #define dma_unmap_single(dev, addr, size, dir) \ pci_unmap_single(alpha_gendev_to_pci(dev), addr, size, dir) #define dma_alloc_coherent(dev, size, addr, gfp) \ - __pci_alloc_consistent(alpha_gendev_to_pci(dev), size, addr, gfp) + pci_alloc_consistent(alpha_gendev_to_pci(dev), size, addr) #define dma_free_coherent(dev, size, va, addr) \ pci_free_consistent(alpha_gendev_to_pci(dev), size, va, addr) #define dma_map_page(dev, page, off, size, dir) \ diff --git a/trunk/include/asm-alpha/kvm.h b/trunk/include/asm-alpha/kvm.h deleted file mode 100644 index b9daec429689..000000000000 --- a/trunk/include/asm-alpha/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_ALPHA_H -#define __LINUX_KVM_ALPHA_H - -/* alpha does not support KVM */ - -#endif diff --git a/trunk/include/asm-alpha/pci.h b/trunk/include/asm-alpha/pci.h index d31fd49ff79a..d5b10ef64364 100644 --- a/trunk/include/asm-alpha/pci.h +++ b/trunk/include/asm-alpha/pci.h @@ -76,13 +76,7 @@ extern inline void pcibios_penalize_isa_irq(int irq, int active) successful and sets *DMA_ADDRP to the pci side dma address as well, else DMA_ADDRP is undefined. */ -extern void *__pci_alloc_consistent(struct pci_dev *, size_t, - dma_addr_t *, gfp_t); -static inline void * -pci_alloc_consistent(struct pci_dev *dev, size_t size, dma_addr_t *dma) -{ - return __pci_alloc_consistent(dev, size, dma, GFP_ATOMIC); -} +extern void *pci_alloc_consistent(struct pci_dev *, size_t, dma_addr_t *); /* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must be values that were returned from pci_alloc_consistent. SIZE must diff --git a/trunk/include/asm-arm/kvm.h b/trunk/include/asm-arm/kvm.h deleted file mode 100644 index cb3c08cbcb9e..000000000000 --- a/trunk/include/asm-arm/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_ARM_H -#define __LINUX_KVM_ARM_H - -/* arm does not support KVM */ - -#endif diff --git a/trunk/include/asm-avr32/kvm.h b/trunk/include/asm-avr32/kvm.h deleted file mode 100644 index 8c5777020e2c..000000000000 --- a/trunk/include/asm-avr32/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_AVR32_H -#define __LINUX_KVM_AVR32_H - -/* avr32 does not support KVM */ - -#endif diff --git a/trunk/include/asm-blackfin/kvm.h b/trunk/include/asm-blackfin/kvm.h deleted file mode 100644 index e3477d77c014..000000000000 --- a/trunk/include/asm-blackfin/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_BLACKFIN_H -#define __LINUX_KVM_BLACKFIN_H - -/* blackfin does not support KVM */ - -#endif diff --git a/trunk/include/asm-cris/kvm.h b/trunk/include/asm-cris/kvm.h deleted file mode 100644 index c860f51149f0..000000000000 --- a/trunk/include/asm-cris/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_CRIS_H -#define __LINUX_KVM_CRIS_H - -/* cris does not support KVM */ - -#endif diff --git a/trunk/include/asm-frv/kvm.h b/trunk/include/asm-frv/kvm.h deleted file mode 100644 index 9c8a4f08d0a9..000000000000 --- a/trunk/include/asm-frv/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_FRV_H -#define __LINUX_KVM_FRV_H - -/* frv does not support KVM */ - -#endif diff --git a/trunk/include/asm-generic/Kbuild.asm b/trunk/include/asm-generic/Kbuild.asm index 92a6d91d0c1a..fd9dcfd91c39 100644 --- a/trunk/include/asm-generic/Kbuild.asm +++ b/trunk/include/asm-generic/Kbuild.asm @@ -1,5 +1,3 @@ -header-y += kvm.h - ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) unifdef-y += a.out.h endif diff --git a/trunk/include/asm-h8300/kvm.h b/trunk/include/asm-h8300/kvm.h deleted file mode 100644 index bdbed7b987e1..000000000000 --- a/trunk/include/asm-h8300/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_H8300_H -#define __LINUX_KVM_H8300_H - -/* h8300 does not support KVM */ - -#endif diff --git a/trunk/include/asm-ia64/kvm.h b/trunk/include/asm-ia64/kvm.h deleted file mode 100644 index 030d29b4b26b..000000000000 --- a/trunk/include/asm-ia64/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_IA64_H -#define __LINUX_KVM_IA64_H - -/* ia64 does not support KVM */ - -#endif diff --git a/trunk/include/asm-m32r/kvm.h b/trunk/include/asm-m32r/kvm.h deleted file mode 100644 index 99a40515b77e..000000000000 --- a/trunk/include/asm-m32r/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_M32R_H -#define __LINUX_KVM_M32R_H - -/* m32r does not support KVM */ - -#endif diff --git a/trunk/include/asm-m68k/kvm.h b/trunk/include/asm-m68k/kvm.h deleted file mode 100644 index 7ed27fce5240..000000000000 --- a/trunk/include/asm-m68k/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_M68K_H -#define __LINUX_KVM_M68K_H - -/* m68k does not support KVM */ - -#endif diff --git a/trunk/include/asm-m68knommu/kvm.h b/trunk/include/asm-m68knommu/kvm.h deleted file mode 100644 index b49d4258dabb..000000000000 --- a/trunk/include/asm-m68knommu/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_M68KNOMMU_H -#define __LINUX_KVM_M68KNOMMU_H - -/* m68knommu does not support KVM */ - -#endif diff --git a/trunk/include/asm-mips/kvm.h b/trunk/include/asm-mips/kvm.h deleted file mode 100644 index 093a5b7f796b..000000000000 --- a/trunk/include/asm-mips/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_MIPS_H -#define __LINUX_KVM_MIPS_H - -/* mips does not support KVM */ - -#endif diff --git a/trunk/include/asm-mn10300/kvm.h b/trunk/include/asm-mn10300/kvm.h deleted file mode 100644 index f6b609ff4a57..000000000000 --- a/trunk/include/asm-mn10300/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_MN10300_H -#define __LINUX_KVM_MN10300_H - -/* mn10300 does not support KVM */ - -#endif diff --git a/trunk/include/asm-parisc/kvm.h b/trunk/include/asm-parisc/kvm.h deleted file mode 100644 index 00cc45812547..000000000000 --- a/trunk/include/asm-parisc/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_PARISC_H -#define __LINUX_KVM_PARISC_H - -/* parisc does not support KVM */ - -#endif diff --git a/trunk/include/asm-powerpc/kvm.h b/trunk/include/asm-powerpc/kvm.h deleted file mode 100644 index d1b530fbf8dd..000000000000 --- a/trunk/include/asm-powerpc/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_POWERPC_H -#define __LINUX_KVM_POWERPC_H - -/* powerpc does not support KVM */ - -#endif diff --git a/trunk/include/asm-s390/kvm.h b/trunk/include/asm-s390/kvm.h deleted file mode 100644 index 573f2a351386..000000000000 --- a/trunk/include/asm-s390/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_S390_H -#define __LINUX_KVM_S390_H - -/* s390 does not support KVM */ - -#endif diff --git a/trunk/include/asm-sh/kvm.h b/trunk/include/asm-sh/kvm.h deleted file mode 100644 index 6af51dbab2d0..000000000000 --- a/trunk/include/asm-sh/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_SH_H -#define __LINUX_KVM_SH_H - -/* sh does not support KVM */ - -#endif diff --git a/trunk/include/asm-sparc/kvm.h b/trunk/include/asm-sparc/kvm.h deleted file mode 100644 index 2e5478da3819..000000000000 --- a/trunk/include/asm-sparc/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_SPARC_H -#define __LINUX_KVM_SPARC_H - -/* sparc does not support KVM */ - -#endif diff --git a/trunk/include/asm-sparc64/kvm.h b/trunk/include/asm-sparc64/kvm.h deleted file mode 100644 index 380537a77bf9..000000000000 --- a/trunk/include/asm-sparc64/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_SPARC64_H -#define __LINUX_KVM_SPARC64_H - -/* sparc64 does not support KVM */ - -#endif diff --git a/trunk/include/asm-um/kvm.h b/trunk/include/asm-um/kvm.h deleted file mode 100644 index 66aa77094551..000000000000 --- a/trunk/include/asm-um/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_UM_H -#define __LINUX_KVM_UM_H - -/* um does not support KVM */ - -#endif diff --git a/trunk/include/asm-v850/kvm.h b/trunk/include/asm-v850/kvm.h deleted file mode 100644 index 3f729b79febc..000000000000 --- a/trunk/include/asm-v850/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_V850_H -#define __LINUX_KVM_V850_H - -/* v850 does not support KVM */ - -#endif diff --git a/trunk/include/asm-xtensa/kvm.h b/trunk/include/asm-xtensa/kvm.h deleted file mode 100644 index bda4e331e98c..000000000000 --- a/trunk/include/asm-xtensa/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_XTENSA_H -#define __LINUX_KVM_XTENSA_H - -/* xtensa does not support KVM */ - -#endif diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild index 9cdd12a9e843..4a446a19295e 100644 --- a/trunk/include/linux/Kbuild +++ b/trunk/include/linux/Kbuild @@ -253,7 +253,7 @@ unifdef-y += kd.h unifdef-y += kernelcapi.h unifdef-y += kernel.h unifdef-y += keyboard.h -unifdef-y += kvm.h +unifdef-$(CONFIG_HAVE_KVM) += kvm.h unifdef-y += llc.h unifdef-y += loop.h unifdef-y += lp.h diff --git a/trunk/kernel/marker.c b/trunk/kernel/marker.c index 005b95954593..041c33e3e95c 100644 --- a/trunk/kernel/marker.c +++ b/trunk/kernel/marker.c @@ -671,9 +671,6 @@ int marker_probe_register(const char *name, const char *format, entry->rcu_pending = 1; /* write rcu_pending before calling the RCU callback */ smp_wmb(); -#ifdef CONFIG_PREEMPT_RCU - synchronize_sched(); /* Until we have the call_rcu_sched() */ -#endif call_rcu(&entry->rcu, free_old_closure); end: mutex_unlock(&markers_mutex); @@ -717,9 +714,6 @@ int marker_probe_unregister(const char *name, entry->rcu_pending = 1; /* write rcu_pending before calling the RCU callback */ smp_wmb(); -#ifdef CONFIG_PREEMPT_RCU - synchronize_sched(); /* Until we have the call_rcu_sched() */ -#endif call_rcu(&entry->rcu, free_old_closure); remove_marker(name); /* Ignore busy error message */ ret = 0; @@ -798,9 +792,6 @@ int marker_probe_unregister_private_data(marker_probe_func *probe, entry->rcu_pending = 1; /* write rcu_pending before calling the RCU callback */ smp_wmb(); -#ifdef CONFIG_PREEMPT_RCU - synchronize_sched(); /* Until we have the call_rcu_sched() */ -#endif call_rcu(&entry->rcu, free_old_closure); remove_marker(entry->name); /* Ignore busy error message */ end: