Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / x86 / kernel / microcode_core.c

diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 9371448..378e9a8 100644 (file)
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -210,8 +210,8 @@ static ssize_t microcode_write(struct file *file, const char __user *buf,
 {
        ssize_t ret = -EINVAL;
 
-       if ((len >> PAGE_SHIFT) > num_physpages) {
-               pr_err("microcode: too much data (max %ld pages)\n", num_physpages);
+       if ((len >> PAGE_SHIFT) > totalram_pages) {
+               pr_err("microcode: too much data (max %ld pages)\n", totalram_pages);
                return ret;
        }
 
@@ -236,7 +236,7 @@ static const struct file_operations microcode_fops = {
 static struct miscdevice microcode_dev = {
        .minor                  = MICROCODE_MINOR,
        .name                   = "microcode",
-       .devnode                = "cpu/microcode",
+       .nodename               = "cpu/microcode",
        .fops                   = &microcode_fops,
 };