diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
| commit | da61396d24e37258817e42537c482e962b4742f7 (patch) | |
| tree | 4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /include/asm-ppc64/bug.h | |
| parent | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
| download | linux-da61396d24e37258817e42537c482e962b4742f7.tar.gz linux-da61396d24e37258817e42537c482e962b4742f7.tar.xz | |
Merge upstream kernel into libata 'passthru' branch
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); ".section __bug_table,\"a\"\n\t" \ " .llong 1b,%1,%2,%3\n" \ ".previous" \ - : : "r" (x), "i" (__LINE__), "i" (__FILE__), \ - "i" (__FUNCTION__)); \ + : : "r" ((long long)(x)), "i" (__LINE__), \ + "i" (__FILE__), "i" (__FUNCTION__)); \ } while (0) #define WARN_ON(x) do { \ @@ -53,7 +53,8 @@ struct bug_entry *find_bug(unsigned long bugaddr); ".section __bug_table,\"a\"\n\t" \ " .llong 1b,%1,%2,%3\n" \ ".previous" \ - : : "r" (x), "i" (__LINE__ + BUG_WARNING_TRAP), \ + : : "r" ((long long)(x)), \ + "i" (__LINE__ + BUG_WARNING_TRAP), \ "i" (__FILE__), "i" (__FUNCTION__)); \ } while (0) |