Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6] / kernel / softlockup.c

diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index dabebac50868fb7aab936cbfe3378654f78ad7a3..14c7faf02909e8e4879a057406416a43a34b3fdf 100644 (file)
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -104,7 +104,7 @@ static int watchdog(void * __bind_cpu)
 /*
  * Create/destroy watchdog threads as CPUs come and go:
  */
-static int __devinit
+static int
 cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
        int hotcpu = (unsigned long)hcpu;