Skip to content

Commit

Permalink
x86: Change get_max_mapped() to inline
Browse files Browse the repository at this point in the history
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: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4D1933BA.8000508@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Yinghai Lu authored and H. Peter Anvin committed Dec 29, 2010
1 parent 1a4a678 commit 45635ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
6 changes: 6 additions & 0 deletions arch/x86/include/asm/page_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);

Expand Down
9 changes: 0 additions & 9 deletions arch/x86/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 45635ab

Please sign in to comment.