Re: [PATCH v5 11/26] powerpc/book3s64/pkeys: Make initial_allocation_mask static

On 7/6/20 12:34 PM, Michael Ellerman wrote:

"Aneesh Kumar K.V" [off-list ref] writes:

quoted

initial_allocation_mask is not used outside this file.

And never modified after init, so make it __ro_after_init as well?

ok, will update reserved_allocation_maask too.

cheers

quoted

diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h
index 652bad7334f3..47c81d41ea9a 100644
--- a/arch/powerpc/include/asm/pkeys.h
+++ b/arch/powerpc/include/asm/pkeys.h

@@ -13,7 +13,6 @@
  
  DECLARE_STATIC_KEY_FALSE(pkey_disabled);
  extern int max_pkey;
-extern u32 initial_allocation_mask; /*  bits set for the initially allocated keys */
  extern u32 reserved_allocation_mask; /* bits set for reserved keys */
  
  #define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | \

diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c
index a4d7287082a8..73b5ef1490c8 100644
--- a/arch/powerpc/mm/book3s64/pkeys.c
+++ b/arch/powerpc/mm/book3s64/pkeys.c

@@ -15,11 +15,11 @@
  DEFINE_STATIC_KEY_FALSE(pkey_disabled);
  DEFINE_STATIC_KEY_FALSE(execute_pkey_disabled);
  int  max_pkey;			/* Maximum key value supported */
-u32  initial_allocation_mask;   /* Bits set for the initially allocated keys */
  /*
   *  Keys marked in the reservation list cannot be allocated by  userspace
   */
  u32  reserved_allocation_mask;
+static u32  initial_allocation_mask;   /* Bits set for the initially allocated keys */
  static u64 default_amr;
  static u64 default_iamr;
  /* Allow all keys to be modified by default */

-- 
2.26.2

-aneesh