aboutsummaryrefslogtreecommitdiff
path: root/include/linux/randomize_kstack.h
diff options
context:
space:
mode:
authorDan Williams <[email protected]>2021-06-08 17:16:11 -0700
committerDan Williams <[email protected]>2021-06-08 17:16:11 -0700
commit54ada34b4dfdb864ac602e13ff87581abe517ce9 (patch)
tree8c92ca68c13e86b71f9cbf05a1a432c3ba4ea67b /include/linux/randomize_kstack.h
parent605a5e41db7d8c930fb80115686991c4c1d08ee4 (diff)
parent4a2c1dcfaf59be4b357400d893c3f5daff6cab6c (diff)
Merge branch 'rafael/acpica/cfmws' into for-5.14/cxl
Pick up the definition of the CXL Fixed Memory Window Structure from Rafael's ACPICA development branch.
Diffstat (limited to 'include/linux/randomize_kstack.h')
-rw-r--r--include/linux/randomize_kstack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/randomize_kstack.h b/include/linux/randomize_kstack.h
index fd80fab663a9..bebc911161b6 100644
--- a/include/linux/randomize_kstack.h
+++ b/include/linux/randomize_kstack.h
@@ -38,7 +38,7 @@ void *__builtin_alloca(size_t size);
u32 offset = raw_cpu_read(kstack_offset); \
u8 *ptr = __builtin_alloca(KSTACK_OFFSET_MAX(offset)); \
/* Keep allocation even after "ptr" loses scope. */ \
- asm volatile("" : "=o"(*ptr) :: "memory"); \
+ asm volatile("" :: "r"(ptr) : "memory"); \
} \
} while (0)