lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/printk' and 'core/misc' into core-v28-for-linus

Browse Source
This commit is contained in:
Ingo Molnar
2008-10-15 12:48:44 +02:00
parent 278429cff8 3b7ecb5d2f 77af7e3403 15160716ee 1fa63a817d 8546232355
commit 6b2ada8210
26 changed files with 144 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/e820.c
View File

@ -1282,12 +1282,10 @@ void __init e820_reserve_resources(void)
e820_res = res;
for (i = 0; i < e820.nr_map; i++) {
end = e820.map[i].addr + e820.map[i].size - 1;
#ifndef CONFIG_RESOURCES_64BIT
if (end > 0x100000000ULL) {
if (end != (resource_size_t)end) {
res++;
continue;
}
#endif
res->name = e820_type_to_string(e820.map[i].type);
res->start = e820.map[i].addr;
res->end = end;