1. 30 Mar, 2011 8 commits
    • Linus Torvalds's avatar
      Merge branch 'irq-fixes-for-linus' of... · 6aba74f2
      Linus Torvalds authored
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        avr32: Fix missing irq namespace conversion
        powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip
        genirq: Remove the now obsolete config options and select statements
        arm: versatile : Fix typo introduced in irq namespace cleanup
        sound: Fixup the last user of the old irq functions
        genirq: Remove obsolete comment
        genirq: Remove now obsolete set_irq_wake()
        sh: Fix irq cleanup fallout
        x86: apb_timer: Fixup genirq fallout
        genirq: Fix misnamed label in handle_edge_eoi_irq
      
      Fix up crazy conflict in arch/powerpc/include/asm/qe_ic.h:
      
       - commit eead4d5c ("powerpc: qe_ic: Rename get_irq_desc_data and
         get_irq_desc_chip") made the helper functions use
         irq_desc_get_handler_data() instead of the legacy (and no longer
         existing) get_irq_desc_data.
      
       - commit d4db35e8 ("powerpc/qe_ic: Fix another breakage from the
         irq_data conversion") used irq_desc_get_chip_data() instead.
      
      According to Thomas, the former is the correct direct conversion, but it
      does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c
      seems to initialize both to the same thing), and the chip data in some
      ways is the more logical.  Somebody should really decide on one of the
      other.
      
      This merge picks irq_desc_get_handler_data() as the straightforward pure
      conversion to new names, as per Thomas.
      6aba74f2
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a8e498b7
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/qe_ic: Fix another breakage from the irq_data conversion
        powerpc/8xx: Fix another breakage from the irq_data conversion
        powerpc/cell: Use handle_edge_eoi_irq for real
        powerpc/pseries: Enable Chelsio network and iWARP drivers
        powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory
        powerpc: Fix accounting of softirq time when idle
        powerpc/pseries/smp: query-cpu-stopped-state support won't change
        powerpc/xics: Use hwirq for xics domain irq number
        powerpc/xics: Fix numberspace mismatch from irq_desc conversion
        powerpc: Wire up new syscalls
        powerpc/booke: Correct the SPRN_MAS5 definition.
        powerpc: ARCH_PFN_OFFSET should be unsigned long
        powerpc: Implement dma_mmap_coherent()
        powerpc/nvram: Don't overwrite oops/panic report on normal shutdown
        powerpc: Restore some misc devices to our configs
      a8e498b7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · a8a44921
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: bitops: fix include order after little endian inclusion
        Blackfin: defconfigs: update after misc devices defaulted to N
        Blackfin: use more standard pr_fmt in the module loader
      a8a44921
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 85eb1513
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)
        ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support
        ARM: 6838/1: etm: fix section mismatch warning
        ARM: 6837/1: remove unused pci_fixup_prpmc1100
        ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC
        Fix the broken build for Marvell Dove platform.
        ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency
        ARM: 6834/1: perf: reset counters on all CPUs during initialisation
        ARM: 6833/1: perf: add required isbs() to ARMv7 backend
        ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues
        ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile
        arm: mach-mx3: pcm043: add write-protect and card-detect for SD1
        eukrea_mbimxsd51: add SD Card detect
        eukrea_mbimxsd25-baseboard: add SD card detect
        mx3/eukrea_mbimxsd-baseboard: add SD card detect support
        mx3/eukrea_mbimxsd-baseboard: fix gpio request
        ARM: mxs/mx28evk: add mmc device
        ARM: mxs/mx23evk: add mmc device
        ARM: mxs: dynamically allocate mmc device
        ARM: mx51_efika: update platform data for new mfd changes
        mx2/iomux: Set direction for CSPI2 pins
        ...
      85eb1513
    • Thomas Gleixner's avatar
      dd8ea6af
    • Richard Cochran's avatar
      powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip · eead4d5c
      Richard Cochran authored
      These two functions disappeared in commit
      
          0c6f8a8b
          "genirq: Remove compat code"
      
      but they still exist in qe_ic.h.
      This patch renames the function to their new names.
      Signed-off-by: default avatarRichard Cochran <richard.cochran@omicron.at>
      Cc: linuxppc-dev@lists.ozlabs.org
      Cc: Lennert Buytenhek <buytenh@secretlab.ca>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      LKML-Reference: <20110330132504.GA31832@riccoc20.at.omicron.at>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      eead4d5c
    • Thomas Gleixner's avatar
    • Grant Likely's avatar
      arm: versatile : Fix typo introduced in irq namespace cleanup · e2823266
      Grant Likely authored
      Commit 6845664a(arm: Cleanup the irq namespace) introduces a typo
      causing a build failure for the versatile platform.
      
      [ tglx: Sorry, my bad. Have no idea how I fatfingered that ]
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: linux-arm-kernel@lists.infradead.org
      LKML-Reference: <20110330060229.27397.7628.stgit@ponder>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      e2823266
  2. 29 Mar, 2011 32 commits