Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45635ab5 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86: Change get_max_mapped() to inline 



Move it into head file. to prepare use it in other files.

[ hpa: added missing <linux/types.h> and changed type to phys_addr_t. ]

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <4D1933BA.8000508@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 1a4a678b

arch/x86/include/asm/page_types.h

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_X86_PAGE_DEFS_H



#include <linux/const.h>

#include <linux/types.h>



/* 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);

arch/x86/kernel/setup.c

+0 −9
Original line number Diff line number Diff line
@@ -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