aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-21Merge branches 'fixes' and 'fwnet' of ↵Linus Torvalds3-7/+19
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: core: fix unstable I/O with Canon camcorder * 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: net: is not experimental anymore firewire: net: invalidate ARP entries of removed nodes
2011-01-21Merge branch 'for-linus' of ↵Linus Torvalds9-77/+79
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix EAPD to low on CZC P10T tablet computer with ALC662 ALSA: HDA: Add SKU ignore for another Thinkpad Edge 14 ALSA: hda - Fix "unused variable" compile warning ALSA: hda - Add quirk for HP Z-series workstation Revert "ALSA: HDA: Create mixers on ALC887" ASoC: PXA: Fix codec address on Zipit Z2 ASoC: PXA: Fix jack detection on Zipit Z2 ASoC: Blackfin: fix DAI/SPORT config dependency issues ASoC: Blackfin TDM: use external frame syncs ASoC: Blackfin AC97: fix build error after multi-component update ASoC: Blackfin TDM: fix missed snd_soc_dai_get_drvdata update ASoC: documentation updates ALSA: ice1712 delta - initialize SPI clock
2011-01-21Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2-4/+4
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/83xx: fix build failures on dt compatible list.
2011-01-21Merge branch 'merge' of ↵Linus Torvalds35-346/+334
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits) powerpc/mpic: Fix mask/unmask timeout message powerpc/pseries: Add BNX2=m to defconfig powerpc: Enable 64kB pages and 1024 threads in pseries config powerpc: Disable mcount tracers in pseries defconfig powerpc/boot/dts: Install dts from the right directory powerpc: machine_check_generic is wrong on 64bit powerpc: Check RTAS extended log flag before checking length powerpc: Fix corruption when grabbing FWNMI data powerpc: Rework pseries machine check handler powerpc: Don't silently handle machine checks from userspace powerpc: Remove duplicate debugger hook in machine_check_exception powerpc: Never halt RTAS error logging after receiving an unrecoverable machine check powerpc: Don't force MSR_RI in machine_check_exception powerpc: Print 32 bits of DSISR in show_regs powerpc/kdump: Disable ftrace during kexec powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare powerpc/kexec: Don't initialise kexec hooks to default handlers powerpc/kdump: Remove ppc_md.machine_crash_shutdown powerpc/kexec: Remove ppc_md.machine_kexec ...
2011-01-21mm: System without MMU do not need pte_mkwriteMichal Simek1-0/+2
The patch "thp: export maybe_mkwrite" (commit 14fd403f2146) breaks systems without MMU. Error log: CC arch/microblaze/mm/init.o In file included from include/linux/mman.h:14, from arch/microblaze/mm/consistent.c:24: include/linux/mm.h: In function 'maybe_mkwrite': include/linux/mm.h:482: error: implicit declaration of function 'pte_mkwrite' include/linux/mm.h:482: error: incompatible types in assignment Signed-off-by: Michal Simek <[email protected]> CC: Andrea Arcangeli <[email protected]> Reviewed-by: Rik van Riel <[email protected]> CC: Andrew Morton <[email protected]> CC: Ingo Molnar <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-01-21MAINTAINERS: Update Roland Dreier's email addressRoland Dreier1-1/+1
The cisco.com address will stop working soon, and besides no one can remember the second "d" in "rolandd" or how to spell "rdreier." Signed-off-by: Roland Dreier <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-01-21xen: p2m: correctly initialize partial p2m leafStefan Bader1-1/+19
After changing the p2m mapping to a tree by commit 58e05027b530ff081ecea68e38de8d59db8f87e0 xen: convert p2m to a 3 level tree and trying to boot a DomU with 615MB of memory, the following crash was observed in the dump: kernel direct mapping tables up to 26f00000 @ 1ec4000-1fff000 BUG: unable to handle kernel NULL pointer dereference at (null) IP: [<c0107397>] xen_set_pte+0x27/0x60 *pdpt = 0000000000000000 *pde = 0000000000000000 Adding further debug statements showed that when trying to set up pfn=0x26700 the returned mapping was invalid. pfn=0x266ff calling set_pte(0xc1fe77f8, 0x6b3003) pfn=0x26700 calling set_pte(0xc1fe7800, 0x3) Although the last_pfn obtained from the startup info is 0x26700, which should in turn not be hit, the additional 8MB which are added as extra memory normally seem to be ok. This lead to looking into the initial p2m tree construction, which uses the smaller value and assuming that there is other code handling the extra memory. When the p2m tree is set up, the leaves are directly pointed to the array which the domain builder set up. But if the mapping is not on a boundary that fits into one p2m page, this will result in the last leaf being only partially valid. And as the invalid entries are not initialized in that case, things go badly wrong. I am trying to fix that by checking whether the current leaf is a complete map and if not, allocate a completely new page and copy only the valid pointers there. This may not be the most efficient or elegant solution, but at least it seems to allow me booting DomUs with memory assignments all over the range. BugLink: http://bugs.launchpad.net/bugs/686692 [v2: Redid a bit of commit wording and fixed a compile warning] Signed-off-by: Stefan Bader <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-01-21Merge branch 'for_linus' of ↵Linus Torvalds8-84/+56
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Fix deadlock during path resolution
2011-01-21um: Use generic irq KconfigThomas Gleixner1-5/+1
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Jeff Dike <[email protected]>
2011-01-21tile: Use generic irq KconfigThomas Gleixner1-29/+21
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Chris Metcalf <[email protected]>
2011-01-21sparc: Use generic irq KconfigThomas Gleixner1-4/+1
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: "David S. Miller" <[email protected]>
2011-01-21score: Use generic irq KconfigThomas Gleixner1-3/+4
No functional change Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Chen Liqin <[email protected]>
2011-01-21powerpc: Use generic irq KconfigThomas Gleixner1-21/+3
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]>
2011-01-21parisc: Use generic irq KconfigThomas Gleixner1-10/+4
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Kyle McMartin <[email protected]> Acked-by: James Bottomley <[email protected]>
2011-01-21mn10300: Use generic irq KconfigThomas Gleixner1-4/+1
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: David Howells <[email protected]>
2011-01-21microblaze: Use generic irq KconfigThomas Gleixner1-6/+2
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Michal Simek <[email protected]>
2011-01-21m68knommu: Use generic irq KconfigThomas Gleixner1-4/+1
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Greg Ungerer <[email protected]>
2011-01-21ia64: Use generic irq KconfigThomas Gleixner1-19/+4
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Tony Luck <[email protected]>
2011-01-21frv: Use generic irq KconfigThomas Gleixner1-4/+1
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: David Howells <[email protected]>
2011-01-21blackfin: Use generic irq KconfigThomas Gleixner1-11/+3
No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Mike Frysinger <[email protected]>
2011-01-21alpha: Use generic irq KconfigThomas Gleixner1-13/+3
Signed-off-by: Thomas Gleixner <[email protected]> Cc: Richard Henderson <[email protected]>
2011-01-21genirq: Remove __do_IRQThomas Gleixner18-183/+0
All architectures are finally converted. Remove the cruft. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Richard Henderson <[email protected]> Cc: Mike Frysinger <[email protected]> Cc: David Howells <[email protected]> Cc: Tony Luck <[email protected]> Cc: Greg Ungerer <[email protected]> Cc: Michal Simek <[email protected]> Acked-by: David Howells <[email protected]> Cc: Kyle McMartin <[email protected]> Acked-by: Benjamin Herrenschmidt <[email protected]> Cc: Chen Liqin <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Chris Metcalf <[email protected]> Cc: Jeff Dike <[email protected]>
2011-01-21m32r: Convert to generic irq KconfigThomas Gleixner1-8/+3
Use the generic irq Kconfig. Select GENERIC_HARDIRQS_NO_DEPRECATED as we have converted all irq_chip functions. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert usrv platform irq handlingThomas Gleixner1-48/+40
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert opsput_lcdpld irq chipThomas Gleixner1-26/+16
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert opsput lanpld irq chipThomas Gleixner1-20/+12
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert opsput pld irq chipThomas Gleixner1-26/+20
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert opsput irq chipThomas Gleixner1-31/+27
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert oaks32r irq chipsThomas Gleixner1-25/+22
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert mappi3 irq chipThomas Gleixner1-31/+31
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert mappi2 irq chipThomas Gleixner1-29/+30
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert mappi irq chipsThomas Gleixner1-27/+26
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert m32700ut lcdpld irq chipThomas Gleixner1-20/+12
Convert the irq chip to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert m32700ut lanpld irq chipThomas Gleixner1-20/+12
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert m32700ut pld irq chipThomas Gleixner1-28/+20
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert m32104ut irq chipThomas Gleixner1-29/+27
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Convert m32104ut irq handlingThomas Gleixner1-25/+21
Convert the irq chips to the new functions and use proper flow handlers. handle_level_irq is appropriate. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21m32r: Cleanup direct irq_desc accessThomas Gleixner9-307/+83
The irq descriptors are already initialized by the generic code. Remove the redundant init code and set the irq chip with the proper accessor function. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Hirokazu Takata <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21cris: Use generic irq KconfigThomas Gleixner2-5/+3
Use the generic irq Kconfig. Select GENERIC_HARDIRQS_NO_DEPRECATED as we have converted all irq_chip functions. Fix the fallout in show_interrupts(). Signed-off-by: Thomas Gleixner <[email protected]> Cc: Mikael Starvik <[email protected]>
2011-01-21cris: Convert V32 interrupt handlingThomas Gleixner1-35/+15
Convert the irq chip functions and install handle_simple_irq for each interrupt to get rid of __do_IRQ() Signed-off-by: Thomas Gleixner <[email protected]> Cc: Mikael Starvik <[email protected]>
2011-01-21cris: Convert V10 interrupt handlingThomas Gleixner1-31/+10
Convert the irq_chip functions and install handle_simple_irq for each interrupt. This converts V10 to the flow handling and lets us remove __do_IRQ(). Signed-off-by: Thomas Gleixner <[email protected]> Cc: Mikael Starvik <[email protected]>
2011-01-21cris: Use irq handling wrapperThomas Gleixner1-2/+2
Use the wrapper around __do_IRQ() so we can convert V10 and V32 seperately. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Mikael Starvik <[email protected]>
2011-01-21h8300: Use generic irq KconfigThomas Gleixner2-5/+3
Switch to the generic irq Kconfig. h8300 has all irq chips converted to the new functions, so select the GENERIC_HARDIRQS_NO_DEPRECATED switch as well. Fixup the resulting fallout in show_interrupts(). Signed-off-by: Thomas Gleixner <[email protected]> Cc: Yoshinori Sato <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21h8300: Convert interrupt handling to flow handlerThomas Gleixner1-12/+3
__do_IRQ is deprecated so h8300 needs to be converted to proper flow handling. The irq chip is simple and does not required any mask/ack/eoi functions, so we can use handle_simple_irq. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Yoshinori Sato <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21h8300: Convert to new irq_chip functionsThomas Gleixner1-17/+16
No functional change, just straight forward conversion. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Yoshinori Sato <[email protected]> Cc: Paul Mundt <[email protected]>
2011-01-21Merge branch 'fix/asoc' into for-linusTakashi Iwai7-68/+55
2011-01-21Merge branch 'fix/misc' into for-linusTakashi Iwai1-0/+7
2011-01-21powerpc/mpic: Fix mask/unmask timeout messageScott Wood1-2/+4
Don't say that enable timed out when it was disable, and show which IRQ had the problem. Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-01-21powerpc/pseries: Add BNX2=m to defconfigNishanth Aravamudan1-0/+1
Upcoming servers will include a Broadcom NIC, add to the defconfig to increase testing coverage and make sure mainline builds come up with networking. Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-01-21powerpc: Enable 64kB pages and 1024 threads in pseries configAnton Blanchard1-1/+3
- Enable 64kB pages so it gets some regular testing. - The largest POWER7 has 1024 threads so bump NR_CPUS it to match. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.