1 files changed, 3 insertions, 2 deletions

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 83e85c2e802a..42f28c7420e1 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -107,7 +107,7 @@ static struct mdesc_handle * __init mdesc_memblock_alloc(unsigned int mdesc_size
         return hp;
 }
 
-static void mdesc_memblock_free(struct mdesc_handle *hp)
+static void __init mdesc_memblock_free(struct mdesc_handle *hp)
 {
         unsigned int alloc_size;
         unsigned long start;
@@ -768,7 +768,7 @@ static void * __cpuinit mdesc_iterate_over_cpus(void *(*func)(struct mdesc_handl
                                cpuid, NR_CPUS);
                         continue;
                 }
-                if (!cpu_isset(cpuid, *mask))
+                if (!cpumask_test_cpu(cpuid, mask))
                         continue;
 #endif
 
@@ -890,6 +890,7 @@ static ssize_t mdesc_read(struct file *file, char __user *buf,
 static const struct file_operations mdesc_fops = {
         .read   = mdesc_read,
         .owner  = THIS_MODULE,
+        .llseek = noop_llseek,
 };
 
 static struct miscdevice mdesc_misc = {