diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-08-14 22:15:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-08-14 22:15:19 +0400 |
| commit | 28b2f3b4f13e86596650228401ed1e9e02e21575 (patch) | |
| tree | 37ab9985d39f1c507363e6ccfefd9482e7ea2249 | |
| parent | 489be6592b254f8813516eea5a1247f1e7a89cff (diff) | |
| download | linux-linaro-tracking-28b2f3b4f13e86596650228401ed1e9e02e21575.tar.gz | |
This reverts commit 9e13f189d8961a8f9c8befb4d2d693121fa1876c.
As the commit message says, "This test works with GCC under unit test but
not in the kernel build." And indeed, the aarch64 build fails with:
fs/inode.c: In function ‘new_inode’:
./arch/arm64/include/asm/processor.h:155:2: error: invalid 'asm': invalid operand
asm volatile("prfm pstl1keep, [%x0]\n" : : "p" (ptr));
Revert it, and wait for the proper prfm fix.
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | arch/arm64/include/asm/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 418c67b792aa..34de2a8f7d93 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -146,13 +146,13 @@ extern struct task_struct *cpu_switch_to(struct task_struct *prev, #define ARCH_HAS_PREFETCH static inline void prefetch(const void *ptr) { - asm volatile("prfm pldl1keep, [%x0]\n" : : "p" (ptr)); + asm volatile("prfm pldl1keep, %a0\n" : : "p" (ptr)); } #define ARCH_HAS_PREFETCHW static inline void prefetchw(const void *ptr) { - asm volatile("prfm pstl1keep, [%x0]\n" : : "p" (ptr)); + asm volatile("prfm pstl1keep, %a0\n" : : "p" (ptr)); } #define ARCH_HAS_SPINLOCK_PREFETCH |