git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
mips
/
mips-boards
/
generic
/
memory.c
diff --git
a/arch/mips/mips-boards/generic/memory.c
b/arch/mips/mips-boards/generic/memory.c
index
ebf0e16
..
dc272c1
100644
(file)
--- a/
arch/mips/mips-boards/generic/memory.c
+++ b/
arch/mips/mips-boards/generic/memory.c
@@
-59,11
+59,12
@@
struct prom_pmemblock * __init prom_getmdesc(void)
/* otherwise look in the environment */
memsize_str = prom_getenv("memsize");
if (!memsize_str) {
/* otherwise look in the environment */
memsize_str = prom_getenv("memsize");
if (!memsize_str) {
- prom_printf("memsize not set in boot prom, set to default (32Mb)\n");
+ printk(KERN_WARNING
+ "memsize not set in boot prom, set to default (32Mb)\n");
physical_memsize = 0x02000000;
} else {
#ifdef DEBUG
physical_memsize = 0x02000000;
} else {
#ifdef DEBUG
- pr
om_printf
("prom_memsize = %s\n", memsize_str);
+ pr
_debug
("prom_memsize = %s\n", memsize_str);
#endif
physical_memsize = simple_strtol(memsize_str, NULL, 0);
}
#endif
physical_memsize = simple_strtol(memsize_str, NULL, 0);
}
@@
-124,7
+125,7
@@
struct prom_pmemblock * __init prom_getmdesc(void)
return &mdesc[0];
}
return &mdesc[0];
}
-static int __init prom_memtype_classify
(unsigned int type)
+static int __init prom_memtype_classify(unsigned int type)
{
switch (type) {
case yamon_free:
{
switch (type) {
case yamon_free:
@@
-141,12
+142,12
@@
void __init prom_meminit(void)
struct prom_pmemblock *p;
#ifdef DEBUG
struct prom_pmemblock *p;
#ifdef DEBUG
- pr
om_printf
("YAMON MEMORY DESCRIPTOR dump:\n");
+ pr
_debug
("YAMON MEMORY DESCRIPTOR dump:\n");
p = prom_getmdesc();
while (p->size) {
int i = 0;
p = prom_getmdesc();
while (p->size) {
int i = 0;
- pr
om_printf
("[%d,%p]: base<%08lx> size<%08lx> type<%s>\n",
-
i, p, p->base, p->size, mtypes[p->type]);
+ pr
_debug
("[%d,%p]: base<%08lx> size<%08lx> type<%s>\n",
+ i, p, p->base, p->size, mtypes[p->type]);
p++;
i++;
}
p++;
i++;
}
@@
-157,7
+158,7
@@
void __init prom_meminit(void)
long type;
unsigned long base, size;
long type;
unsigned long base, size;
- type = prom_memtype_classify
(p->type);
+ type = prom_memtype_classify(p->type);
base = p->base;
size = p->size;
base = p->base;
size = p->size;