From d2f96d3e4192603f11ed2f17d893edc3dd697eb5 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Mon, 27 Dec 2010 16:47:54 -0800 Subject: [PATCH] --- yaml --- r: 234813 b: refs/heads/master c: 45635ab5e41bcde94a82f9a05d660ef77fe38c1b h: refs/heads/master i: 234811: 512a781f743b58864b8244310702244ea440a236 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/page_types.h | 6 ++++++ trunk/arch/x86/kernel/setup.c | 9 --------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index eb0842fbd90e..4054e5a668d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a4a678b12c84db9ae5dce424e0e97f0559bb57c +refs/heads/master: 45635ab5e41bcde94a82f9a05d660ef77fe38c1b diff --git a/trunk/arch/x86/include/asm/page_types.h b/trunk/arch/x86/include/asm/page_types.h index 1df66211fd1b..93626e699679 100644 --- a/trunk/arch/x86/include/asm/page_types.h +++ b/trunk/arch/x86/include/asm/page_types.h @@ -2,6 +2,7 @@ #define _ASM_X86_PAGE_DEFS_H #include +#include /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 @@ -45,6 +46,11 @@ extern int devmem_is_allowed(unsigned long pagenr); extern unsigned long max_low_pfn_mapped; extern unsigned long max_pfn_mapped; +static inline phys_addr_t get_max_mapped(void) +{ + return (phys_addr_t)max_pfn_mapped << PAGE_SHIFT; +} + extern unsigned long init_memory_mapping(unsigned long start, unsigned long end); diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index df172c1e8238..3def8c9a5dc9 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/arch/x86/kernel/setup.c @@ -669,15 +669,6 @@ static int __init parse_reservelow(char *p) early_param("reservelow", parse_reservelow); -static u64 __init get_max_mapped(void) -{ - u64 end = max_pfn_mapped; - - end <<= PAGE_SHIFT; - - return end; -} - /* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures