projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull thermal into release branch
[linux-drm-fsl-dcu.git]
/
arch
/
powerpc
/
platforms
/
ps3
/
mm.c
diff --git
a/arch/powerpc/platforms/ps3/mm.c
b/arch/powerpc/platforms/ps3/mm.c
index 42354de3f557e41e16202580181ab6dc160c79a8..f8a3e206c584b42f97b811da0b09b1402633bb95 100644
(file)
--- a/
arch/powerpc/platforms/ps3/mm.c
+++ b/
arch/powerpc/platforms/ps3/mm.c
@@
-294,7
+294,7
@@
static int __init ps3_mm_add_memory(void)
unsigned long nr_pages;
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
- return
0
;
+ return
-ENODEV
;
BUG_ON(!mem_init_done);
@@
-826,5
+826,4
@@
void __init ps3_mm_init(void)
void ps3_mm_shutdown(void)
{
ps3_mm_region_destroy(&map.r1);
- map.total = map.rm.size;
}