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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
setup.c
diff --git
a/arch/sparc64/kernel/setup.c
b/arch/sparc64/kernel/setup.c
index
9cf1c88
..
9582874
100644
(file)
--- a/
arch/sparc64/kernel/setup.c
+++ b/
arch/sparc64/kernel/setup.c
@@
-16,9
+16,8
@@
#include <asm/smp.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <asm/smp.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <linux/delay.h>
#include <linux/delay.h>
-#include <linux/config.h>
#include <linux/fs.h>
#include <linux/seq_file.h>
#include <linux/syscalls.h>
#include <linux/fs.h>
#include <linux/seq_file.h>
#include <linux/syscalls.h>
@@
-376,12
+375,12
@@
void __init setup_arch(char **cmdline_p)
}
#endif
}
#endif
- smp_setup_cpu_possible_map();
-
/* Get boot processor trap_block[] setup. */
init_cur_cpu_trap(current_thread_info());
paging_init();
/* Get boot processor trap_block[] setup. */
init_cur_cpu_trap(current_thread_info());
paging_init();
+
+ smp_setup_cpu_possible_map();
}
static int __init set_preferred_console(void)
}
static int __init set_preferred_console(void)
@@
-537,7
+536,7
@@
static int __init topology_init(void)
for_each_possible_cpu(i) {
struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
if (p) {
for_each_possible_cpu(i) {
struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
if (p) {
- register_cpu(p, i
, NULL
);
+ register_cpu(p, i);
err = 0;
}
}
err = 0;
}
}