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 branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
blackfin
/
mm
/
init.c
diff --git
a/arch/blackfin/mm/init.c
b/arch/blackfin/mm/init.c
index
bb4e8ff
..
f8435cd
100644
(file)
--- a/
arch/blackfin/mm/init.c
+++ b/
arch/blackfin/mm/init.c
@@
-158,5
+158,8
@@
void __init_refok free_initmem(void)
free_init_pages("unused kernel memory",
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
free_init_pages("unused kernel memory",
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
+
+ if (memory_start == (unsigned long)(&__init_end))
+ memory_start = (unsigned long)(&__init_begin);
#endif
}
#endif
}