summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFenghua Yu <fenghua.yu@intel.com>2006-12-09 01:06:01 +0100
committerTony Luck <tony.luck@intel.com>2007-01-30 00:25:49 +0100
commite9ef08bdc189e98610bc4b9a6e6f19bc3793b2c8 (patch)
tree1814d4bd64fd1c0a3f6401a5b57b8696ed9369c8
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff)
downloadlinux-e9ef08bdc189e98610bc4b9a6e6f19bc3793b2c8.tar.xz
linux-e9ef08bdc189e98610bc4b9a6e6f19bc3793b2c8.zip
[IA64] Itanium MC Error Injection Tool: Kernel configuration
This patch has kenrel configuration changes for the MC Error Injection Tool. Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/Kconfig10
-rw-r--r--arch/ia64/defconfig1
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index fcacfe291b9b..f1e7cc1389b0 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -429,6 +429,16 @@ config IA64_PALINFO
To use this option, you have to ensure that the "/proc file system
support" (CONFIG_PROC_FS) is enabled, too.
+config IA64_MC_ERR_INJECT
+ tristate "MC error injection support"
+ help
+ Selets whether support for MC error injection. By enabling the
+ support, kernel provide sysfs interface for user application to
+ call MC error injection PAL procedure to inject various errors.
+ This is a useful tool for MCA testing.
+
+ If you're unsure, do not select this option.
+
config SGI_SN
def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 9001b3fbaa32..327e1f511f8c 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -144,6 +144,7 @@ CONFIG_COMPAT=y
CONFIG_IA64_MCA_RECOVERY=y
CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y
+# CONFIG_MC_ERR_INJECT is not set
CONFIG_SGI_SN=y
#