IA64: SPARSEMEM_VMEMMAP 16K page size support
Equip IA64 sparsemem with a virtual memmap. This is similar to the existing CONFIG_VIRTUAL_MEM_MAP functionality for DISCONTIGMEM. It uses a PAGE_SIZE mapping. This is provided as a minimally intrusive solution. We split the 128TB VMALLOC area into two 64TB areas and use one for the virtual memmap. This should replace CONFIG_VIRTUAL_MEM_MAP long term. [apw@shadowen.org: convert to new helper based initialisation] Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andy Whitcroft <apw@shadowen.org> Acked-by: Mel Gorman <mel@csn.ul.ie> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>hifive-unleashed-5.1
parent
0889eba5b3
commit
ef229c5a5e
|
@ -348,6 +348,7 @@ config ARCH_FLATMEM_ENABLE
|
||||||
config ARCH_SPARSEMEM_ENABLE
|
config ARCH_SPARSEMEM_ENABLE
|
||||||
def_bool y
|
def_bool y
|
||||||
depends on ARCH_DISCONTIGMEM_ENABLE
|
depends on ARCH_DISCONTIGMEM_ENABLE
|
||||||
|
select SPARSEMEM_VMEMMAP_ENABLE
|
||||||
|
|
||||||
config ARCH_DISCONTIGMEM_DEFAULT
|
config ARCH_DISCONTIGMEM_DEFAULT
|
||||||
def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)
|
def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)
|
||||||
|
|
|
@ -715,3 +715,11 @@ void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)
|
||||||
scatter_node_data();
|
scatter_node_data();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
||||||
|
int __meminit vmemmap_populate(struct page *start_page,
|
||||||
|
unsigned long size, int node)
|
||||||
|
{
|
||||||
|
return vmemmap_populate_basepages(start_page, size, node);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -236,8 +236,14 @@ ia64_phys_addr_valid (unsigned long addr)
|
||||||
# define VMALLOC_END vmalloc_end
|
# define VMALLOC_END vmalloc_end
|
||||||
extern unsigned long vmalloc_end;
|
extern unsigned long vmalloc_end;
|
||||||
#else
|
#else
|
||||||
|
#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_SPARSEMEM_VMEMMAP)
|
||||||
|
/* SPARSEMEM_VMEMMAP uses half of vmalloc... */
|
||||||
|
# define VMALLOC_END (RGN_BASE(RGN_GATE) + (1UL << (4*PAGE_SHIFT - 10)))
|
||||||
|
# define vmemmap ((struct page *)VMALLOC_END)
|
||||||
|
#else
|
||||||
# define VMALLOC_END (RGN_BASE(RGN_GATE) + (1UL << (4*PAGE_SHIFT - 9)))
|
# define VMALLOC_END (RGN_BASE(RGN_GATE) + (1UL << (4*PAGE_SHIFT - 9)))
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* fs/proc/kcore.c */
|
/* fs/proc/kcore.c */
|
||||||
#define kc_vaddr_to_offset(v) ((v) - RGN_BASE(RGN_GATE))
|
#define kc_vaddr_to_offset(v) ((v) - RGN_BASE(RGN_GATE))
|
||||||
|
|
Loading…
Reference in New Issue