Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d150ad7b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] x86_64 irq_regs fix 



smp_apic_timer_interrupt() needs to stack the pt_regs* for profile_tick.

If any other of those APIC interrupt handlers want to run get_irq_regs() then
their C entrypoint handlers will need the same treatment.

Cc: Andi Kleen <ak@muc.de>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Acked-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e6300155

arch/x86_64/kernel/apic.c

+4 −1
Original line number Diff line number Diff line
@@ -913,8 +913,10 @@ void smp_local_timer_interrupt(void) 
 * [ if a single-CPU system runs an SMP kernel then we call the local

 *   interrupt as well. Thus we cannot inline the local irq ... ]

 */

void smp_apic_timer_interrupt(void)

void smp_apic_timer_interrupt(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);



	/*

	 * the NMI deadlock-detector uses this.

	 */
@@ -934,6 +936,7 @@ void smp_apic_timer_interrupt(void) 
	irq_enter();

	smp_local_timer_interrupt();

	irq_exit();

	set_irq_regs(old_regs);

}



/*