diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
| commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
| tree | deb03bcdd020262af450ed23382d7c921263f5cf /include/asm-ppc64/bug.h | |
| parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'include/asm-ppc64/bug.h')
| -rw-r--r-- | include/asm-ppc64/bug.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-ppc64/bug.h b/include/asm-ppc64/bug.h index 169868fa307d..160178278861 100644 --- a/include/asm-ppc64/bug.h +++ b/include/asm-ppc64/bug.h | |||
| @@ -43,8 +43,8 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 43 | ".section __bug_table,\"a\"\n\t" \ | 43 | ".section __bug_table,\"a\"\n\t" \ |
| 44 | " .llong 1b,%1,%2,%3\n" \ | 44 | " .llong 1b,%1,%2,%3\n" \ |
| 45 | ".previous" \ | 45 | ".previous" \ |
| 46 | : : "r" (x), "i" (__LINE__), "i" (__FILE__), \ | 46 | : : "r" ((long long)(x)), "i" (__LINE__), \ |
| 47 | "i" (__FUNCTION__)); \ | 47 | "i" (__FILE__), "i" (__FUNCTION__)); \ |
| 48 | } while (0) | 48 | } while (0) |
| 49 | 49 | ||
| 50 | #define WARN_ON(x) do { \ | 50 | #define WARN_ON(x) do { \ |
| @@ -53,7 +53,8 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 53 | ".section __bug_table,\"a\"\n\t" \ | 53 | ".section __bug_table,\"a\"\n\t" \ |
| 54 | " .llong 1b,%1,%2,%3\n" \ | 54 | " .llong 1b,%1,%2,%3\n" \ |
| 55 | ".previous" \ | 55 | ".previous" \ |
| 56 | : : "r" (x), "i" (__LINE__ + BUG_WARNING_TRAP), \ | 56 | : : "r" ((long long)(x)), \ |
| 57 | "i" (__LINE__ + BUG_WARNING_TRAP), \ | ||
| 57 | "i" (__FILE__), "i" (__FUNCTION__)); \ | 58 | "i" (__FILE__), "i" (__FUNCTION__)); \ |
| 58 | } while (0) | 59 | } while (0) |
| 59 | 60 | ||