From bd96c6237ab7f45251157c831d903d96fdddbcc0 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Tue, 1 Nov 2005 21:54:38 +1100
Subject: [PATCH] --- yaml --- r: 12287 b: refs/heads/master c:
 89003ebf9e6a9ccb2327caf72955edd86b274c14 h: refs/heads/master i:   12285:
 9e7f6eb3b5d973c5fb7efd18a7a016862a677905   12283:
 9218f2a827ee5b413fa60365f365f7e6ffe5cae0   12279:
 eae60fec735432db84be711399f5ff23a84d4f7a   12271:
 44461ebb6a5cd5e099d59cb2632c151856061d06   12255:
 ee806d652260b6345d469ff941d2acbfce47aad0   12223:
 c054f345808b894dc2514c992a1c24219f05a043   12159:
 c81bf7b30e6e42676323e86d4ec4582d44b74b15   12031:
 f85e109a44ab67426d2854e935ca97ee386bf9a1   11775:
 5a178a5e1e83abed4c9796e501845805e8d1d1f4   11263:
 64a15b2df74da9519cb3950092a55a55e7eed0d6   10239:
 12a740396ea23014a3b112b41ad11c8d6dfb2655   8191:
 08f97ba64c3a1c2ff8d3b8828ffa9cf9073395bf v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-powerpc/bug.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 57a4cb6ed4ac..3aeee64ce98b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0e60b2033b30a6bb8479629001cf98e58e4079a
+refs/heads/master: 89003ebf9e6a9ccb2327caf72955edd86b274c14
diff --git a/trunk/include/asm-powerpc/bug.h b/trunk/include/asm-powerpc/bug.h
index e4d028e87020..943e3d7dbcc7 100644
--- a/trunk/include/asm-powerpc/bug.h
+++ b/trunk/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;
 };