diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-09-28 12:22:35 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-28 12:22:35 +0000 |
commit | 2675ade97a115d3ba1e75fb1193365cd87310fcf (patch) | |
tree | 6bbf7d84655ca679743a227a1ad6e08124d59b12 /target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch | |
parent | 5da85f7a01b82d30979afa20ce2ce30f87b338ed (diff) | |
download | upstream-2675ade97a115d3ba1e75fb1193365cd87310fcf.tar.gz upstream-2675ade97a115d3ba1e75fb1193365cd87310fcf.tar.bz2 upstream-2675ade97a115d3ba1e75fb1193365cd87310fcf.zip |
uml: backport another upstream patch to fix compile errors
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47067
Diffstat (limited to 'target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch')
-rw-r--r-- | target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch b/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch deleted file mode 100644 index a68c4b606c..0000000000 --- a/target/linux/uml/patches-4.1/001-um-Remove-copy-paste-code-from-init.h.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Richard Weinberger <richard@nod.at> -Date: Sun, 31 May 2015 22:15:58 +0200 -Subject: [PATCH] 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> ---- - ---- 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); - --#ifndef __KERNEL__ --#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) |