summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-02-28 01:18:58 +0100
committerTony Luck <tony.luck@intel.com>2006-02-28 01:18:58 +0100
commite963701a761aede31c9c1bfc74cf8e0ec671f0f4 (patch)
tree6aefa708cc240b0d3d6699fa6beb6169ef191be1 /arch/ia64
parent[IA64-SGI] revert export sn_pcidev_info_get (diff)
downloadlinux-e963701a761aede31c9c1bfc74cf8e0ec671f0f4.tar.xz
linux-e963701a761aede31c9c1bfc74cf8e0ec671f0f4.zip
[IA64] die_if_kernel() can return
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 <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/unaligned.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
index f9e0ae936d1a..112913896844 100644
--- a/arch/ia64/kernel/unaligned.c
+++ b/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