diff options
author | Richard Weinberger <richard@nod.at> | 2015-05-31 16:15:58 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2015-05-31 16:17:08 -0400 |
commit | 30b11ee9ae23d78de66b9ae315880af17a64ba83 (patch) | |
tree | 4f7a3acc2effdea82d02ac3b55b8d07ae3bddca0 /arch/um | |
parent | 298e20ba8c197e8d429a6c8671550c41c7919033 (diff) |
um: Remove copy&paste code from init.h
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 <hwhilse@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/include/shared/init.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/arch/um/include/shared/init.h b/arch/um/include/shared/init.h index 031ad1d111e7..233e2593eee0 100644 --- a/arch/um/include/shared/init.h +++ b/arch/um/include/shared/init.h | |||
@@ -40,28 +40,8 @@ | |||
40 | typedef int (*initcall_t)(void); | 40 | typedef int (*initcall_t)(void); |
41 | typedef void (*exitcall_t)(void); | 41 | typedef void (*exitcall_t)(void); |
42 | 42 | ||
43 | #ifdef __UM_HOST__ | ||
44 | #ifndef __section | ||
45 | # define __section(S) __attribute__ ((__section__(#S))) | ||
46 | #endif | ||
47 | |||
48 | #if __GNUC__ == 3 | ||
49 | |||
50 | #if __GNUC_MINOR__ >= 3 | ||
51 | # define __used __attribute__((__used__)) | ||
52 | #else | ||
53 | # define __used __attribute__((__unused__)) | ||
54 | #endif | ||
55 | |||
56 | #else | ||
57 | #if __GNUC__ == 4 | ||
58 | # define __used __attribute__((__used__)) | ||
59 | #endif | ||
60 | #endif | ||
61 | |||
62 | #else | ||
63 | #include <linux/compiler.h> | 43 | #include <linux/compiler.h> |
64 | #endif | 44 | |
65 | /* These are for everybody (although not all archs will actually | 45 | /* These are for everybody (although not all archs will actually |
66 | discard it in modules) */ | 46 | discard it in modules) */ |
67 | #define __init __section(.init.text) | 47 | #define __init __section(.init.text) |