1. 13 10月, 2009 6 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 2caa7318
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: Prevent AER driver from being loaded on non-root port PCIE devices
        PCI: get larger bridge ranges when space is available
        PCI: pci.c: fix kernel-doc notation
        PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers
        PCI PM: Read device power state from register after updating it
        PCI: remove pci_assign_resource_fixed()
        PCI: PCIe portdrv: remove "-driver" from driver name
      2caa7318
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 589bf8d5
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
        ARM: force dcache flush if dcache_dirty bit set
        [ARM] pxa: workaround errata #37 by not using half turbo switching
        [ARM] pxamci: fix printing gpio numbers in pxamci_probe
        [ARM] pxa/csb726: adjust duplicate structure field initialization
        ARM: Add kmap_atomic type debugging
        ARM: boolean bit testing
        ARM: update die() output
        ARM: Dump code/mem oops lines with the appropriate log level
        ARM: Dump memory and backtrace as one printk per line
        ARM: 5756/1: ep93xx: introduce clk parent
        ARM: 5754/1: ep93xx: update i2c support
        ARM: 5753/1: ep93xx: remove old EP93XX_GPIO_* defines
        ARM: 5729/1: ep93xx: define EP93XX_*_PHYS_BASE with macros
        ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim
        ARM: 5750/1: ep93xx/micro9: Update platform code
        ARM: 5749/1: ep93xx/micro9: Update maintainer
        ARM: 5752/1: SA1100: fix building of h3100
        ARM: 5748/1: bcmring: fix build warning messages
        ARM: 5747/1: Fix the start_pg value in free_memmap()
        ARM: 5746/1: Handle possible translation errors in ARMv6/v7 coherent_user_range
        ...
      589bf8d5
    • M
      USB: musb: invert arch depend string · e3c6f15f
      Mike Frysinger 提交于
      The MUSB code relies on platform implementations that currently only
      exists for Arm and Blackfin processors, so have the MUSB Kconfig depend
      upon those arches.
      
      This should prevent other arches from building MUSB via randconfig.
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NMike Frysinger <vapier@gentoo.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e3c6f15f
    • S
      NFS: suppress a build warning · a1be9eee
      Stefan Richter 提交于
      struct sockaddr_storage * can safely be used as struct sockaddr *.
      Suppress an "incompatible pointer type" warning.
      Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a1be9eee
    • L
      tty, serial: Fix race and NULL check in uart_close() · eea7e17e
      Linus Torvalds 提交于
      Commit 46d57a44 ("serial: use tty_port pointers in the core code")
      contained two bugs that causes (rare) crashes:
      
       - the rename typoed one site
      
       - a NULL check was missed
      Reported-and-tested-by: NIngo Molnar <mingo@elte.hu>
      Cc: Greg KH <gregkh@suse.de>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      eea7e17e
    • N
      ARM: force dcache flush if dcache_dirty bit set · 787b2faa
      Nitin Gupta 提交于
      On ARM, update_mmu_cache() does dcache flush for a page only if
      it has a kernel mapping (page_mapping(page) != NULL). The correct
      behavior would be to force the flush based on dcache_dirty bit only.
      
      One of the cases where present logic would be a problem is when
      a RAM based block device[1] is used as a swap disk. In this case,
      we would have in-memory data corruption as shown in steps below:
      
      do_swap_page()
      {
          - Allocate a new page (if not already in swap cache)
          - Issue read from swap disk
              - Block driver issues flush_dcache_page()
              - flush_dcache_page() simply sets PG_dcache_dirty bit and does not
                actually issue a flush since this page has no user space mapping yet.
          - Now, if swap disk is almost full, this newly read page is removed
            from swap cache and corrsponding swap slot is freed.
          - Map this page anonymously in user space.
          - update_mmu_cache()
              - Since this page does not have kernel mapping (its not in page/swap
                cache and is mapped anonymously), it does not issue dcache flush
                even if dcache_dirty bit is set by flush_dcache_page() above.
      
          <user now gets stale data since dcache was never flushed>
      }
      
      Same problem exists on mips too.
      
      [1] example:
       - brd (RAM based block device)
       - ramzswap (RAM based compressed swap device)
      Signed-off-by: NNitin Gupta <ngupta@vflare.org>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      787b2faa
  2. 12 10月, 2009 15 次提交
  3. 11 10月, 2009 5 次提交
  4. 10 10月, 2009 14 次提交