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
/
mips
/
momentum
/
ocelot_c
/
prom.c
diff --git
a/arch/mips/momentum/ocelot_c/prom.c
b/arch/mips/momentum/ocelot_c/prom.c
index
0387b56
..
7621129
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/prom.c
+++ b/
arch/mips/momentum/ocelot_c/prom.c
@@
-29,7
+29,7
@@
struct callvectors* debug_vectors;
struct callvectors* debug_vectors;
-extern unsigned long m
v64340
_base;
+extern unsigned long m
arvell
_base;
extern unsigned long cpu_clock;
#ifdef CONFIG_MV64340_ETH
extern unsigned long cpu_clock;
#ifdef CONFIG_MV64340_ETH
@@
-147,13
+147,14
@@
char *arg64(unsigned long addrin, int arg_index)
#endif /* CONFIG_MIPS64 */
#endif /* CONFIG_MIPS64 */
-/* [jsun@junsun.net] PMON passes arguments in C main() style */
void __init prom_init(void)
{
int argc = fw_arg0;
char **arg = (char **) fw_arg1;
char **env = (char **) fw_arg2;
void __init prom_init(void)
{
int argc = fw_arg0;
char **arg = (char **) fw_arg1;
char **env = (char **) fw_arg2;
+ struct callvectors *cv = (struct callvectors *) fw_arg3;
int i;
int i;
+
#ifdef CONFIG_MIPS64
char *ptr;
#ifdef CONFIG_MIPS64
char *ptr;
@@
-179,13
+180,13
@@
void __init prom_init(void)
break;
if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) {
break;
if (strncmp("gtbase", ptr, strlen("gtbase")) == 0) {
- m
v64340
_base = simple_strtol(ptr + strlen("gtbase="),
+ m
arvell
_base = simple_strtol(ptr + strlen("gtbase="),
NULL, 16);
NULL, 16);
- if ((m
v64340
_base & 0xffffffff00000000) == 0)
- m
v64340
_base |= 0xffffffff00000000;
+ if ((m
arvell
_base & 0xffffffff00000000) == 0)
+ m
arvell
_base |= 0xffffffff00000000;
- printk("m
v64340_base set to 0x%016lx\n", mv64340
_base);
+ printk("m
arvell_base set to 0x%016lx\n", marvell
_base);
}
if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) {
cpu_clock = simple_strtol(ptr + strlen("cpuclock="),
}
if (strncmp("cpuclock", ptr, strlen("cpuclock")) == 0) {
cpu_clock = simple_strtol(ptr + strlen("cpuclock="),
@@
-212,7
+213,7
@@
void __init prom_init(void)
while (*env) {
if (strncmp("gtbase", *env, strlen("gtbase")) == 0) {
while (*env) {
if (strncmp("gtbase", *env, strlen("gtbase")) == 0) {
- m
v64340
_base = simple_strtol(*env + strlen("gtbase="),
+ m
arvell
_base = simple_strtol(*env + strlen("gtbase="),
NULL, 16);
}
if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) {
NULL, 16);
}
if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0) {