aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Pala <gotar@polanet.pl>2014-11-02 05:22:12 -0500
committerBorislav Petkov <bp@suse.de>2014-11-05 09:54:34 -0500
commitf5b10c45ef80c0630ed5318a386da65dde0a1582 (patch)
tree7c517cc1c00fb4f816fa9760b52b9fd1839c57d2
parentbc4febe93c2fd7d0e74dad773bad2ed0237780ee (diff)
amd64_edac: Build module on x86-32
By popular demand, enable amd64_edac on 32-bit too. Boris: - update Kconfig text. - add a warning on load which states that 32-bit configurations are unsupported. Signed-off-by: Tomasz Pala <gotar@polanet.pl> Link: http://lkml.kernel.org/r/20141102102212.GA7034@polanet.pl Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r--drivers/edac/Kconfig6
-rw-r--r--drivers/edac/amd64_edac.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 7072c2892d63..4316c9e955b3 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -105,11 +105,11 @@ config EDAC_GHES
105 In doubt, say 'Y'. 105 In doubt, say 'Y'.
106 106
107config EDAC_AMD64 107config EDAC_AMD64
108 tristate "AMD64 (Opteron, Athlon64) K8, F10h" 108 tristate "AMD64 (Opteron, Athlon64)"
109 depends on EDAC_MM_EDAC && AMD_NB && X86_64 && EDAC_DECODE_MCE 109 depends on EDAC_MM_EDAC && AMD_NB && EDAC_DECODE_MCE
110 help 110 help
111 Support for error detection and correction of DRAM ECC errors on 111 Support for error detection and correction of DRAM ECC errors on
112 the AMD64 families of memory controllers (K8 and F10h) 112 the AMD64 families (>= K8) of memory controllers.
113 113
114config EDAC_AMD64_ERROR_INJECTION 114config EDAC_AMD64_ERROR_INJECTION
115 bool "Sysfs HW Error injection facilities" 115 bool "Sysfs HW Error injection facilities"
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 1a1d7c43a20f..17638d7cf5c2 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3035,6 +3035,11 @@ static int __init amd64_edac_init(void)
3035 goto err_no_instances; 3035 goto err_no_instances;
3036 3036
3037 setup_pci_device(); 3037 setup_pci_device();
3038
3039#ifdef CONFIG_X86_32
3040 amd64_err("%s on 32-bit is unsupported. USE AT YOUR OWN RISK!\n", EDAC_MOD_STR);
3041#endif
3042
3038 return 0; 3043 return 0;
3039 3044
3040err_no_instances: 3045err_no_instances: