Skip to content

Commit

Permalink
um: Remove copy&paste code from init.h
Browse files Browse the repository at this point in the history
As we got rid of the __KERNEL__ abuse, we can directly
include linux/compiler.h now.
This also allows gcc 5 to build UML.

Reported-by: Hans-Werner Hilse <[email protected]>
Signed-off-by: Richard Weinberger <[email protected]>
  • Loading branch information
richardweinberger committed May 31, 2015
1 parent 298e20b commit 30b11ee
Showing 1 changed file with 1 addition and 21 deletions.
22 changes: 1 addition & 21 deletions arch/um/include/shared/init.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,8 @@
typedef int (*initcall_t)(void);
typedef void (*exitcall_t)(void);

#ifdef __UM_HOST__
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
#endif

#if __GNUC__ == 3

#if __GNUC_MINOR__ >= 3
# define __used __attribute__((__used__))
#else
# define __used __attribute__((__unused__))
#endif

#else
#if __GNUC__ == 4
# define __used __attribute__((__used__))
#endif
#endif

#else
#include <linux/compiler.h>
#endif

/* These are for everybody (although not all archs will actually
discard it in modules) */
#define __init __section(.init.text)
Expand Down

0 comments on commit 30b11ee

Please sign in to comment.