diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/x86/include/asm/fixmap.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/x86/include/asm/fixmap.h')
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 7b2d71df39a6..14f9890eb495 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h | |||
| @@ -132,6 +132,9 @@ enum fixed_addresses { | |||
| 132 | #ifdef CONFIG_X86_32 | 132 | #ifdef CONFIG_X86_32 |
| 133 | FIX_WP_TEST, | 133 | FIX_WP_TEST, |
| 134 | #endif | 134 | #endif |
| 135 | #ifdef CONFIG_INTEL_TXT | ||
| 136 | FIX_TBOOT_BASE, | ||
| 137 | #endif | ||
| 135 | __end_of_fixed_addresses | 138 | __end_of_fixed_addresses |
| 136 | }; | 139 | }; |
| 137 | 140 | ||