forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: mm: introduce helper function in fault.c

Browse source 
Impact: cleanup

Introduce helper function fault_in_kernel_address() to make editors happy.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Hiroshi Shimamoto 2009-02-04 15:24:09 -08:00 • committed by H. Peter Anvin
parent 010060741a
commit 0973a06cde
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
arch/x86/mm/fault.c
View file

@ -775,6 +775,15 @@ static inline int access_error(unsigned long error_code, int write,
return 0; return 0;
} }
static int fault_in_kernel_space(unsigned long address)
{
#ifdef CONFIG_X86_32
return address >= TASK_SIZE;
#else /* !CONFIG_X86_32 */
return address >= TASK_SIZE64;
#endif /* CONFIG_X86_32 */
}
/* /*
* This routine handles page faults. It determines the address, * This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate * and the problem, and then passes it off to one of the appropriate
@ -817,11 +826,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
* (error_code & 4) == 0, and that the fault was not a * (error_code & 4) == 0, and that the fault was not a
* protection error (error_code & 9) == 0. * protection error (error_code & 9) == 0.
*/ */
#ifdef CONFIG_X86_32 if (unlikely(fault_in_kernel_space(address))) {
if (unlikely(address >= TASK_SIZE)) {
#else
if (unlikely(address >= TASK_SIZE64)) {
#endif
if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) && if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) &&
vmalloc_fault(address) >= 0) vmalloc_fault(address) >= 0)
return; return;