Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan...

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / palinfo.c

diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 9dc00f7fe10e8f6c08cccaa37df20c6eba739e4f..a4f19c70aadd39d95878740ecc92905c94d4270e 100644 (file)
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -921,7 +921,7 @@ int palinfo_handle_smp(pal_func_cpu_u_t *f, char *page)
 
 
        /* will send IPI to other CPU and wait for completion of remote call */
-       if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 0, 1))) {
+       if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 1))) {
                printk(KERN_ERR "palinfo: remote CPU call from %d to %d on function %d: "
                       "error %d\n", smp_processor_id(), f->req_cpu, f->func_id, ret);
                return 0;
@@ -1002,8 +1002,6 @@ create_palinfo_proc_entries(unsigned int cpu)
                *pdir = create_proc_read_entry(
                                palinfo_entries[j].name, 0, cpu_dir,
                                palinfo_read_entry, (void *)f.value);
-               if (*pdir)
-                       (*pdir)->owner = THIS_MODULE;
                pdir++;
        }
 }