diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 19:12:49 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 19:12:49 -0400 |
| commit | 4c2cb58c552a34744979a99ccf01762d5eb7e288 (patch) | |
| tree | fd35360eb0cb08b07f3a5f4bdf1ebd90a769311d /arch/ppc64/kernel/time.c | |
| parent | 34123da66e613602de5a886b05c875b6a91b8ed2 (diff) | |
| parent | 72ab373a5688a78cbdaf3bf96012e597d5399bb7 (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ppc64/kernel/time.c')
| -rw-r--r-- | arch/ppc64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 9939c206afa4..b56c6a324e17 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c | |||
| @@ -870,7 +870,7 @@ void div128_by_32( unsigned long dividend_high, unsigned long dividend_low, | |||
| 870 | rb = ((ra + b) - (x * divisor)) << 32; | 870 | rb = ((ra + b) - (x * divisor)) << 32; |
| 871 | 871 | ||
| 872 | y = (rb + c)/divisor; | 872 | y = (rb + c)/divisor; |
| 873 | rc = ((rb + b) - (y * divisor)) << 32; | 873 | rc = ((rb + c) - (y * divisor)) << 32; |
| 874 | 874 | ||
| 875 | z = (rc + d)/divisor; | 875 | z = (rc + d)/divisor; |
| 876 | 876 | ||