]> err.no Git - linux-2.6/commitdiff
Blackfin arch: show_mem can not be marked as init, since it is called during OOM...
authorRobin Getz <robin.getz@analog.com>
Wed, 10 Oct 2007 09:25:15 +0000 (17:25 +0800)
committerBryan Wu <bryan.wu@analog.com>
Wed, 10 Oct 2007 09:25:15 +0000 (17:25 +0800)
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>
arch/blackfin/mm/init.c

index 68459cc052a142ac14df1545c0c3fe86ec88428f..e97ea8fc8dc4915381a2f8610e5c4f19475442f8 100644 (file)
@@ -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;