From a06abb031d79854531d4eefbd723f29e64a5d6b3 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 22 May 2009 14:21:03 +0900
Subject: [PATCH] --- yaml --- r: 146807 b: refs/heads/master c:
 8fc40238b4ebf07cd11ca9707843338be22af72f h: refs/heads/master i:   146805:
 09fe5964038583659b16879794b4b3e9a585119b   146803:
 c02125b171ee61b80f99ad5d0f1320d5670ec5ef   146799:
 7ef62ab7b7a8c8b1fd32b10c17320bd7c4181cd0 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/sh/mm/init.c       | 3 ---
 trunk/arch/sh/mm/ioremap_64.c | 3 ++-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f36e7ca1bce2..82a95b3b29c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62fad39be0662a924b60e4354b802525ceda0bb1
+refs/heads/master: 8fc40238b4ebf07cd11ca9707843338be22af72f
diff --git a/trunk/arch/sh/mm/init.c b/trunk/arch/sh/mm/init.c
index 3edf297c829b..ee8e6bbe882c 100644
--- a/trunk/arch/sh/mm/init.c
+++ b/trunk/arch/sh/mm/init.c
@@ -184,7 +184,6 @@ void __init paging_init(void)
 }
 
 static struct kcore_list kcore_mem, kcore_vmalloc;
-int after_bootmem = 0;
 
 void __init mem_init(void)
 {
@@ -217,8 +216,6 @@ void __init mem_init(void)
 	memset(empty_zero_page, 0, PAGE_SIZE);
 	__flush_wback_region(empty_zero_page, PAGE_SIZE);
 
-	after_bootmem = 1;
-
 	codesize =  (unsigned long) &_etext - (unsigned long) &_text;
 	datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
 	initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
diff --git a/trunk/arch/sh/mm/ioremap_64.c b/trunk/arch/sh/mm/ioremap_64.c
index 2331229f8126..828c8597219d 100644
--- a/trunk/arch/sh/mm/ioremap_64.c
+++ b/trunk/arch/sh/mm/ioremap_64.c
@@ -20,6 +20,7 @@
 #include <linux/io.h>
 #include <linux/bootmem.h>
 #include <linux/proc_fs.h>
+#include <linux/slab.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
 #include <asm/addrspace.h>
@@ -175,7 +176,7 @@ static __init_refok void *sh64_get_page(void)
 {
 	void *page;
 
-	if (after_bootmem)
+	if (slab_is_available())
 		page = (void *)get_zeroed_page(GFP_KERNEL);
 	else
 		page = alloc_bootmem_pages(PAGE_SIZE);