-stable review patch. If anyone has any objections, please let us know.
------------------
arch/ia64/kernel/unaligned.c erroneously marked die_if_kernel()
with a "noreturn" attribute ... which is silly (it returns whenever
the argument regs say that the fault happened in user mode, as one
might expect given the "if_kernel" part of its name!). Thanks to
Alan and Gareth for pointing this out.
Signed-off-by: Tony Luck <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
arch/ia64/kernel/unaligned.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.15.5.orig/arch/ia64/kernel/unaligned.c
+++ linux-2.6.15.5/arch/ia64/kernel/unaligned.c
@@ -24,7 +24,7 @@
#include <asm/uaccess.h>
#include <asm/unaligned.h>
-extern void die_if_kernel(char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
+extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
#undef DEBUG_UNALIGNED_TRAP
--