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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
setup.c
diff --git
a/arch/alpha/kernel/setup.c
b/arch/alpha/kernel/setup.c
index
1dff8e6
..
71d2205
100644
(file)
--- a/
arch/alpha/kernel/setup.c
+++ b/
arch/alpha/kernel/setup.c
@@
-39,6
+39,7
@@
#include <linux/reboot.h>
#endif
#include <linux/notifier.h>
#include <linux/reboot.h>
#endif
#include <linux/notifier.h>
+#include <asm/setup.h>
#include <asm/io.h>
extern struct notifier_block *panic_notifier_list;
#include <asm/io.h>
extern struct notifier_block *panic_notifier_list;
@@
-122,7
+123,6
@@
static void get_sysnames(unsigned long, unsigned long, unsigned long,
static void determine_cpu_caches (unsigned int);
static char command_line[COMMAND_LINE_SIZE];
static void determine_cpu_caches (unsigned int);
static char command_line[COMMAND_LINE_SIZE];
-char saved_command_line[COMMAND_LINE_SIZE];
/*
* The format of "screen_info" is strange, and due to early
/*
* The format of "screen_info" is strange, and due to early
@@
-1246,9
+1246,9
@@
show_cpuinfo(struct seq_file *f, void *slot)
platform_string(), nr_processors);
#ifdef CONFIG_SMP
platform_string(), nr_processors);
#ifdef CONFIG_SMP
- seq_printf(f, "cpus active\t\t: %
l
d\n"
+ seq_printf(f, "cpus active\t\t: %d\n"
"cpu active mask\t\t: %016lx\n",
"cpu active mask\t\t: %016lx\n",
- num_online_cpus(), cpu
_present_mask
);
+ num_online_cpus(), cpu
s_addr(cpu_possible_map)[0]
);
#endif
show_cache_size (f, "L1 Icache", alpha_l1i_cacheshape);
#endif
show_cache_size (f, "L1 Icache", alpha_l1i_cacheshape);