git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
lib
/
string.S
diff --git
a/arch/ppc/lib/string.S
b/arch/ppc/lib/string.S
index
36c9b97
..
2e258c4
100644
(file)
--- a/
arch/ppc/lib/string.S
+++ b/
arch/ppc/lib/string.S
@@
-65,9
+65,9
@@
.stabs "arch/ppc/lib/",N_SO,0,0,0f
.stabs "string.S",N_SO,0,0,0f
.stabs "arch/ppc/lib/",N_SO,0,0,0f
.stabs "string.S",N_SO,0,0,0f
-CACHELINE_BYTES = L1_CACHE_
LINE_SIZE
-LG_CACHELINE_BYTES = L
G_L1_CACHE_LINE_SIZE
-CACHELINE_MASK = (L1_CACHE_
LINE_SIZE
-1)
+CACHELINE_BYTES = L1_CACHE_
BYTES
+LG_CACHELINE_BYTES = L
1_CACHE_SHIFT
+CACHELINE_MASK = (L1_CACHE_
BYTES
-1)
_GLOBAL(strcpy)
addi r5,r3,-1
_GLOBAL(strcpy)
addi r5,r3,-1
@@
-265,12
+265,12
@@
_GLOBAL(cacheable_memcpy)
dcbz r11,r6
#endif
COPY_16_BYTES
dcbz r11,r6
#endif
COPY_16_BYTES
-#if L1_CACHE_
LINE_SIZE
>= 32
+#if L1_CACHE_
BYTES
>= 32
COPY_16_BYTES
COPY_16_BYTES
-#if L1_CACHE_
LINE_SIZE
>= 64
+#if L1_CACHE_
BYTES
>= 64
COPY_16_BYTES
COPY_16_BYTES
COPY_16_BYTES
COPY_16_BYTES
-#if L1_CACHE_
LINE_SIZE
>= 128
+#if L1_CACHE_
BYTES
>= 128
COPY_16_BYTES
COPY_16_BYTES
COPY_16_BYTES
COPY_16_BYTES
COPY_16_BYTES
COPY_16_BYTES
@@
-485,12
+485,12
@@
_GLOBAL(__copy_tofrom_user)
.text
/* the main body of the cacheline loop */
COPY_16_BYTES_WITHEX(0)
.text
/* the main body of the cacheline loop */
COPY_16_BYTES_WITHEX(0)
-#if L1_CACHE_
LINE_SIZE
>= 32
+#if L1_CACHE_
BYTES
>= 32
COPY_16_BYTES_WITHEX(1)
COPY_16_BYTES_WITHEX(1)
-#if L1_CACHE_
LINE_SIZE
>= 64
+#if L1_CACHE_
BYTES
>= 64
COPY_16_BYTES_WITHEX(2)
COPY_16_BYTES_WITHEX(3)
COPY_16_BYTES_WITHEX(2)
COPY_16_BYTES_WITHEX(3)
-#if L1_CACHE_
LINE_SIZE
>= 128
+#if L1_CACHE_
BYTES
>= 128
COPY_16_BYTES_WITHEX(4)
COPY_16_BYTES_WITHEX(5)
COPY_16_BYTES_WITHEX(6)
COPY_16_BYTES_WITHEX(4)
COPY_16_BYTES_WITHEX(5)
COPY_16_BYTES_WITHEX(6)
@@
-544,12
+544,12
@@
_GLOBAL(__copy_tofrom_user)
* 104f (if in read part) or 105f (if in write part), after updating r5
*/
COPY_16_BYTES_EXCODE(0)
* 104f (if in read part) or 105f (if in write part), after updating r5
*/
COPY_16_BYTES_EXCODE(0)
-#if L1_CACHE_
LINE_SIZE
>= 32
+#if L1_CACHE_
BYTES
>= 32
COPY_16_BYTES_EXCODE(1)
COPY_16_BYTES_EXCODE(1)
-#if L1_CACHE_
LINE_SIZE
>= 64
+#if L1_CACHE_
BYTES
>= 64
COPY_16_BYTES_EXCODE(2)
COPY_16_BYTES_EXCODE(3)
COPY_16_BYTES_EXCODE(2)
COPY_16_BYTES_EXCODE(3)
-#if L1_CACHE_
LINE_SIZE
>= 128
+#if L1_CACHE_
BYTES
>= 128
COPY_16_BYTES_EXCODE(4)
COPY_16_BYTES_EXCODE(5)
COPY_16_BYTES_EXCODE(6)
COPY_16_BYTES_EXCODE(4)
COPY_16_BYTES_EXCODE(5)
COPY_16_BYTES_EXCODE(6)