Commit 23df57af authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'powerpc-5.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:
 "Just one fix, a revert of a commit that was meant to be a minor
  improvement to some inline asm, but ended up having no real benefit
  with GCC and broke booting 32-bit machines when using Clang.

  Thanks to: Arnd Bergmann, Christophe Leroy, Nathan Chancellor, Nick
  Desaulniers, Segher Boessenkool"

* tag 'powerpc-5.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  Revert "powerpc: slightly improve cache helpers"
parents bf1881cf ed4289e8
...@@ -107,22 +107,22 @@ extern void _set_L3CR(unsigned long); ...@@ -107,22 +107,22 @@ extern void _set_L3CR(unsigned long);
static inline void dcbz(void *addr) static inline void dcbz(void *addr)
{ {
__asm__ __volatile__ ("dcbz %y0" : : "Z"(*(u8 *)addr) : "memory"); __asm__ __volatile__ ("dcbz 0, %0" : : "r"(addr) : "memory");
} }
static inline void dcbi(void *addr) static inline void dcbi(void *addr)
{ {
__asm__ __volatile__ ("dcbi %y0" : : "Z"(*(u8 *)addr) : "memory"); __asm__ __volatile__ ("dcbi 0, %0" : : "r"(addr) : "memory");
} }
static inline void dcbf(void *addr) static inline void dcbf(void *addr)
{ {
__asm__ __volatile__ ("dcbf %y0" : : "Z"(*(u8 *)addr) : "memory"); __asm__ __volatile__ ("dcbf 0, %0" : : "r"(addr) : "memory");
} }
static inline void dcbst(void *addr) static inline void dcbst(void *addr)
{ {
__asm__ __volatile__ ("dcbst %y0" : : "Z"(*(u8 *)addr) : "memory"); __asm__ __volatile__ ("dcbst 0, %0" : : "r"(addr) : "memory");
} }
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
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