Commit f4f6a2e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'compiler-attributes-for-linus-v5.11' of git://github.com/ojeda/linux 

Pull ENABLE_MUST_CHECK removal from Miguel Ojeda:
 "Remove CONFIG_ENABLE_MUST_CHECK (Masahiro Yamada)"

Note that this removes the config option by making the must-check
unconditional, not by removing must check itself.

* tag 'compiler-attributes-for-linus-v5.11' of git://github.com/ojeda/linux:
  Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK
parents e71ba945 19679394

include/linux/compiler_attributes.h

+6 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ 
 */

#define __used                          __attribute__((__used__))



/*

 *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-warn_005funused_005fresult-function-attribute

 * clang: https://clang.llvm.org/docs/AttributeReference.html#nodiscard-warn-unused-result

 */

#define __must_check                    __attribute__((__warn_unused_result__))



/*

 *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-weak-function-attribute

 *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html#index-weak-variable-attribute

include/linux/compiler_types.h

+0 −6
Original line number Diff line number Diff line
@@ -121,12 +121,6 @@ struct ftrace_likely_data { 
	unsigned long			constant;

};



#ifdef CONFIG_ENABLE_MUST_CHECK

#define __must_check		__attribute__((__warn_unused_result__))

#else

#define __must_check

#endif



#if defined(CC_USING_HOTPATCH)

#define notrace			__attribute__((hotpatch(0, 0)))

#elif defined(CC_USING_PATCHABLE_FUNCTION_ENTRY)

lib/Kconfig.debug

+0 −8
Original line number Diff line number Diff line
@@ -295,14 +295,6 @@ config GDB_SCRIPTS 


endif # DEBUG_INFO



config ENABLE_MUST_CHECK

	bool "Enable __must_check logic"

	default y

	help

	  Enable the __must_check logic in the kernel build.  Disable this to

	  suppress the "warning: ignoring return value of 'foo', declared with

	  attribute warn_unused_result" messages.



config FRAME_WARN

	int "Warn for stack frames larger than"

	range 0 8192

tools/testing/selftests/wireguard/qemu/debug.config

+0 −1
Original line number Diff line number Diff line 
CONFIG_LOCALVERSION="-debug"

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_POINTER=y

CONFIG_STACK_VALIDATION=y

CONFIG_DEBUG_KERNEL=y