kernel.h: drop inclusion in bitmap.h

[linux-2.6-microblaze.git] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index 31f54de..045ad16 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -47,7 +47,7 @@
 
 /* These are for everybody (although not all archs will actually
    discard it in modules) */
-#define __init         __section(".init.text") __cold  __latent_entropy __noinitretpoline
+#define __init         __section(".init.text") __cold  __latent_entropy __noinitretpoline __nocfi
 #define __initdata     __section(".init.data")
 #define __initconst    __section(".init.rodata")
 #define __exitdata     __section(".exit.data")
@@ -220,8 +220,8 @@ extern bool initcall_debug;
        __initcall_name(initstub, __iid, id)
 
 #define __define_initcall_stub(__stub, fn)                     \
-       int __init __stub(void);                                \
-       int __init __stub(void)                                 \
+       int __init __cficanonical __stub(void);                 \
+       int __init __cficanonical __stub(void)                  \
        {                                                       \
                return fn();                                    \
        }                                                       \