aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/Makefile3
-rw-r--r--arch/x86/kernel/check.c12
2 files changed, 6 insertions, 9 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 31fbcaf3df7..f63a8034fb8 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -35,7 +35,6 @@ obj-y += bootflag.o e820.o
obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
obj-y += alternative.o i8253.o pci-nommu.o
obj-y += tsc.o io_delay.o rtc.o
-obj-y += check.o
obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
obj-y += process.o
@@ -105,6 +104,8 @@ microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o
microcode-$(CONFIG_MICROCODE_AMD) += microcode_amd.o
obj-$(CONFIG_MICROCODE) += microcode.o
+obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
+
###
# 64 bit specific files
ifeq ($(CONFIG_X86_64),y)
diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c
index 55eed1752b4..2ac0ab71412 100644
--- a/arch/x86/kernel/check.c
+++ b/arch/x86/kernel/check.c
@@ -11,7 +11,6 @@
* remaining free memory in that area and fill it with a distinct
* pattern.
*/
-#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
#define MAX_SCAN_AREAS 8
static int __read_mostly memory_corruption_check = -1;
@@ -23,7 +22,7 @@ static struct e820entry scan_areas[MAX_SCAN_AREAS];
static int num_scan_areas;
-static int set_corruption_check(char *arg)
+static __init int set_corruption_check(char *arg)
{
char *end;
@@ -33,7 +32,7 @@ static int set_corruption_check(char *arg)
}
early_param("memory_corruption_check", set_corruption_check);
-static int set_corruption_check_period(char *arg)
+static __init int set_corruption_check_period(char *arg)
{
char *end;
@@ -43,7 +42,7 @@ static int set_corruption_check_period(char *arg)
}
early_param("memory_corruption_check_period", set_corruption_check_period);
-static int set_corruption_check_size(char *arg)
+static __init int set_corruption_check_size(char *arg)
{
char *end;
unsigned size;
@@ -115,8 +114,6 @@ void check_for_bios_corruption(void)
int i;
int corruption = 0;
- printk("dot\n");
-
if (!memory_corruption_check)
return;
@@ -134,7 +131,7 @@ void check_for_bios_corruption(void)
}
}
- WARN(corruption, KERN_ERR "Memory corruption detected in low memory\n");
+ WARN_ONCE(corruption, KERN_ERR "Memory corruption detected in low memory\n");
}
static void check_corruption(struct work_struct *dummy);
@@ -161,5 +158,4 @@ static int start_periodic_check_for_corruption(void)
}
module_init(start_periodic_check_for_corruption);
-#endif