Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux/arch/powerpc
History
Linus Torvalds 6aba74f279 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 eead4d5c63 ("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 d4db35e8dc ("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.
 		2011-03-30 09:35:52 -07:00
..
boot Merge remote branch 'jwb/next' into next 2011-03-17 17:59:01 +11:00
configs powerpc/pseries: Enable Chelsio network and iWARP drivers 2011-03-30 10:44:22 +11:00
include/asm Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-30 09:35:52 -07:00
kernel powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory 2011-03-30 10:44:20 +11:00
kvm KVM: PPC: Fix SPRG get/set for Book3S and BookE 2011-03-17 13:08:25 -03:00
lib powerpc: Ensure the else case of feature sections will fit 2011-01-21 14:08:33 +11:00
math-emu powerpc/85xx: Fix SPE float to integer conversion failure 2011-03-15 13:48:15 -05:00
mm powerpc: Implement dma_mmap_coherent() 2011-03-30 10:44:00 +11:00
oprofile tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
platforms powerpc/cell: Use handle_edge_eoi_irq for real 2011-03-30 10:44:24 +11:00
sysdev powerpc/8xx: Fix another breakage from the irq_data conversion 2011-03-30 11:07:13 +11:00
xmon lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
Kconfig genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
Kconfig.debug powerpc: Unconditionally enabled irq stacks 2010-06-15 15:02:37 +10:00
Makefile powerpc: Fix typo in uImage target 2010-08-24 15:26:32 +10:00
relocs_check.pl
…