diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/include/asm/idmap.h | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/include/asm/idmap.h')
| -rw-r--r-- | arch/arm/include/asm/idmap.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/include/asm/idmap.h b/arch/arm/include/asm/idmap.h new file mode 100644 index 00000000000..bf863edb517 --- /dev/null +++ b/arch/arm/include/asm/idmap.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | #ifndef __ASM_IDMAP_H | ||
| 2 | #define __ASM_IDMAP_H | ||
| 3 | |||
| 4 | #include <linux/compiler.h> | ||
| 5 | #include <asm/pgtable.h> | ||
| 6 | |||
| 7 | /* Tag a function as requiring to be executed via an identity mapping. */ | ||
| 8 | #define __idmap __section(.idmap.text) noinline notrace | ||
| 9 | |||
| 10 | extern pgd_t *idmap_pgd; | ||
| 11 | |||
| 12 | void setup_mm_for_reboot(void); | ||
| 13 | |||
| 14 | #endif /* __ASM_IDMAP_H */ | ||