Commit 926721e9 authored by Kamezawa Hiroyuki's avatar Kamezawa Hiroyuki Committed by Linus Torvalds

[PATCH] no buddy bitmap patch revist: for ia64

This patch is for ia64 kernel, and defines CONFIG_HOLES_IN_ZONE in
arch/ia64/Kconfig.  IA64 has memory holes smaller than its MAX_ORDER and
its virtual memmap allows holes in a zone's memmap.

This patch makes vmemmap aligned with IA64_GRANULE_SIZE in
arch/ia64/mm/init.c.
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 69fba2dd
...@@ -182,6 +182,10 @@ config VIRTUAL_MEM_MAP ...@@ -182,6 +182,10 @@ config VIRTUAL_MEM_MAP
require the DISCONTIGMEM option for your machine. If you are require the DISCONTIGMEM option for your machine. If you are
unsure, say Y. unsure, say Y.
config HOLES_IN_ZONE
bool
default y if VIRTUAL_MEM_MAP
config DISCONTIGMEM config DISCONTIGMEM
bool "Discontiguous memory support" bool "Discontiguous memory support"
depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1) && NUMA && VIRTUAL_MEM_MAP depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1) && NUMA && VIRTUAL_MEM_MAP
......
...@@ -432,7 +432,6 @@ virtual_memmap_init (u64 start, u64 end, void *arg) ...@@ -432,7 +432,6 @@ virtual_memmap_init (u64 start, u64 end, void *arg)
struct page *map_start, *map_end; struct page *map_start, *map_end;
args = (struct memmap_init_callback_data *) arg; args = (struct memmap_init_callback_data *) arg;
map_start = vmem_map + (__pa(start) >> PAGE_SHIFT); map_start = vmem_map + (__pa(start) >> PAGE_SHIFT);
map_end = vmem_map + (__pa(end) >> PAGE_SHIFT); map_end = vmem_map + (__pa(end) >> PAGE_SHIFT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment