aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-21perf: Annotate cpuctx->ctx.mutex to avoid a lockdep splatPeter Zijlstra1-0/+3
Lockdep spotted: loop_1b_instruc/1899 is trying to acquire lock: (event_mutex){+.+.+.}, at: [<ffffffff810e1908>] perf_trace_init+0x3b/0x2f7 but task is already holding lock: (&ctx->mutex){+.+.+.}, at: [<ffffffff810eb45b>] perf_event_init_context+0xc0/0x218 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #3 (&ctx->mutex){+.+.+.}: -> #2 (cpu_hotplug.lock){+.+.+.}: -> #1 (module_mutex){+.+...}: -> #0 (event_mutex){+.+.+.}: But because the deadlock would be cpuhotplug (cpu-event) vs fork (task-event) it cannot, in fact, happen. We can annotate this by giving the perf_event_context used for the cpuctx a different lock class from those used by tasks. Signed-off-by: Peter Zijlstra <[email protected]> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <[email protected]>
2011-01-21x86, mcheck, therm_throt.c: Export symbol platform_thermal_notify to allow ↵Fenghua Yu1-0/+1
coretemp to handler intr In therm_throt.c, commit 9e76a97efd31a08cb19d0ba12013b8fb4ad3e474 patch doesn't export the symbol platform_thermal_notify. Other drivers (e.g. drivers/hwmon/coretemp.c) can not find the symbol platform_thermal_notify when defining threshould interrupt handler. Please apply this patch to allow threshold interrupt handler in coretemp. Signed-off-by: Fenghua Yu <[email protected]> Cc: R Durgadoss <[email protected]> Cc: [email protected] <[email protected]> Cc: [email protected] <[email protected]> Cc: Guenter Roeck <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2011-01-21x86: Use asm-generic/cacheflush.hAkinobu Mita1-41/+1
The implementation of the cache flushing interfaces on the x86 is identical with the default implementation in asm-generic. Signed-off-by: Akinobu Mita <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: [email protected] LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
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]>
2011-01-21powerpc: Disable mcount tracers in pseries defconfigAnton Blanchard1-2/+0
IRQSOFF_TRACER and STACK_TRACER force the kernel to be built with -pg which is a substantial overhead. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-01-21powerpc/boot/dts: Install dts from the right directoryBen Hutchings1-1/+1
The dts-installed variable is initialised using a wildcard path that will be expanded relative to the build directory. Use the existing variable dtstree to generate an absolute wildcard path that will work when building in a separate directory. Reported-by: Gerhard Pircher <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> Tested-by: Gerhard Pircher <[email protected]> [against 2.6.32] Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-01-21powerpc: machine_check_generic is wrong on 64bitAnton Blanchard1-23/+0
Decoding machine checks is CPU specific and so machine_check_generic doesn't do the right thing on 64bit chips. Luckily we never call into this code because we call ppc_md.machine_check_exception instead if available. Since we check cur_cpu_spec->machine_check before calling it, we may as well remove machine_check_generic from 64bit archs. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-01-21powerpc: Check RTAS extended log flag before checking lengthAnton Blanchard1-1/+1
The spec suggests we should first check the extended log flag before checking the length field. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-01-21powerpc: Fix corruption when grabbing FWNMI dataAnton Blanchard1-14/+38
The FWNMI code uses a global buffer without any locks to read the RTAS error information. If two CPUs take a machine check at once then we will corrupt this buffer. Since most FWNMI rtas messages are not of the extended type, we can create a 64bit percpu buffer and use it where possible. If we do receive an extended RTAS log then we fall back to the old behaviour of using the global buffer. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>