From: Robin Getz <robin.getz@analog.com>
Date: Wed, 10 Oct 2007 09:25:15 +0000 (+0800)
Subject: Blackfin arch: show_mem can not be marked as init, since it is called during OOM... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b76f98761acc909c20c1e65c8af11dc1decae935;p=linux-2.6

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>
---

diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 68459cc052..e97ea8fc8d 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;