Skip to content

Commit

Permalink
powerpc: Fix BUG/WARN macros for 64-bit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mackerras committed Nov 1, 2005
1 parent a0e60b2 commit 89003eb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/asm-powerpc/bug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +25,7 @@

struct bug_entry {
unsigned long bug_addr;
int line;
long line;
const char *file;
const char *function;
};
Expand Down

0 comments on commit 89003eb

Please sign in to comment.