diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 19:27:57 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 19:27:57 +0300 |
| commit | 6444ccfd699cda8db5edaac7fa469d6a29aa9a47 (patch) | |
| tree | e10069e24e06f5436934ec74d6b54ae592bfca37 | |
| parent | 82aa4671516a3203261c835e98c3eecab10c994d (diff) | |
| parent | b5bb425871186303e6936fa2581521bdd1964a58 (diff) | |
| download | linux-6444ccfd699cda8db5edaac7fa469d6a29aa9a47.tar.xz | |
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()
| -rw-r--r-- | arch/arm64/include/asm/percpu.h | 3 | ||||
| -rw-r--r-- | mm/percpu.c | 2 |
2 files changed, 4 insertions, 1 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(); } diff --git a/mm/percpu.c b/mm/percpu.c index a6b74c6fe0be..db86282fd024 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -2591,7 +2591,7 @@ int __init pcpu_page_first_chunk(size_t reserved_size, BUG_ON(ai->nr_groups != 1); upa = ai->alloc_size/ai->unit_size; nr_g0_units = roundup(num_possible_cpus(), upa); - if (unlikely(WARN_ON(ai->groups[0].nr_units != nr_g0_units))) { + if (WARN_ON(ai->groups[0].nr_units != nr_g0_units)) { pcpu_free_alloc_info(ai); return -EINVAL; } |