hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: pre-initialize boot_cpu_data.x86_phys_bits to avoid system_state tests 

Impact: cleanup, micro-optimization

Pre-initialize boot_cpu_data.x86_phys_bits to a reasonable default
to remove the use of system_state tests in __virt_addr_valid()
and __phys_addr().

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jeremy Fitzhardinge 2009-03-04 16:16:51 -08:00 committed by Ingo Molnar
parent dc16ecf7fd
commit ed26dbe5ae
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,9 @@ struct ist_info ist_info;
#endif #endif
#else #else
struct cpuinfo_x86 boot_cpu_data __read_mostly; struct cpuinfo_x86 boot_cpu_data __read_mostly = {
.x86_phys_bits = MAX_PHYSMEM_BITS,
};
EXPORT_SYMBOL(boot_cpu_data); EXPORT_SYMBOL(boot_cpu_data);
#endif #endif

7
arch/x86/mm/ioremap.c
View File

@ -38,8 +38,7 @@ unsigned long __phys_addr(unsigned long x)
} else { } else {
VIRTUAL_BUG_ON(x < PAGE_OFFSET); VIRTUAL_BUG_ON(x < PAGE_OFFSET);
x -= PAGE_OFFSET; x -= PAGE_OFFSET;
VIRTUAL_BUG_ON(system_state == SYSTEM_BOOTING ? x > MAXMEM : VIRTUAL_BUG_ON(!phys_addr_valid(x));
!phys_addr_valid(x));
} }
return x; return x;
} }
@ -56,10 +55,8 @@ bool __virt_addr_valid(unsigned long x)
if (x < PAGE_OFFSET) if (x < PAGE_OFFSET)
return false; return false;
x -= PAGE_OFFSET; x -= PAGE_OFFSET;
if (system_state == SYSTEM_BOOTING ? if (!phys_addr_valid(x))
x > MAXMEM : !phys_addr_valid(x)) {
return false; return false;
}
} }
return pfn_valid(x >> PAGE_SHIFT); return pfn_valid(x >> PAGE_SHIFT);