OSDN Git Service

powerpc/pkeys: Fix build error with PPC_MEM_KEYS disabled
authorAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Mon, 17 Aug 2020 10:33:01 +0000 (16:03 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 17 Aug 2020 13:33:00 +0000 (23:33 +1000)
commit1e4e4bcaf70ec89f8b499c93a83d078c1e5c0ea6
treef459b066ab131dfe85866523e4eb31dd04acf62e
parent388692e943a58f28aac0fe83e75f5994da9ff8a1
powerpc/pkeys: Fix build error with PPC_MEM_KEYS disabled

IS_ENABLED() instead of #ifdef still requires variable declaration.
In this specific case, default_uamor is declared in asm/pkeys.h which
is only included if PPC_MEM_KEYS is enabled.

arch/powerpc/mm/book3s64/hash_utils.c: In function ‘hash__early_init_mmu_secondary’:
arch/powerpc/mm/book3s64/hash_utils.c:1119:21: error: ‘default_uamor’ undeclared (first use in this function)
 1119 |   mtspr(SPRN_UAMOR, default_uamor);
      |                     ^~~~~~~~~~~~~

Fixes: 6553fb799f60 ("powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)")
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200817103301.158836-1-aneesh.kumar@linux.ibm.com
arch/powerpc/mm/book3s64/hash_utils.c