diff options
Diffstat (limited to 'arch/ppc/lib/string.S')
-rw-r--r-- | arch/ppc/lib/string.S | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/ppc/lib/string.S b/arch/ppc/lib/string.S index 36c9b97fd92a..2e258c49e8be 100644 --- a/arch/ppc/lib/string.S +++ b/arch/ppc/lib/string.S | |||
@@ -65,9 +65,9 @@ | |||
65 | .stabs "arch/ppc/lib/",N_SO,0,0,0f | 65 | .stabs "arch/ppc/lib/",N_SO,0,0,0f |
66 | .stabs "string.S",N_SO,0,0,0f | 66 | .stabs "string.S",N_SO,0,0,0f |
67 | 67 | ||
68 | CACHELINE_BYTES = L1_CACHE_LINE_SIZE | 68 | CACHELINE_BYTES = L1_CACHE_BYTES |
69 | LG_CACHELINE_BYTES = LG_L1_CACHE_LINE_SIZE | 69 | LG_CACHELINE_BYTES = L1_CACHE_SHIFT |
70 | CACHELINE_MASK = (L1_CACHE_LINE_SIZE-1) | 70 | CACHELINE_MASK = (L1_CACHE_BYTES-1) |
71 | 71 | ||
72 | _GLOBAL(strcpy) | 72 | _GLOBAL(strcpy) |
73 | addi r5,r3,-1 | 73 | addi r5,r3,-1 |
@@ -265,12 +265,12 @@ _GLOBAL(cacheable_memcpy) | |||
265 | dcbz r11,r6 | 265 | dcbz r11,r6 |
266 | #endif | 266 | #endif |
267 | COPY_16_BYTES | 267 | COPY_16_BYTES |
268 | #if L1_CACHE_LINE_SIZE >= 32 | 268 | #if L1_CACHE_BYTES >= 32 |
269 | COPY_16_BYTES | 269 | COPY_16_BYTES |
270 | #if L1_CACHE_LINE_SIZE >= 64 | 270 | #if L1_CACHE_BYTES >= 64 |
271 | COPY_16_BYTES | 271 | COPY_16_BYTES |
272 | COPY_16_BYTES | 272 | COPY_16_BYTES |
273 | #if L1_CACHE_LINE_SIZE >= 128 | 273 | #if L1_CACHE_BYTES >= 128 |
274 | COPY_16_BYTES | 274 | COPY_16_BYTES |
275 | COPY_16_BYTES | 275 | COPY_16_BYTES |
276 | COPY_16_BYTES | 276 | COPY_16_BYTES |
@@ -485,12 +485,12 @@ _GLOBAL(__copy_tofrom_user) | |||
485 | .text | 485 | .text |
486 | /* the main body of the cacheline loop */ | 486 | /* the main body of the cacheline loop */ |
487 | COPY_16_BYTES_WITHEX(0) | 487 | COPY_16_BYTES_WITHEX(0) |
488 | #if L1_CACHE_LINE_SIZE >= 32 | 488 | #if L1_CACHE_BYTES >= 32 |
489 | COPY_16_BYTES_WITHEX(1) | 489 | COPY_16_BYTES_WITHEX(1) |
490 | #if L1_CACHE_LINE_SIZE >= 64 | 490 | #if L1_CACHE_BYTES >= 64 |
491 | COPY_16_BYTES_WITHEX(2) | 491 | COPY_16_BYTES_WITHEX(2) |
492 | COPY_16_BYTES_WITHEX(3) | 492 | COPY_16_BYTES_WITHEX(3) |
493 | #if L1_CACHE_LINE_SIZE >= 128 | 493 | #if L1_CACHE_BYTES >= 128 |
494 | COPY_16_BYTES_WITHEX(4) | 494 | COPY_16_BYTES_WITHEX(4) |
495 | COPY_16_BYTES_WITHEX(5) | 495 | COPY_16_BYTES_WITHEX(5) |
496 | COPY_16_BYTES_WITHEX(6) | 496 | COPY_16_BYTES_WITHEX(6) |
@@ -544,12 +544,12 @@ _GLOBAL(__copy_tofrom_user) | |||
544 | * 104f (if in read part) or 105f (if in write part), after updating r5 | 544 | * 104f (if in read part) or 105f (if in write part), after updating r5 |
545 | */ | 545 | */ |
546 | COPY_16_BYTES_EXCODE(0) | 546 | COPY_16_BYTES_EXCODE(0) |
547 | #if L1_CACHE_LINE_SIZE >= 32 | 547 | #if L1_CACHE_BYTES >= 32 |
548 | COPY_16_BYTES_EXCODE(1) | 548 | COPY_16_BYTES_EXCODE(1) |
549 | #if L1_CACHE_LINE_SIZE >= 64 | 549 | #if L1_CACHE_BYTES >= 64 |
550 | COPY_16_BYTES_EXCODE(2) | 550 | COPY_16_BYTES_EXCODE(2) |
551 | COPY_16_BYTES_EXCODE(3) | 551 | COPY_16_BYTES_EXCODE(3) |
552 | #if L1_CACHE_LINE_SIZE >= 128 | 552 | #if L1_CACHE_BYTES >= 128 |
553 | COPY_16_BYTES_EXCODE(4) | 553 | COPY_16_BYTES_EXCODE(4) |
554 | COPY_16_BYTES_EXCODE(5) | 554 | COPY_16_BYTES_EXCODE(5) |
555 | COPY_16_BYTES_EXCODE(6) | 555 | COPY_16_BYTES_EXCODE(6) |