Skip to content

Commit

Permalink
compiler.h: introduce __section()
Browse files Browse the repository at this point in the history
Add a new helper: __section() that makes a section definition
much shorter and more readable.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
Sam Ravnborg committed Jan 28, 2008
1 parent 01ba2bd commit f3fe866
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
5 changes: 5 additions & 0 deletions include/linux/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
#define __cold
#endif

/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
#endif

#endif /* __LINUX_COMPILER_H */
26 changes: 13 additions & 13 deletions include/linux/init.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@

/* These are for everybody (although not all archs will actually
discard it in modules) */
#define __init __attribute__ ((__section__ (".init.text"))) __cold
#define __initdata __attribute__ ((__section__ (".init.data")))
#define __exitdata __attribute__ ((__section__(".exit.data")))
#define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
#define __init __section(.init.text) __cold
#define __initdata __section(.init.data)
#define __exitdata __section(.exit.data)
#define __exit_call __attribute_used__ __section(.exitcall.exit)

/* modpost check for section mismatches during the kernel build.
* A section mismatch happens when there are references from a
Expand All @@ -55,14 +55,14 @@
* the init/exit section (code or data) is valid and will teach modpost
* not to issue a warning.
* The markers follow same syntax rules as __init / __initdata. */
#define __init_refok noinline __attribute__ ((__section__ (".text.init.refok")))
#define __initdata_refok __attribute__ ((__section__ (".data.init.refok")))
#define __exit_refok noinline __attribute__ ((__section__ (".exit.text.refok")))
#define __init_refok noinline __section(.text.init.refok)
#define __initdata_refok __section(.data.init.refok)
#define __exit_refok noinline __section(.exit.text.refok)

#ifdef MODULE
#define __exit __attribute__ ((__section__(".exit.text"))) __cold
#define __exit __section(.exit.text) __cold
#else
#define __exit __attribute_used__ __attribute__ ((__section__(".exit.text"))) __cold
#define __exit __attribute_used__ __section(.exit.text) __cold
#endif

/* For assembly routines */
Expand Down Expand Up @@ -142,11 +142,11 @@ void prepare_namespace(void);

#define console_initcall(fn) \
static initcall_t __initcall_##fn \
__attribute_used__ __attribute__((__section__(".con_initcall.init")))=fn
__attribute_used__ __section(.con_initcall.init)=fn

#define security_initcall(fn) \
static initcall_t __initcall_##fn \
__attribute_used__ __attribute__((__section__(".security_initcall.init"))) = fn
__attribute_used__ __section(.security_initcall.init) = fn

struct obs_kernel_param {
const char *str;
Expand All @@ -164,7 +164,7 @@ struct obs_kernel_param {
static char __setup_str_##unique_id[] __initdata __aligned(1) = str; \
static struct obs_kernel_param __setup_##unique_id \
__attribute_used__ \
__attribute__((__section__(".init.setup"))) \
__section(.init.setup) \
__attribute__((aligned((sizeof(long))))) \
= { __setup_str_##unique_id, fn, early }

Expand Down Expand Up @@ -242,7 +242,7 @@ void __init parse_early_param(void);
#endif

/* Data marked not to be saved by software suspend */
#define __nosavedata __attribute__ ((__section__ (".data.nosave")))
#define __nosavedata __section(.data.nosave)

/* This means "can be init if no module support, otherwise module load
may call it." */
Expand Down

0 comments on commit f3fe866

Please sign in to comment.