1. 14 12月, 2009 37 次提交
  2. 13 12月, 2009 3 次提交
    • L
      Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 · f4054253
      Linus Torvalds 提交于
      * 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
        IXP4xx: GTWX5715 platform only has two PCI IRQ lines, not four.
        IXP4xx: Introduce IXP4XX_GPIO_IRQ(n) macro and convert IXP4xx platform files.
        IXP4xx: move Gemtek GTWX5715 platform macros to the platform code.
        IXP4xx: Remove unused Motorola PrPMC1100 platform macros.
        IXP4xx: move FSG platform macros to the platform code.
        IXP4xx: move DSM G600 platform macros to the platform code.
        IXP4xx: move NAS100D platform macros to the platform code.
        IXP4xx: move NSLU2 platform macros to the platform code.
        IXP4xx: move Coyote platform macros to the platform code.
        IXP4xx: move AVILA platform macros to the platform code.
        IXP4xx: move IXDP425 platform macros to the platform code.
        IXP4xx: Extend PCI MMIO indirect address space to 1 GB.
        IXP4xx: Fix compilation failure with CONFIG_IXP4XX_INDIRECT_PCI.
        IXP4xx: Drop "__ixp4xx_" prefix from in/out/ioread/iowrite functions for clarity.
        IXP4xx: Rename indirect MMIO primitives from __ixp4xx_* to __indirect_*.
        IXP4xx: Ensure index is positive in irq_to_gpio() and npe_request().
        ARM: fix insl() and outsl() endianness on IXP4xx architecture.
        IXP4xx: Fix normally-disabled debugging text in drivers/net/arm/ixp4xx_eth.c.
        IXP4xx: change the timer base frequency to 66.666000 MHz.
      f4054253
    • L
      [BKL] add 'might_sleep()' to the outermost lock taker · f01eb364
      Linus Torvalds 提交于
      As shown by the previous patch (6698e347: "tty: Fix BKL taken under a
      spinlock bug introduced in the BKL split") the BKL removal is prone to
      some subtle issues, where removing the BKL in one place may in fact make
      a previously nested BKL call the new outer call, and then prone to nasty
      deadlocks with other spinlocks.
      
      In general, we should never take the BKL while we're holding a spinlock,
      so let's just add a "might_sleep()" to it (even though the BKL doesn't
      technically sleep - at least not yet), and we'll get nice warnings the
      next time this kind of problem happens during BKL removal.
      Acked-and-Tested-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f01eb364
    • A
      tty: Fix BKL taken under a spinlock bug introduced in the BKL split · 6698e347
      Alan Cox 提交于
      The fasync path takes the BKL (it probably doesn't need to in fact)
      while holding the file_list spinlock.  You can't do that with the kernel
      lock: it causes lock inversions and deadlocks.
      
      Leave the BKL over that bit for the moment.
      
      Identified by AKPM.
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Acked-and-Tested-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6698e347