Skip to content

Commit 983f700

Browse files
committed
Merge tag 'compiler-attributes-for-linus-v5.3-rc8' of git://github.com/ojeda/linux
Pull section attribute fix from Miguel Ojeda: "Fix Oops in Clang-compiled kernels (Nick Desaulniers)" * tag 'compiler-attributes-for-linus-v5.3-rc8' of git://github.com/ojeda/linux: include/linux/compiler.h: fix Oops for Clang-compiled kernels
2 parents def8b72 + bfafddd commit 983f700

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/linux/compiler.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
2424
long ______r; \
2525
static struct ftrace_likely_data \
2626
__aligned(4) \
27-
__section("_ftrace_annotated_branch") \
27+
__section(_ftrace_annotated_branch) \
2828
______f = { \
2929
.data.func = __func__, \
3030
.data.file = __FILE__, \
@@ -60,7 +60,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
6060
#define __trace_if_value(cond) ({ \
6161
static struct ftrace_branch_data \
6262
__aligned(4) \
63-
__section("_ftrace_branch") \
63+
__section(_ftrace_branch) \
6464
__if_trace = { \
6565
.func = __func__, \
6666
.file = __FILE__, \
@@ -118,7 +118,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
118118
".popsection\n\t"
119119

120120
/* Annotate a C jump table to allow objtool to follow the code flow */
121-
#define __annotate_jump_table __section(".rodata..c_jump_table")
121+
#define __annotate_jump_table __section(.rodata..c_jump_table)
122122

123123
#else
124124
#define annotate_reachable()
@@ -298,7 +298,7 @@ unsigned long read_word_at_a_time(const void *addr)
298298
* visible to the compiler.
299299
*/
300300
#define __ADDRESSABLE(sym) \
301-
static void * __section(".discard.addressable") __used \
301+
static void * __section(.discard.addressable) __used \
302302
__PASTE(__addressable_##sym, __LINE__) = (void *)&sym;
303303

304304
/**

0 commit comments

Comments
 (0)