git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for_paulus
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
microcode.c
diff --git
a/arch/i386/kernel/microcode.c
b/arch/i386/kernel/microcode.c
index
47ffec5
..
381252b
100644
(file)
--- a/
arch/i386/kernel/microcode.c
+++ b/
arch/i386/kernel/microcode.c
@@
-451,7
+451,7
@@
static ssize_t microcode_write (struct file *file, const char __user *buf, size_
return ret;
}
return ret;
}
-static struct file_operations microcode_fops = {
+static
const
struct file_operations microcode_fops = {
.owner = THIS_MODULE,
.write = microcode_write,
.open = microcode_open,
.owner = THIS_MODULE,
.write = microcode_write,
.open = microcode_open,
@@
-722,7
+722,7
@@
mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
return NOTIFY_OK;
}
-static struct notifier_block mc_cpu_notifier = {
+static struct notifier_block
__cpuinitdata
mc_cpu_notifier = {
.notifier_call = mc_cpu_callback,
};
.notifier_call = mc_cpu_callback,
};