lkml.org 
[lkml]   [2019]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 07/10] lib/refcount: Consolidate REFCOUNT_{MAX,SATURATED} definitions
    Date
    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.

    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Elena Reshetova <elena.reshetova@intel.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Will Deacon <will@kernel.org>
    ---
    include/linux/refcount.h | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    diff --git a/include/linux/refcount.h b/include/linux/refcount.h
    index 1cd0a876a789..757d4630115c 100644
    --- a/include/linux/refcount.h
    +++ b/include/linux/refcount.h
    @@ -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
    --
    2.24.0.rc0.303.g954a862665-goog
    \
     
     \ /
      Last update: 2019-10-30 15:32    [W:3.543 / U:2.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site