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

Commit 6ae8d048 authored by Daniel Santos's avatar Daniel Santos Committed by Linus Torvalds
Browse files

compiler{,-gcc4}.h, bug.h: Remove duplicate macros 



__linktime_error() does the same thing as __compiletime_error() and is
only used in bug.h.  Since the macro defines a function attribute that
will cause a failure at compile-time (not link-time), it makes more sense
to keep __compiletime_error(), which is also neatly mated with
__compiletime_warning().

Signed-off-by: default avatarDaniel Santos <daniel.santos@pobox.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Joe Perches <joe@perches.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 733ed6e4

include/linux/bug.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ extern int __build_bug_on_failed; 
#define BUILD_BUG()						\

#define BUILD_BUG()						\

	do {							\

	do {							\

		extern void __build_bug_failed(void)		\

		extern void __build_bug_failed(void)		\

			__linktime_error("BUILD_BUG failed");	\

			__compiletime_error("BUILD_BUG failed");\

		__build_bug_failed();				\

		__build_bug_failed();				\

	} while (0)

	} while (0)

include/linux/compiler-gcc4.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -33,8 +33,6 @@ 
   the kernel context */

   the kernel context */

#define __cold			__attribute__((__cold__))

#define __cold			__attribute__((__cold__))





#define __linktime_error(message) __attribute__((__error__(message)))



#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)

#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)





#ifndef __CHECKER__

#ifndef __CHECKER__

include/linux/compiler.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -308,9 +308,6 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); 
#ifndef __compiletime_error

#ifndef __compiletime_error

# define __compiletime_error(message)

# define __compiletime_error(message)

#endif

#endif

#ifndef __linktime_error

# define __linktime_error(message)

#endif

/*

/*

 * Prevent the compiler from merging or refetching accesses.  The compiler

 * Prevent the compiler from merging or refetching accesses.  The compiler

 * is also forbidden from reordering successive instances of ACCESS_ONCE(),

 * is also forbidden from reordering successive instances of ACCESS_ONCE(),