Commit:     0492007ed9b53f6a2a2f983910d0fe7c97b09822
Parent:     4e2947f12516d13446d6ffa1d9e4fbd33b1636fa
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 9 22:39:38 2007 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Fri Nov 9 22:39:38 2007 +0100

    x86: make nmi_cpu_busy() always defined
    nmi_cpu_busy() must be available on !SMP too.
    this is in preparation to a smp_call_function_mask() fix.
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
 arch/x86/kernel/nmi_32.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index f803ed0..600fd40 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -51,13 +51,13 @@ static int unknown_nmi_panic_callback(struct pt_regs *regs, 
int cpu);
 static int endflag __initdata = 0;
-#ifdef CONFIG_SMP
 /* The performance counters used by NMI_LOCAL_APIC don't trigger when
  * the CPU is idle. To make sure the NMI watchdog really ticks on all
  * CPUs during the test make them busy.
 static __init void nmi_cpu_busy(void *data)
+#ifdef CONFIG_SMP
        /* Intentionally don't use cpu_relax here. This is
           to make sure that the performance counter really ticks,
@@ -67,8 +67,8 @@ static __init void nmi_cpu_busy(void *data)
           care if they get somewhat less cycles. */
        while (endflag == 0)
 static int __init check_nmi_watchdog(void)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to