aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/page_types.h1
-rw-r--r--arch/x86/mm/ioremap.c21
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 642fe34b36a2..a667f24c7254 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -40,7 +40,6 @@
40 40
41#ifndef __ASSEMBLY__ 41#ifndef __ASSEMBLY__
42 42
43extern int page_is_ram(unsigned long pagenr);
44extern int devmem_is_allowed(unsigned long pagenr); 43extern int devmem_is_allowed(unsigned long pagenr);
45 44
46extern unsigned long max_low_pfn_mapped; 45extern unsigned long max_low_pfn_mapped;
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 30e068d6462e..1bf9e08ed733 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -24,27 +24,6 @@
24 24
25#include "physaddr.h" 25#include "physaddr.h"
26 26
27int page_is_ram(unsigned long pagenr)
28{
29 resource_size_t addr, end;
30 int i;
31
32 for (i = 0; i < e820.nr_map; i++) {
33 /*
34 * Not usable memory:
35 */
36 if (e820.map[i].type != E820_RAM)
37 continue;
38 addr = (e820.map[i].addr + PAGE_SIZE-1) >> PAGE_SHIFT;
39 end = (e820.map[i].addr + e820.map[i].size) >> PAGE_SHIFT;
40
41
42 if ((pagenr >= addr) && (pagenr < end))
43 return 1;
44 }
45 return 0;
46}
47
48/* 27/*
49 * Fix up the linear direct mapping of the kernel to avoid cache attribute 28 * Fix up the linear direct mapping of the kernel to avoid cache attribute
50 * conflicts. 29 * conflicts.