Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 983f700e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents def8b72f bfafddd8

include/linux/compiler.h

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 
			long ______r;					\

			static struct ftrace_likely_data		\

				__aligned(4)				\

				__section("_ftrace_annotated_branch")	\

				__section(_ftrace_annotated_branch)	\

				______f = {				\

				.data.func = __func__,			\

				.data.file = __FILE__,			\
@@ -60,7 +60,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 
#define __trace_if_value(cond) ({			\

	static struct ftrace_branch_data		\

		__aligned(4)				\

		__section("_ftrace_branch")		\

		__section(_ftrace_branch)		\

		__if_trace = {				\

			.func = __func__,		\

			.file = __FILE__,		\
@@ -118,7 +118,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 
	".popsection\n\t"



/* Annotate a C jump table to allow objtool to follow the code flow */

#define __annotate_jump_table __section(".rodata..c_jump_table")

#define __annotate_jump_table __section(.rodata..c_jump_table)



#else

#define annotate_reachable()
@@ -298,7 +298,7 @@ unsigned long read_word_at_a_time(const void *addr) 
 * visible to the compiler.

 */

#define __ADDRESSABLE(sym) \

	static void * __section(".discard.addressable") __used \

	static void * __section(.discard.addressable) __used \

		__PASTE(__addressable_##sym, __LINE__) = (void *)&sym;



/**