diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-19 14:56:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-19 14:56:35 -0700 |
| commit | caa81d671f485dc54960e37a888d3b55349850a9 (patch) | |
| tree | c7d483cc33e2c3f858fd2f4f4fd84bf02d333287 /arch/s390/lib/div64.c | |
| parent | 2d8620cb880c796c9a9b59fe8d4ff37d726acfea (diff) | |
| parent | 0fb1d9bcbcf701a45835aa150c57ca54ea685bfa (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] make page table upgrade work again
[S390] make page table walking more robust
[S390] Dont check for pfn_valid() in uaccess_pt.c
[S390] ftrace/mcount: fix kernel stack backchain
[S390] topology: define SD_MC_INIT to fix performance regression
[S390] __div64_31 broken for CONFIG_MARCH_G5
Diffstat (limited to 'arch/s390/lib/div64.c')
| -rw-r--r-- | arch/s390/lib/div64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/lib/div64.c b/arch/s390/lib/div64.c index a5f8300bf3e..d9e62c0b576 100644 --- a/arch/s390/lib/div64.c +++ b/arch/s390/lib/div64.c @@ -61,7 +61,7 @@ static uint32_t __div64_31(uint64_t *n, uint32_t base) " clr %0,%3\n" " jl 0f\n" " slr %0,%3\n" - " alr %1,%2\n" + " ahi %1,1\n" "0:\n" : "+d" (reg2), "+d" (reg3), "=d" (tmp) : "d" (base), "2" (1UL) : "cc" ); |