Commit 07a6661a authored by David S. Miller's avatar David S. Miller

Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
parents 7e8a4852 50652320
...@@ -397,17 +397,23 @@ cheetah_patch_copyops: ...@@ -397,17 +397,23 @@ cheetah_patch_copyops:
ULTRA3_DO_PATCH(__copy_from_user, U3copy_from_user) ULTRA3_DO_PATCH(__copy_from_user, U3copy_from_user)
ULTRA3_DO_PATCH(__copy_to_user, U3copy_to_user) ULTRA3_DO_PATCH(__copy_to_user, U3copy_to_user)
ULTRA3_DO_PATCH(__copy_in_user, U3copy_in_user) ULTRA3_DO_PATCH(__copy_in_user, U3copy_in_user)
#if 0 /* Causes data corruption, nop out the optimization
* for now -DaveM
*/
ldxa [%g0] ASI_DCU_CONTROL_REG, %g3 ldxa [%g0] ASI_DCU_CONTROL_REG, %g3
sethi %uhi(DCU_PE), %o3 sethi %uhi(DCU_PE), %o3
sllx %o3, 32, %o3 sllx %o3, 32, %o3
andcc %g3, %o3, %g0 andcc %g3, %o3, %g0
be,pn %xcc, pcache_disabled be,pn %xcc, pcache_disabled
nop nop
#endif
ULTRA3_PCACHE_DO_NOP(U3memcpy) ULTRA3_PCACHE_DO_NOP(U3memcpy)
ULTRA3_PCACHE_DO_NOP(U3copy_from_user) ULTRA3_PCACHE_DO_NOP(U3copy_from_user)
ULTRA3_PCACHE_DO_NOP(U3copy_to_user) ULTRA3_PCACHE_DO_NOP(U3copy_to_user)
ULTRA3_PCACHE_DO_NOP(cheetah_copy_user_page) ULTRA3_PCACHE_DO_NOP(cheetah_copy_user_page)
#if 0
pcache_disabled: pcache_disabled:
#endif
retl retl
nop nop
#undef BRANCH_ALWAYS #undef BRANCH_ALWAYS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment