summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-18 10:24:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-18 10:24:48 -0700
commit6d906f99817951e2257d577656899da02bb33105 (patch)
tree1a6ac3410cb4fd77e3417c36337cb5c7025e574c /arch
parent738a7832d21e3d911fcddab98ce260b79010b461 (diff)
parentff8acf929014b7f87315588e0daf8597c8aa9d1c (diff)
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Avoid compiler uninitialised warning introduced by recent arm64 futex fix" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: futex: Restore oldval initialization to work around buggy compilers
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/futex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h
index e1d95f08f8e1..c7e1a7837706 100644
--- a/arch/arm64/include/asm/futex.h
+++ b/arch/arm64/include/asm/futex.h
@@ -50,7 +50,7 @@ do { \
static inline int
arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)
{
- int oldval, ret, tmp;
+ int oldval = 0, ret, tmp;
u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);
pagefault_disable();