Commit 58628a78 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'parisc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc build fix from Helge Deller:
 "This unbreaks the kernel compilation on parisc with gcc-4.9"

* 'parisc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix out-of-register compiler error in ldcw inline assembler function
parents 08b022a9 45db0738
...@@ -33,11 +33,18 @@ ...@@ -33,11 +33,18 @@
#endif /*!CONFIG_PA20*/ #endif /*!CONFIG_PA20*/
/* LDCW, the only atomic read-write operation PA-RISC has. *sigh*. */ /* LDCW, the only atomic read-write operation PA-RISC has. *sigh*.
We don't explicitly expose that "*a" may be written as reload
fails to find a register in class R1_REGS when "a" needs to be
reloaded when generating 64-bit PIC code. Instead, we clobber
memory to indicate to the compiler that the assembly code reads
or writes to items other than those listed in the input and output
operands. This may pessimize the code somewhat but __ldcw is
usually used within code blocks surrounded by memory barriors. */
#define __ldcw(a) ({ \ #define __ldcw(a) ({ \
unsigned __ret; \ unsigned __ret; \
__asm__ __volatile__(__LDCW " 0(%2),%0" \ __asm__ __volatile__(__LDCW " 0(%1),%0" \
: "=r" (__ret), "+m" (*(a)) : "r" (a)); \ : "=r" (__ret) : "r" (a) : "memory"); \
__ret; \ __ret; \
}) })
......
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