[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1296067042-13485-1-git-send-email-shane.wang@intel.com>
Date: Thu, 27 Jan 2011 02:37:22 +0800
From: Shane Wang <shane.wang@...el.com>
To: linux-kernel@...r.kernel.org, tboot-devel@...ts.sourceforge.net
Cc: jonmccune@....edu, joseph.cihula@...el.com, shane.wang@...el.com
Subject: [PATCH] intel_txt: Add more explicit dependencies for CONFIG_INTEL_TXT
This patch is to follow the recommended way in kconfig-language.txt to use HAVE_INTEL_TXT, so to add more explicit dependencies for CONFIG_INTEL_TXT.
Signed-off-by: Jonathan McCune <jonmccune@....edu>
Signed-off-by: Shane Wang <shane.wang@...el.com>
---
arch/x86/Kconfig | 5 +----
security/Kconfig | 5 ++++-
2 files changed, 5 insertions(+), 5 deletions(-)
diff -r 2ec3d14a1901 arch/x86/Kconfig
--- a/arch/x86/Kconfig Thu Jan 27 00:23:42 2011 +0800
+++ b/arch/x86/Kconfig Thu Jan 27 00:44:49 2011 +0800
@@ -65,6 +65,7 @@
select HAVE_SPARSE_IRQ
select GENERIC_IRQ_PROBE
select GENERIC_PENDING_IRQ if SMP
+ select HAVE_INTEL_TXT
config INSTRUCTION_DECODER
def_bool (KPROBES || PERF_EVENTS)
@@ -199,10 +200,6 @@
config ARCH_SUPPORTS_DEBUG_PAGEALLOC
def_bool y
-config HAVE_INTEL_TXT
- def_bool y
- depends on EXPERIMENTAL && DMAR && ACPI
-
config USE_GENERIC_SMP_HELPERS
def_bool y
depends on SMP
diff -r 2ec3d14a1901 security/Kconfig
--- a/security/Kconfig Thu Jan 27 00:23:42 2011 +0800
+++ b/security/Kconfig Thu Jan 27 00:44:49 2011 +0800
@@ -103,9 +103,12 @@
implement pathname based access controls.
If you are unsure how to answer this question, answer N.
+config HAVE_INTEL_TXT
+ bool
+
config INTEL_TXT
bool "Enable Intel(R) Trusted Execution Technology (Intel(R) TXT)"
- depends on HAVE_INTEL_TXT
+ depends on HAVE_INTEL_TXT && EXPERIMENTAL && DMAR && ACPI
help
This option enables support for booting the kernel with the
Trusted Boot (tboot) module. This will utilize
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists