| From 30b11ee9ae23d78de66b9ae315880af17a64ba83 Mon Sep 17 00:00:00 2001 |
| From: Richard Weinberger <richard@nod.at> |
| Date: Sun, 31 May 2015 22:15:58 +0200 |
| Subject: um: Remove copy&paste code from init.h |
| |
| From: Richard Weinberger <richard@nod.at> |
| |
| commit 30b11ee9ae23d78de66b9ae315880af17a64ba83 upstream. |
| |
| 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> |
| Cc: Greg Hackmann <ghackmann@google.com> |
| Cc: Bernie Innocenti <codewiz@google.com> |
| Cc: Lorenzo Colitti <lorenzo@google.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/um/include/shared/init.h | 22 +--------------------- |
| 1 file changed, 1 insertion(+), 21 deletions(-) |
| |
| --- a/arch/um/include/shared/init.h |
| +++ b/arch/um/include/shared/init.h |
| @@ -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) |
