diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:28:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:28:24 -0400 |
| commit | 3ae684e1c48e6deedc9b9faff8fa1c391ca8a652 (patch) | |
| tree | 07082b3239c24799e8aaf2e6a8a0ac059870d34a /arch/x86/include/asm | |
| parent | c4fd308ed62f292518363ea9c6c2adb3c2d95f9d (diff) | |
| parent | 4bd96a7a8185755b091233b16034c7436cbf57af (diff) | |
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, tboot: Add support for S3 memory integrity protection
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/e820.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 0e22296790d3..ec8a52d14ab1 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h | |||
| @@ -45,7 +45,12 @@ | |||
| 45 | #define E820_NVS 4 | 45 | #define E820_NVS 4 |
| 46 | #define E820_UNUSABLE 5 | 46 | #define E820_UNUSABLE 5 |
| 47 | 47 | ||
| 48 | /* reserved RAM used by kernel itself */ | 48 | /* |
| 49 | * reserved RAM used by kernel itself | ||
| 50 | * if CONFIG_INTEL_TXT is enabled, memory of this type will be | ||
| 51 | * included in the S3 integrity calculation and so should not include | ||
| 52 | * any memory that BIOS might alter over the S3 transition | ||
| 53 | */ | ||
| 49 | #define E820_RESERVED_KERN 128 | 54 | #define E820_RESERVED_KERN 128 |
| 50 | 55 | ||
| 51 | #ifndef __ASSEMBLY__ | 56 | #ifndef __ASSEMBLY__ |