Commit dab787c7 authored Nov 21, 2019 by Will Deacon Committed by Greg Kroah-Hartman Jul 29, 2022

locking/refcount: Consolidate REFCOUNT_{MAX,SATURATED} definitions



[ Upstream commit 65b008552469f1c37f5e06e0016924502e40b4f5 ]

The definitions of REFCOUNT_MAX and REFCOUNT_SATURATED are the same,
regardless of CONFIG_REFCOUNT_FULL, so consolidate them into a single
pair of definitions.

Signed-off-by: Will Deacon <will@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Elena Reshetova <elena.reshetova@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20191121115902.2551-8-will@kernel.org


Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 0d3182fb

include/linux/refcount.h

+2 −7

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ typedef struct refcount_struct {
		} refcount_t;

		#define REFCOUNT_INIT(n) { .refs = ATOMIC_INIT(n), }
		#define REFCOUNT_MAX INT_MAX
		#define REFCOUNT_SATURATED (INT_MIN / 2)

		enum refcount_saturation_type {
		REFCOUNT_ADD_NOT_ZERO_OVF,
		@@ -57,9 +59,6 @@ static inline unsigned int refcount_read(const refcount_t *r)
		#ifdef CONFIG_REFCOUNT_FULL
		#include <linux/bug.h>

		#define REFCOUNT_MAX INT_MAX
		#define REFCOUNT_SATURATED (INT_MIN / 2)

		/*
		* Variant of atomic_t specialized for reference counts.
		*
		@@ -300,10 +299,6 @@ static inline void refcount_dec(refcount_t *r)
		refcount_warn_saturate(r, REFCOUNT_DEC_LEAK);
		}
		#else /* CONFIG_REFCOUNT_FULL */

		#define REFCOUNT_MAX INT_MAX
		#define REFCOUNT_SATURATED (INT_MIN / 2)

		# ifdef CONFIG_ARCH_HAS_REFCOUNT
		# include <asm/refcount.h>
		# else