ARC fixes for v5.5-rc6

- Kconfig warning, stale define, duplicate asm-offset entry ...
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEOXpuCuR6hedrdLCJadfx3eKKwl4FAl4TdxEACgkQadfx3eKK
 wl5JqQ//RrGoY9lzlklopzbOq6nA0gs96joidklCQFT3xCeaK5dG/BE6wqa9wfvX
 4DFeZzCHV7PYDmdaMUmyUArB13N+/Fno5R9VBb9olqU+b4LcQz5Xlc+Ybmu8ksQe
 9LeU4lu2LvbQ1RfO5UNedAZvZB8VB4acRQjaCBF9o6SZApztEY4O78tF/iWDNcuT
 IGxKRI/nBvDXYZRsKOBiQG8XYR27qQUDihRUh/1TVRptCLxTwzsXXKPdHEULL0au
 tSj9iJ1+e6PCdns+PrjDCd/kaMlUDVN8/df7Pz7yzgu1z6LW3oG7WFAG3MVXP1md
 J2AFZMw2dT6a1HLcbEhSNS/on0Y+ecZ2bQQfnPvmzIjLSJuxVAXpGPoiXGElEB7+
 3Fsj80MDrG1Wsc+yA4JgHhOpbn3LbAOq716gyNLDBk3WQc1kmkkUczpU7d3YnFqi
 A2uAu9yviCSaHUXchbV0EvLz5LKnJgOVrP0WmT3RHetpvdCfJDpgm59rwV8kAikr
 XW6L7iOj8Vtjs2laMpn77N6fKv/d74ghnSeXsu0sa3vr9fkRSxCfAMwdvRcbGk+7
 GDv4i38aEN0tO+DLJHOQX5bJjeTQxMKhFp4HtfrGXiyEC9k+vdMz7xxwwKYnHzp4
 hmrfd8eaoZC8hUVWsu07DwcB7PoYDuMK5X9k5+r8VdhfAioFNaA=
 =Hjwq
 -----END PGP SIGNATURE-----

Merge tag 'arc-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC fixes from Vineet Gupta:
 "Kconfig warning, stale define, duplicate asm-offset entry ..."

* tag 'arc-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: pt_regs: remove hardcoded registers offset
  ARC: asm-offsets: remove duplicate entry
  ARC: mm: drop stale define of __ARCH_USE_5LEVEL_HACK
  arc: eznps: fix allmodconfig kconfig warning

arch/arc/include/asm/entry-arcv2.h

@@ -162,7 +162,7 @@
 #endif
 
 #ifdef CONFIG_ARC_HAS_ACCL_REGS
-	ST2	r58, r59, PT_sp + 12
+	ST2	r58, r59, PT_r58
 #endif
 
 .endm
@@ -172,8 +172,8 @@
 
 	LD2	gp, fp, PT_r26		; gp (r26), fp (r27)
 
-	ld	r12, [sp, PT_sp + 4]
-	ld	r30, [sp, PT_sp + 8]
+	ld	r12, [sp, PT_r12]
+	ld	r30, [sp, PT_r30]
 
 	; Restore SP (into AUX_USER_SP) only if returning to U mode
 	;  - for K mode, it will be implicitly restored as stack is unwound
@@ -190,7 +190,7 @@
 #endif
 
 #ifdef CONFIG_ARC_HAS_ACCL_REGS
-	LD2	r58, r59, PT_sp + 12
+	LD2	r58, r59, PT_r58
 #endif
 .endm
 

arch/arc/include/asm/hugepage.h

@@ -8,7 +8,6 @@
 #define _ASM_ARC_HUGEPAGE_H
 
 #include <linux/types.h>
-#define __ARCH_USE_5LEVEL_HACK
 #include <asm-generic/pgtable-nopmd.h>
 
 static inline pte_t pmd_pte(pmd_t pmd)

arch/arc/kernel/asm-offsets.c

@@ -66,7 +66,15 @@ int main(void)
 
 	DEFINE(SZ_CALLEE_REGS, sizeof(struct callee_regs));
 	DEFINE(SZ_PT_REGS, sizeof(struct pt_regs));
-	DEFINE(PT_user_r25, offsetof(struct pt_regs, user_r25));
+
+#ifdef CONFIG_ISA_ARCV2
+	OFFSET(PT_r12, pt_regs, r12);
+	OFFSET(PT_r30, pt_regs, r30);
+#endif
+#ifdef CONFIG_ARC_HAS_ACCL_REGS
+	OFFSET(PT_r58, pt_regs, r58);
+	OFFSET(PT_r59, pt_regs, r59);
+#endif
 
 	return 0;
 }

arch/arc/plat-eznps/Kconfig

@@ -7,7 +7,7 @@
 menuconfig ARC_PLAT_EZNPS
 	bool "\"EZchip\" ARC dev platform"
 	select CPU_BIG_ENDIAN
-	select CLKSRC_NPS
+	select CLKSRC_NPS if !PHYS_ADDR_T_64BIT
 	select EZNPS_GIC
 	select EZCHIP_NPS_MANAGEMENT_ENET if ETHERNET
 	help