aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRobin Getz <robin.getz@analog.com>2007-10-10 17:25:15 +0800
committerBryan Wu <bryan.wu@analog.com>2007-10-10 17:25:15 +0800
commitb76f98761acc909c20c1e65c8af11dc1decae935 (patch)
tree77ddc8e9578e1f26dfef6e6cb653ab41f04dfd39 /arch
parentBlackfin arch: flush/inv the correct range when using write back cache and fix bugs find by dmacopy (diff)
downloadlinux-dev-b76f98761acc909c20c1e65c8af11dc1decae935.tar.xz
linux-dev-b76f98761acc909c20c1e65c8af11dc1decae935.zip
Blackfin arch: show_mem can not be marked as init, since it is called during OOM condition
show_mem can not be marked as init, since it is called during OOM condition from /mm/oom_kill.c:out_of_memory() and /mm/page_alloc.c:__alloc_pages() Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 68459cc052a1..e97ea8fc8dc4 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -53,7 +53,7 @@ static unsigned long empty_bad_page;
unsigned long empty_zero_page;
-void __init show_mem(void)
+void show_mem(void)
{
unsigned long i;
int free = 0, total = 0, reserved = 0, shared = 0;