diff --git a/[refs] b/[refs] index f43b1d2b1f6c..1ef1ffa62ac6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 761bb431908e84d1793c5eb6c2ae2cc4926bed3e +refs/heads/master: 38048983e14c0fb6324175fbaf2be1baa842f5ee diff --git a/trunk/arch/x86/kernel/msr.c b/trunk/arch/x86/kernel/msr.c index e0d5e82e64b3..e18e516cf549 100644 --- a/trunk/arch/x86/kernel/msr.c +++ b/trunk/arch/x86/kernel/msr.c @@ -133,7 +133,7 @@ static const struct file_operations msr_fops = { .open = msr_open, }; -static int msr_device_create(int cpu) +static int __cpuinit msr_device_create(int cpu) { struct device *dev;