git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
e820.h
diff --git
a/arch/x86/include/asm/e820.h
b/arch/x86/include/asm/e820.h
index
0e22296
..
ec8a52d
100644
(file)
--- a/
arch/x86/include/asm/e820.h
+++ b/
arch/x86/include/asm/e820.h
@@
-45,7
+45,12
@@
#define E820_NVS 4
#define E820_UNUSABLE 5
#define E820_NVS 4
#define E820_UNUSABLE 5
-/* reserved RAM used by kernel itself */
+/*
+ * reserved RAM used by kernel itself
+ * if CONFIG_INTEL_TXT is enabled, memory of this type will be
+ * included in the S3 integrity calculation and so should not include
+ * any memory that BIOS might alter over the S3 transition
+ */
#define E820_RESERVED_KERN 128
#ifndef __ASSEMBLY__
#define E820_RESERVED_KERN 128
#ifndef __ASSEMBLY__