Merge tag 'arc-5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (8f8b69aa) · Commits · 戴 / test

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)

+9 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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