[powerpc:next-test 245/263] arch/powerpc/include/asm/mmu_context.h:287:19: error: redefinition of 'pte_to_hpte_pkey_bits'

[powerpc:next-test 245/263] arch/powerpc/include/asm/mmu_context.h:287:19: error: redefinition of 'pte_to_hpte_pkey_bits'

[kernel test robot]

[-- Attachment #1: Type: text/plain, Size: 4609 bytes --]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next-test
head:   f76c7820fc6ef641b75b5142aea72f1485c73bb1
commit: e4e8bc1df691ba5ba749d1e2b67acf9827e51a35 [245/263] powerpc/kvm: Fix PR KVM with KUAP/MEM_KEYS enabled
config: powerpc64-randconfig-p001-20210421 (attached as .config)
compiler: powerpc64le-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id=e4e8bc1df691ba5ba749d1e2b67acf9827e51a35
        git remote add powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
        git fetch --no-tags powerpc next-test
        git checkout e4e8bc1df691ba5ba749d1e2b67acf9827e51a35
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross W=1 ARCH=powerpc64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   In file included from arch/powerpc/include/asm/book3s/64/pkeys.h:6,
                    from arch/powerpc/kvm/book3s_64_mmu_host.c:15:
   arch/powerpc/include/asm/book3s/64/hash-pkey.h: In function 'hash__vmflag_to_pte_pkey_bits':
>> arch/powerpc/include/asm/book3s/64/hash-pkey.h:10:23: error: 'VM_PKEY_BIT0' undeclared (first use in this function); did you mean 'H_PTE_PKEY_BIT0'?
      10 |  return (((vm_flags & VM_PKEY_BIT0) ? H_PTE_PKEY_BIT0 : 0x0UL) |
         |                       ^~~~~~~~~~~~
         |                       H_PTE_PKEY_BIT0
   arch/powerpc/include/asm/book3s/64/hash-pkey.h:10:23: note: each undeclared identifier is reported only once for each function it appears in
>> arch/powerpc/include/asm/book3s/64/hash-pkey.h:11:16: error: 'VM_PKEY_BIT1' undeclared (first use in this function); did you mean 'H_PTE_PKEY_BIT1'?
      11 |   ((vm_flags & VM_PKEY_BIT1) ? H_PTE_PKEY_BIT1 : 0x0UL) |
         |                ^~~~~~~~~~~~
         |                H_PTE_PKEY_BIT1
>> arch/powerpc/include/asm/book3s/64/hash-pkey.h:12:16: error: 'VM_PKEY_BIT2' undeclared (first use in this function)
      12 |   ((vm_flags & VM_PKEY_BIT2) ? H_PTE_PKEY_BIT2 : 0x0UL) |
         |                ^~~~~~~~~~~~
>> arch/powerpc/include/asm/book3s/64/hash-pkey.h:13:16: error: 'VM_PKEY_BIT3' undeclared (first use in this function); did you mean 'H_PTE_PKEY_BIT3'?
      13 |   ((vm_flags & VM_PKEY_BIT3) ? H_PTE_PKEY_BIT3 : 0x0UL) |
         |                ^~~~~~~~~~~~
         |                H_PTE_PKEY_BIT3
>> arch/powerpc/include/asm/book3s/64/hash-pkey.h:14:16: error: 'VM_PKEY_BIT4' undeclared (first use in this function); did you mean 'H_PTE_PKEY_BIT4'?
      14 |   ((vm_flags & VM_PKEY_BIT4) ? H_PTE_PKEY_BIT4 : 0x0UL));
         |                ^~~~~~~~~~~~
         |                H_PTE_PKEY_BIT4
   In file included from arch/powerpc/kvm/book3s_64_mmu_host.c:17:
   arch/powerpc/include/asm/mmu_context.h: At top level:
>> arch/powerpc/include/asm/mmu_context.h:287:19: error: redefinition of 'pte_to_hpte_pkey_bits'
     287 | static inline u64 pte_to_hpte_pkey_bits(u64 pteflags, unsigned long flags)
         |                   ^~~~~~~~~~~~~~~~~~~~~
   In file included from arch/powerpc/include/asm/book3s/64/pkeys.h:6,
                    from arch/powerpc/kvm/book3s_64_mmu_host.c:15:
   arch/powerpc/include/asm/book3s/64/hash-pkey.h:17:19: note: previous definition of 'pte_to_hpte_pkey_bits' was here
      17 | static inline u64 pte_to_hpte_pkey_bits(u64 pteflags, unsigned long flags)
         |                   ^~~~~~~~~~~~~~~~~~~~~


vim +/pte_to_hpte_pkey_bits +287 arch/powerpc/include/asm/mmu_context.h

87bbabbed8a770 Ram Pai          2018-01-18  286  
d94b827e89dc3f Aneesh Kumar K.V 2020-11-27 @287  static inline u64 pte_to_hpte_pkey_bits(u64 pteflags, unsigned long flags)
a6590ca55f1f49 Ram Pai          2018-01-18  288  {
a6590ca55f1f49 Ram Pai          2018-01-18  289  	return 0x0UL;
a6590ca55f1f49 Ram Pai          2018-01-18  290  }
a6590ca55f1f49 Ram Pai          2018-01-18  291  

:::::: The code at line 287 was first introduced by commit
:::::: d94b827e89dc3f92cd871d10f4992a6bd3c861e5 powerpc/book3s64/kuap: Use Key 3 for kernel mapping with hash translation

:::::: TO: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
:::::: CC: Michael Ellerman <mpe@ellerman.id.au>

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 34521 bytes --]