diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-07-23 17:46:50 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-23 18:36:56 +0200 |
commit | 7c1fed03b9fa32d4323d5caa6a9c7dcdd7eba767 (patch) | |
tree | a0227ccfd1bbe5644bcd9f3ebc86af94a8938d81 /arch/um | |
parent | drivers/char/nvram.c: Removed duplicated include (diff) | |
download | linux-7c1fed03b9fa32d4323d5caa6a9c7dcdd7eba767.tar.xz linux-7c1fed03b9fa32d4323d5caa6a9c7dcdd7eba767.zip |
UML - Fix boot crash
My copying of linux/init.h didn't go far enough. The definition of
__used singled out gcc minor version 3, but didn't care what the major
version was. This broke when unit-at-a-time was added and gcc started
throwing out initcalls.
This results in an early boot crash when ptrace tries to initialize a
process with an empty, uninitialized register set.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/include/init.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/um/include/init.h b/arch/um/include/init.h index b00a95741d41..37dd097c16c0 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 |