diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 05:50:54 -0400 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/arm/include | |
| parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/div64.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/div64.h b/arch/arm/include/asm/div64.h index 5001390be958..d3f0a9eee9f6 100644 --- a/arch/arm/include/asm/div64.h +++ b/arch/arm/include/asm/div64.h | |||
| @@ -165,7 +165,7 @@ | |||
| 165 | __res = __m; \ | 165 | __res = __m; \ |
| 166 | asm ( "umlal %Q0, %R0, %Q1, %Q2\n\t" \ | 166 | asm ( "umlal %Q0, %R0, %Q1, %Q2\n\t" \ |
| 167 | "mov %Q0, #0" \ | 167 | "mov %Q0, #0" \ |
| 168 | : "+r" (__res) \ | 168 | : "+&r" (__res) \ |
| 169 | : "r" (__m), "r" (__n) \ | 169 | : "r" (__m), "r" (__n) \ |
| 170 | : "cc" ); \ | 170 | : "cc" ); \ |
| 171 | } else { \ | 171 | } else { \ |
| @@ -182,7 +182,7 @@ | |||
| 182 | "umlal %R0, %Q0, %Q1, %R2\n\t" \ | 182 | "umlal %R0, %Q0, %Q1, %R2\n\t" \ |
| 183 | "mov %R0, #0\n\t" \ | 183 | "mov %R0, #0\n\t" \ |
| 184 | "umlal %Q0, %R0, %R1, %R2" \ | 184 | "umlal %Q0, %R0, %R1, %R2" \ |
| 185 | : "+r" (__res) \ | 185 | : "+&r" (__res) \ |
| 186 | : "r" (__m), "r" (__n) \ | 186 | : "r" (__m), "r" (__n) \ |
| 187 | : "cc" ); \ | 187 | : "cc" ); \ |
| 188 | } else { \ | 188 | } else { \ |
| @@ -192,7 +192,7 @@ | |||
| 192 | "adds %Q0, %1, %Q0\n\t" \ | 192 | "adds %Q0, %1, %Q0\n\t" \ |
| 193 | "adc %R0, %R0, #0\n\t" \ | 193 | "adc %R0, %R0, #0\n\t" \ |
| 194 | "umlal %Q0, %R0, %R2, %R3" \ | 194 | "umlal %Q0, %R0, %R2, %R3" \ |
| 195 | : "+r" (__res), "+r" (__z) \ | 195 | : "+&r" (__res), "+&r" (__z) \ |
| 196 | : "r" (__m), "r" (__n) \ | 196 | : "r" (__m), "r" (__n) \ |
| 197 | : "cc" ); \ | 197 | : "cc" ); \ |
| 198 | } \ | 198 | } \ |