Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: extend e820 early_res support 32bit -fix #5

Browse source 
reserve early numa kva, so it will not clash with new RAMDISK

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-05-29 12:58:37 -07:00 committed by Ingo Molnar
parent 163872950d
commit a5481280b2
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/kernel/setup_32.c
View file

@ -614,7 +614,6 @@ void __init setup_bootmem_allocator(void)
*/ */
find_smp_config(); find_smp_config();
#endif #endif
numa_kva_reserve();
reserve_crashkernel(); reserve_crashkernel();
reserve_ibft_region(); reserve_ibft_region();

12
arch/x86/mm/discontig_32.c
View file

@ -357,6 +357,11 @@ unsigned long __init setup_memory(void)
printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n", printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n",
kva_start_pfn, max_low_pfn); kva_start_pfn, max_low_pfn);
printk("max_pfn = %ld\n", max_pfn); printk("max_pfn = %ld\n", max_pfn);
/* avoid clash with initrd */
reserve_early(kva_start_pfn<<PAGE_SHIFT,
(kva_start_pfn + kva_pages)<<PAGE_SHIFT,
"KVA PG");
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
highstart_pfn = highend_pfn = max_pfn; highstart_pfn = highend_pfn = max_pfn;
if (max_pfn > system_max_low_pfn) if (max_pfn > system_max_low_pfn)
@ -392,13 +397,6 @@ unsigned long __init setup_memory(void)
return max_low_pfn; return max_low_pfn;
} }
void __init numa_kva_reserve(void)
{
if (kva_pages)
reserve_bootmem(PFN_PHYS(kva_start_pfn), PFN_PHYS(kva_pages),
BOOTMEM_DEFAULT);
}
void __init zone_sizes_init(void) void __init zone_sizes_init(void)
{ {
int nid; int nid;

4
include/asm-x86/mmzone_32.h
View file

@ -38,16 +38,12 @@ static inline void get_memcfg_numa(void)
} }
extern int early_pfn_to_nid(unsigned long pfn); extern int early_pfn_to_nid(unsigned long pfn);
extern void numa_kva_reserve(void);
#else /* !CONFIG_NUMA */ #else /* !CONFIG_NUMA */
#define get_memcfg_numa get_memcfg_numa_flat #define get_memcfg_numa get_memcfg_numa_flat
#define get_zholes_size(n) (0) #define get_zholes_size(n) (0)
static inline void numa_kva_reserve(void)
{
}
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
#ifdef CONFIG_DISCONTIGMEM #ifdef CONFIG_DISCONTIGMEM