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.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
kernel
/
setup.c
diff --git
a/arch/ppc/kernel/setup.c
b/arch/ppc/kernel/setup.c
index
57b70ae
..
5e7ce4b
100644
(file)
--- a/
arch/ppc/kernel/setup.c
+++ b/
arch/ppc/kernel/setup.c
@@
-7,6
+7,7
@@
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/init.h>
+#include <linux/kernel.h>
#include <linux/reboot.h>
#include <linux/delay.h>
#include <linux/initrd.h>
#include <linux/reboot.h>
#include <linux/delay.h>
#include <linux/initrd.h>
@@
-226,6
+227,10
@@
int show_cpuinfo(struct seq_file *m, void *v)
maj = ((pvr >> 8) & 0xFF) - 1;
min = pvr & 0xFF;
break;
maj = ((pvr >> 8) & 0xFF) - 1;
min = pvr & 0xFF;
break;
+ case 0x8020: /* e500 */
+ maj = PVR_MAJ(pvr);
+ min = PVR_MIN(pvr);
+ break;
default:
maj = (pvr >> 8) & 0xFF;
min = pvr & 0xFF;
default:
maj = (pvr >> 8) & 0xFF;
min = pvr & 0xFF;
@@
-677,7
+682,6
@@
arch_initcall(ppc_init);
/* Warning, IO base is not yet inited */
void __init setup_arch(char **cmdline_p)
{
/* Warning, IO base is not yet inited */
void __init setup_arch(char **cmdline_p)
{
- extern int panic_timeout;
extern char *klimit;
extern void do_init_bootmem(void);
extern char *klimit;
extern void do_init_bootmem(void);