From 3e81e9e01c0249a28bba710e2da9038582eeb009 Mon Sep 17 00:00:00 2001 From: Satyam Sharma Date: Wed, 17 Oct 2007 18:04:36 +0200 Subject: [PATCH] --- yaml --- r: 70976 b: refs/heads/master c: 1e32b073f372f0fe903c4474fbd47c2ac61428c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpuid.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 79d020661203..c18c3c9df307 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 761c4bf821b67334e2391ef968396069b91801b7 +refs/heads/master: 1e32b073f372f0fe903c4474fbd47c2ac61428c8 diff --git a/trunk/arch/x86/kernel/cpuid.c b/trunk/arch/x86/kernel/cpuid.c index f4548c93ccf5..dffb102fb8c7 100644 --- a/trunk/arch/x86/kernel/cpuid.c +++ b/trunk/arch/x86/kernel/cpuid.c @@ -150,7 +150,7 @@ static const struct file_operations cpuid_fops = { .open = cpuid_open, }; -static int cpuid_device_create(int i) +static int __cpuinit cpuid_device_create(int i) { int err = 0; struct device *dev; @@ -161,7 +161,9 @@ static int cpuid_device_create(int i) return err; } -static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) +static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb, + unsigned long action, + void *hcpu) { unsigned int cpu = (unsigned long)hcpu;