[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20090211102919.GA11000@elte.hu>
Date: Wed, 11 Feb 2009 11:29:19 +0100
From: Ingo Molnar <mingo@...e.hu>
To: Alok Kataria <akataria@...are.com>
Cc: Yinghai Lu <yinghai@...nel.org>,
the arch/x86 maintainers <x86@...nel.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH] x86, apic: make generic_apic_probe() generally available
* Ingo Molnar <mingo@...e.hu> wrote:
> > I've applied your patch as an interim measure so far, to fix the crash, so
> > please do the cleaner patch ontop of your first patch. Thanks,
>
> I removed it again. generic_apic_probe() is not always available on 32-bit either.
applied the fix below instead.
Ingo
------------------>
>From 160d8dac12932ad6eb4a359b66521e2e3282ea7d Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@...e.hu>
Date: Wed, 11 Feb 2009 11:27:39 +0100
Subject: [PATCH] x86, apic: make generic_apic_probe() generally available
Impact: build fix
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/include/asm/apic.h | 6 ++++++
arch/x86/kernel/setup.c | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index f4835a1..fba49f6 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -33,7 +33,13 @@
} while (0)
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
extern void generic_apic_probe(void);
+#else
+static inline void generic_apic_probe(void)
+{
+}
+#endif
#ifdef CONFIG_X86_LOCAL_APIC
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 150e6d0..8fce6c7 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -936,9 +936,7 @@ void __init setup_arch(char **cmdline_p)
map_vsyscall();
#endif
-#ifdef CONFIG_X86_32
generic_apic_probe();
-#endif
early_quirks();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists