diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:42:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:43:54 +0100 |
| commit | 02ac81a812fe0575a8475a93bdc22fb291ebad91 (patch) | |
| tree | 690f1b48b070f5e268d51c54b63943dc3b807e50 /arch/x86/include | |
| parent | 9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 (diff) | |
| parent | d2137d5af4259f50c19addb8246a186c9ffac325 (diff) | |
| download | talos-obmc-linux-02ac81a812fe0575a8475a93bdc22fb291ebad91.tar.gz talos-obmc-linux-02ac81a812fe0575a8475a93bdc22fb291ebad91.zip | |
Merge branch 'x86/bootmem' into x86/mm
Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree
and prevent conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/page_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h index 1df66211fd1b..731d211a1b20 100644 --- a/arch/x86/include/asm/page_types.h +++ b/arch/x86/include/asm/page_types.h @@ -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,9 +46,16 @@ 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); +void init_memory_mapping_high(void); + extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn, int acpi, int k8); extern void free_initmem(void); |
