From 91455a650716b8cb6b44b1abd42c13e6e02cbee2 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 26 Jun 2006 13:58:59 +0200 Subject: [PATCH] --- yaml --- r: 30506 b: refs/heads/master c: b633237e9c1b91b86c431c5d41266b47408b4642 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/mce_amd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ad0eb15110fb..f02a58c8f19f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2903ee85ce462d66955b800a0c48e26e51de0aae +refs/heads/master: b633237e9c1b91b86c431c5d41266b47408b4642 diff --git a/trunk/arch/x86_64/kernel/mce_amd.c b/trunk/arch/x86_64/kernel/mce_amd.c index 3f967d4fe199..335200aa2737 100644 --- a/trunk/arch/x86_64/kernel/mce_amd.c +++ b/trunk/arch/x86_64/kernel/mce_amd.c @@ -636,7 +636,7 @@ static void threshold_remove_device(unsigned int cpu) #endif /* get notified when a cpu comes on/off */ -static int threshold_cpu_callback(struct notifier_block *nfb, +static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { /* cpu was unsigned int to begin with */ @@ -659,7 +659,7 @@ static int threshold_cpu_callback(struct notifier_block *nfb, return NOTIFY_OK; } -static struct notifier_block threshold_cpu_notifier = { +static struct notifier_block threshold_cpu_notifier __cpuinitdata = { .notifier_call = threshold_cpu_callback, };