[PATCH] fix compile breakage caused by linux/smp.h header definition problem

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The problem is this:

  CC      arch/parisc/kernel/asm-offsets.s
In file included from include/linux/sched.h:71,
                 from arch/parisc/kernel/asm-offsets.c:31:
include/linux/smp.h:117: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'setup_nr_cpu_ids'
include/linux/smp.h:118: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'smp_init'
  HOSTLD  scripts/mod/modpost
make[1]: *** [arch/parisc/kernel/asm-offsets.s] Error 1

It's caused by two __init attributes on function prototypes, which
shouldn't be there (__init should only mark functions not prototypes).
This was introduced by

commit 34db18a054c600b6f81787165669dc572fe4de25
Author: Amerigo Wang <amwang@xxxxxxxxxx>
Date:   Tue Mar 22 16:34:06 2011 -0700

    smp: move smp setup functions to kernel/smp.c

Removing the spurious __init attributes fixes this

Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

---

We didn't pick this up in our -next compiles, presumably because the
patch moved rather fast from -next to mainline?

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 48159dd..04d6e0d 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -114,8 +114,8 @@ int on_each_cpu(smp_call_func_t func, void *info, int wait);
 void smp_prepare_boot_cpu(void);
 
 extern unsigned int setup_max_cpus;
-extern void __init setup_nr_cpu_ids(void);
-extern void __init smp_init(void);
+extern void setup_nr_cpu_ids(void);
+extern void smp_init(void);
 
 #else /* !SMP */
 


--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux SoC]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux