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

Commit c837fb37 authored by Borislav Petkov's avatar Borislav Petkov Committed by Linus Torvalds
Browse files

include/linux/compiler-gcc*.h: unify macro definitions 



Unify identical gcc3.x and gcc4.x macros.

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 80cdc6da

include/linux/compiler-gcc.h

+8 −0
Original line number Diff line number Diff line
@@ -92,3 +92,11 @@ 
#if !defined(__noclone)

#define __noclone	/* not needed */

#endif



/*

 * A trick to suppress uninitialized variable warning without generating any

 * code

 */

#define uninitialized_var(x) x = x



#define __always_inline		inline __attribute__((always_inline))

include/linux/compiler-gcc3.h

+0 −8
Original line number Diff line number Diff line
@@ -21,11 +21,3 @@ 
#   error "GCOV profiling support for gcc versions below 3.4 not included"

# endif /* __GNUC_MINOR__ */

#endif /* CONFIG_GCOV_KERNEL */
 


/*

 * A trick to suppress uninitialized variable warning without generating any

 * code

 */

#define uninitialized_var(x) x = x



#define __always_inline		inline __attribute__((always_inline))

include/linux/compiler-gcc4.h

+0 −8
Original line number Diff line number Diff line
@@ -12,13 +12,6 @@ 
#define __used			__attribute__((__used__))

#define __must_check 		__attribute__((warn_unused_result))

#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)

#define __always_inline		inline __attribute__((always_inline))



/*

 * A trick to suppress uninitialized variable warning without generating any

 * code

 */

#define uninitialized_var(x) x = x



#if __GNUC_MINOR__ >= 3

/* Mark functions as cold. gcc will assume any path leading to a call
@@ -53,7 +46,6 @@ 
#define __noclone	__attribute__((__noclone__))



#endif



#endif



#if __GNUC_MINOR__ > 0