git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
i386
/
mach-generic
/
bigsmp.c
diff --git
a/arch/i386/mach-generic/bigsmp.c
b/arch/i386/mach-generic/bigsmp.c
index
037b2af
..
8a210fa
100644
(file)
--- a/
arch/i386/mach-generic/bigsmp.c
+++ b/
arch/i386/mach-generic/bigsmp.c
@@
-3,9
+3,9
@@
* Drives the local APIC in "clustered mode".
*/
#define APIC_DEFINITION 1
* Drives the local APIC in "clustered mode".
*/
#define APIC_DEFINITION 1
-#include <linux/config.h>
#include <linux/threads.h>
#include <linux/cpumask.h>
#include <linux/threads.h>
#include <linux/cpumask.h>
+#include <asm/smp.h>
#include <asm/mpspec.h>
#include <asm/genapic.h>
#include <asm/fixmap.h>
#include <asm/mpspec.h>
#include <asm/genapic.h>
#include <asm/fixmap.h>
@@
-45,7
+45,7
@@
static struct dmi_system_id __initdata bigsmp_dmi_table[] = {
};
};
-static
__init
int probe_bigsmp(void)
+static int probe_bigsmp(void)
{
if (def_to_bigsmp)
dmi_bigsmp = 1;
{
if (def_to_bigsmp)
dmi_bigsmp = 1;