summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-11-01 09:27:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-11-01 09:27:57 -0700
commit6444ccfd699cda8db5edaac7fa469d6a29aa9a47 (patch)
treee10069e24e06f5436934ec74d6b54ae592bfca37 /arch
parent82aa4671516a3203261c835e98c3eecab10c994d (diff)
parentb5bb425871186303e6936fa2581521bdd1964a58 (diff)
downloadlwn-6444ccfd699cda8db5edaac7fa469d6a29aa9a47.tar.gz
lwn-6444ccfd699cda8db5edaac7fa469d6a29aa9a47.zip
Merge branch 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu
Pull percpu fixes from Dennis Zhou: "Two small things for v4.20. The first fixes a clang uninitialized variable warning for arm64 in the default path calls BUILD_BUG(). The second removes an unnecessary unlikely() in a WARN_ON() use" * 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu: arm64: percpu: Initialize ret in the default case mm: percpu: remove unnecessary unlikely()
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/percpu.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
index 9234013e759e..21a81b59a0cc 100644
--- a/arch/arm64/include/asm/percpu.h
+++ b/arch/arm64/include/asm/percpu.h
@@ -96,6 +96,7 @@ static inline unsigned long __percpu_##op(void *ptr, \
: [val] "Ir" (val)); \
break; \
default: \
+ ret = 0; \
BUILD_BUG(); \
} \
\
@@ -125,6 +126,7 @@ static inline unsigned long __percpu_read(void *ptr, int size)
ret = READ_ONCE(*(u64 *)ptr);
break;
default:
+ ret = 0;
BUILD_BUG();
}
@@ -194,6 +196,7 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val,
: [val] "r" (val));
break;
default:
+ ret = 0;
BUILD_BUG();
}