diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-03-05 07:55:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 08:17:16 -0500 |
| commit | 0c0f756fd679d9747d52dad51fce3a5bb362eec3 (patch) | |
| tree | ee989bc3e36d01cbb8969e0013a247ed3708faeb | |
| parent | b47e3418c52b26f6143fc696326ae52a21324551 (diff) | |
x86: add stub init_gbpages() for 32-bit init_memory_mapping()
Impact: cleanup
This patch adds an empty static inline init_gbpages() for the 32-bit
version of init_memory_mapping() making both versions identical.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1236257708-27269-13-git-send-email-penberg@cs.helsinki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/mm/init_32.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index f59e9b851637..cd3c24b490a1 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
| @@ -922,6 +922,10 @@ static int save_mr(struct map_range *mr, int nr_range, | |||
| 922 | return nr_range; | 922 | return nr_range; |
| 923 | } | 923 | } |
| 924 | 924 | ||
| 925 | static inline void init_gbpages(void) | ||
| 926 | { | ||
| 927 | } | ||
| 928 | |||
| 925 | /* | 929 | /* |
| 926 | * Setup the direct mapping of the physical memory at PAGE_OFFSET. | 930 | * Setup the direct mapping of the physical memory at PAGE_OFFSET. |
| 927 | * This runs before bootmem is initialized and gets pages directly from | 931 | * This runs before bootmem is initialized and gets pages directly from |
| @@ -941,6 +945,9 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, | |||
| 941 | 945 | ||
| 942 | printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end); | 946 | printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end); |
| 943 | 947 | ||
| 948 | if (!after_bootmem) | ||
| 949 | init_gbpages(); | ||
| 950 | |||
| 944 | #ifdef CONFIG_DEBUG_PAGEALLOC | 951 | #ifdef CONFIG_DEBUG_PAGEALLOC |
| 945 | /* | 952 | /* |
| 946 | * For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages. | 953 | * For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages. |
