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

x86, 32-bit: also use cpuinfo_x86's x86_{phys,virt}_bits members

Browse Source 
Impact: 32/64-bit consolidation

In a first step, this allows fixing phys_addr_valid() for PAE (which
until now reported all addresses to be valid). Subsequently, this will
also allow simplifying some MTRR handling code.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
LKML-Reference: <49B9101E.76E4.0078.0@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jan Beulich
2009-03-12 12:37:34 +00:00
committed by Ingo Molnar
parent 46d50c98d9
commit 13c6c53282
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,13 +22,17 @@
#include <asm/pgalloc.h>
#include <asm/pat.h>
#ifdef CONFIG_X86_64
static inline int phys_addr_valid(unsigned long addr)
static inline int phys_addr_valid(resource_size_t addr)
{
return addr < (1UL << boot_cpu_data.x86_phys_bits);
#ifdef CONFIG_PHYS_ADDR_T_64BIT
return !(addr >> boot_cpu_data.x86_phys_bits);
#else
return 1;
#endif
}
#ifdef CONFIG_X86_64
unsigned long __phys_addr(unsigned long x)
{
if (x >= __START_KERNEL_map) {
@@ -65,11 +69,6 @@ EXPORT_SYMBOL(__virt_addr_valid);
#else
static inline int phys_addr_valid(unsigned long addr)
{
return 1;
}
#ifdef CONFIG_DEBUG_VIRTUAL
unsigned long __phys_addr(unsigned long x)
{