diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2011-11-22 17:30:28 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2011-12-08 10:30:37 +0000 |
| commit | 136848d4ca9cf6f08edf6e50cb9bbe19de55c32a (patch) | |
| tree | 9b4b311b64f40afb2028db988710f3500e3995cf /arch/arm/mm/fault.h | |
| parent | e0c0313bd720977a7ed01dc48f0762a3ddec607f (diff) | |
| download | op-kernel-dev-136848d4ca9cf6f08edf6e50cb9bbe19de55c32a.zip op-kernel-dev-136848d4ca9cf6f08edf6e50cb9bbe19de55c32a.tar.gz | |
ARM: LPAE: Move the FSR definitions to separate files
The FSR structure is different with LPAE and this patch moves the
classic MMU specific definition to a separate fsr-2level.c file that is
included in fault.c. It also moves the fsr_fs and FSR bits to the
fault.h file.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/mm/fault.h')
| -rw-r--r-- | arch/arm/mm/fault.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h index 49e9e38..25b45c1 100644 --- a/arch/arm/mm/fault.h +++ b/arch/arm/mm/fault.h @@ -1,3 +1,20 @@ -void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs); +#ifndef __ARCH_ARM_FAULT_H +#define __ARCH_ARM_FAULT_H + +/* + * Fault status register encodings. We steal bit 31 for our own purposes. + */ +#define FSR_LNX_PF (1 << 31) +#define FSR_WRITE (1 << 11) +#define FSR_FS4 (1 << 10) +#define FSR_FS3_0 (15) + +static inline int fsr_fs(unsigned int fsr) +{ + return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6; +} +void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs); unsigned long search_exception_table(unsigned long addr); + +#endif /* __ARCH_ARM_FAULT_H */ |
