aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2001-11-30 00:49:54 +0000
committerdavem <davem>2001-11-30 00:49:54 +0000
commit90efbadd249c983d0d5759cb3015dce5b39d5334 (patch)
tree8f5d164a17abc03d73cbf6894f0f57c7d795113e
parent9f1114b94cfc5c116e1daab0abb8fcc26fc94a5f (diff)
downloadnetdev-vger-cvs-90efbadd249c983d0d5759cb3015dce5b39d5334.tar.gz
Fix cheetah nloops claculation.
-rw-r--r--arch/sparc64/lib/blockops.S10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/sparc64/lib/blockops.S b/arch/sparc64/lib/blockops.S
index 27e5bfdac..58f78cdbf 100644
--- a/arch/sparc64/lib/blockops.S
+++ b/arch/sparc64/lib/blockops.S
@@ -1,4 +1,4 @@
-/* $Id: blockops.S,v 1.36 2001-09-24 21:44:03 davem Exp $
+/* $Id: blockops.S,v 1.37 2001-11-30 00:49:54 davem Exp $
* blockops.S: UltraSparc block zero optimized routines.
*
* Copyright (C) 1996, 1998, 1999, 2000 David S. Miller (davem@redhat.com)
@@ -169,9 +169,10 @@ cheetah_patch_1:
nop
cheetah_copy_user_page:
- mov 121, %o2 ! A0 Group
+ sethi %hi((PAGE_SIZE/64)-7), %o2 ! A0 Group
prefetch [%o1 + 0x000], #one_read ! MS
- prefetch [%o1 + 0x040], #one_read ! MS Group
+ or %o2, %lo((PAGE_SIZE/64)-7), %o2 ! A1 Group
+ prefetch [%o1 + 0x040], #one_read ! MS
prefetch [%o1 + 0x080], #one_read ! MS Group
prefetch [%o1 + 0x0c0], #one_read ! MS Group
ldd [%o1 + 0x000], %f0 ! MS Group
@@ -430,8 +431,9 @@ cheetah_patch_2:
clear_page_common:
membar #StoreLoad | #StoreStore | #LoadStore ! LSU Group
fzero %f0 ! FPA Group
- mov PAGE_SIZE/256, %o1 ! IEU0
+ sethi %hi(PAGE_SIZE/256), %o1 ! IEU0
fzero %f2 ! FPA Group
+ or %o1, %lo(PAGE_SIZE/256), %o1 ! IEU0
faddd %f0, %f2, %f4 ! FPA Group
fmuld %f0, %f2, %f6 ! FPM
faddd %f0, %f2, %f8 ! FPA Group