diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-30 11:08:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-30 11:08:25 +0100 |
| commit | a5d00dc3a4b65ed38249f3225e453944c633747b (patch) | |
| tree | 6249ca5a5f13059f42890525a9ea7133778f3891 /arch/x86/kernel/setup.c | |
| parent | 1a8506d4402b6e96c2ed778dc7ccbb48d1e02fce (diff) | |
| parent | 0914f7961babbf28aaa2f19b453951fb4841c03f (diff) | |
| download | op-kernel-dev-a5d00dc3a4b65ed38249f3225e453944c633747b.zip op-kernel-dev-a5d00dc3a4b65ed38249f3225e453944c633747b.tar.gz | |
Merge branch 'for-linus' into for-next
... for migrating the core changes for USB-audio disconnection fixes
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a2bb18e..468e98d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -920,8 +920,21 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_X86_64 if (max_pfn > max_low_pfn) { - max_pfn_mapped = init_memory_mapping(1UL<<32, - max_pfn<<PAGE_SHIFT); + int i; + for (i = 0; i < e820.nr_map; i++) { + struct e820entry *ei = &e820.map[i]; + + if (ei->addr + ei->size <= 1UL << 32) + continue; + + if (ei->type == E820_RESERVED) + continue; + + max_pfn_mapped = init_memory_mapping( + ei->addr < 1UL << 32 ? 1UL << 32 : ei->addr, + ei->addr + ei->size); + } + /* can we preseve max_low_pfn ?*/ max_low_pfn = max_pfn; } |
