diff options
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/init.h | 8 | ||||
| -rw-r--r-- | arch/um/include/os.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/um/include/init.h b/arch/um/include/init.h index b00a95741d4..37dd097c16c 100644 --- a/arch/um/include/init.h +++ b/arch/um/include/init.h @@ -45,6 +45,8 @@ typedef void (*exitcall_t)(void); # define __section(S) __attribute__ ((__section__(#S))) #endif +#if __GNUC__ == 3 + #if __GNUC_MINOR__ >= 3 # define __used __attribute__((__used__)) #else @@ -52,6 +54,12 @@ typedef void (*exitcall_t)(void); #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 diff --git a/arch/um/include/os.h b/arch/um/include/os.h index e2716ac8889..db5be46e3e1 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -299,6 +299,6 @@ extern int os_arch_prctl(int pid, int code, unsigned long *addr); extern int get_pty(void); /* sys-$ARCH/task_size.c */ -extern unsigned long os_get_task_size(void); +extern unsigned long os_get_top_address(void); #endif |