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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_3
/
prom.c
diff --git
a/arch/mips/momentum/ocelot_3/prom.c
b/arch/mips/momentum/ocelot_3/prom.c
index
89c17a0
..
9803daa
100644
(file)
--- a/
arch/mips/momentum/ocelot_3/prom.c
+++ b/
arch/mips/momentum/ocelot_3/prom.c
@@
-93,7
+93,7
@@
void get_mac(char dest[6])
#endif
#endif
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
unsigned long signext(unsigned long addr)
{
unsigned long signext(unsigned long addr)
{
@@
-145,7
+145,7
@@
char *arg64(unsigned long addrin, int arg_index)
return p;
}
return p;
}
-#endif /* CONFIG_
MIPS64
*/
+#endif /* CONFIG_
64BIT
*/
void __init prom_init(void)
{
void __init prom_init(void)
{
@@
-155,7
+155,7
@@
void __init prom_init(void)
struct callvectors *cv = (struct callvectors *) fw_arg3;
int i;
struct callvectors *cv = (struct callvectors *) fw_arg3;
int i;
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
char *ptr;
printk("prom_init - MIPS64\n");
char *ptr;
printk("prom_init - MIPS64\n");
@@
-198,7
+198,7
@@
void __init prom_init(void)
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
}
printk("arcs_cmdline: %s\n", arcs_cmdline);
-#else /* CONFIG_
MIPS64
*/
+#else /* CONFIG_
64BIT
*/
/* save the PROM vectors for debugging use */
debug_vectors = cv;
/* save the PROM vectors for debugging use */
debug_vectors = cv;
@@
-224,7
+224,7
@@
void __init prom_init(void)
}
env++;
}
}
env++;
}
-#endif /* CONFIG_
MIPS64
*/
+#endif /* CONFIG_
64BIT
*/
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_3;
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_3;
@@
-234,13
+234,14
@@
void __init prom_init(void)
get_mac(prom_mac_addr_base);
#endif
get_mac(prom_mac_addr_base);
#endif
-#ifndef CONFIG_
MIPS64
+#ifndef CONFIG_
64BIT
debug_vectors->printf("Booting Linux kernel...\n");
#endif
}
debug_vectors->printf("Booting Linux kernel...\n");
#endif
}
-
void
__init prom_free_prom_memory(void)
+
unsigned long
__init prom_free_prom_memory(void)
{
{
+ return 0;
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)