aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-01 21:54:38 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-01 21:54:38 +1100
commit89003ebf9e6a9ccb2327caf72955edd86b274c14 (patch)
treeb4e7ff84b1b0aa0adccfac237981e45ea371553a /include
parenta0e60b2033b30a6bb8479629001cf98e58e4079a (diff)
downloadkernel_samsung_smdk4412-89003ebf9e6a9ccb2327caf72955edd86b274c14.zip
kernel_samsung_smdk4412-89003ebf9e6a9ccb2327caf72955edd86b274c14.tar.gz
kernel_samsung_smdk4412-89003ebf9e6a9ccb2327caf72955edd86b274c14.tar.bz2
powerpc: Fix BUG/WARN macros for 64-bit
The bug_entry struct had an int in the middle of pointers and unsigned longs, and the inline asm that generated the bug table entries didn't insert the necessary padding, so the fields following it didn't get initialized properly and an oops resulted. This changes the int field (the line number) to a long so that all the fields are the same size and no padding is required. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/bug.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h
index e4d028e..943e3d7 100644
--- a/include/asm-powerpc/bug.h
+++ b/include/asm-powerpc/bug.h
@@ -13,7 +13,7 @@
#ifdef __powerpc64__
#define BUG_TABLE_ENTRY(label, line, file, func) \
- ".llong " #label "\n .long " #line "\n .llong " #file ", " #func "\n"
+ ".llong " #label ", " #line ", " #file ", " #func "\n"
#define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n"
#define DATA_TYPE long long
#else
@@ -25,7 +25,7 @@
struct bug_entry {
unsigned long bug_addr;
- int line;
+ long line;
const char *file;
const char *function;
};