Commit e8a4e1c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-fixes-5.19-4' of... 

Merge tag 'loongarch-fixes-5.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch fixes from Huacai Chen:
 "A fix for tinyconfig build error, a fix for section mismatch warning,
  and two cleanups of obsolete code"

* tag 'loongarch-fixes-5.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: Fix section mismatch warning
  LoongArch: Fix build errors for tinyconfig
  LoongArch: Remove obsolete mentions of vcsr
  LoongArch: Drop these obsolete selects in Kconfig
parents ef4ab3ba f0fbe652

arch/loongarch/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ config LOONGARCH 
	select GENERIC_CMOS_UPDATE

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_ENTRY

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_GETTIMEOFDAY

	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_IRQ_PROBE
@@ -77,7 +76,6 @@ config LOONGARCH 
	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_ASM_MODVERSIONS

	select HAVE_CONTEXT_TRACKING

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_DMA_CONTIGUOUS

	select HAVE_EXIT_THREAD
@@ -86,8 +84,6 @@ config LOONGARCH 
	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_PERF_EVENTS

arch/loongarch/include/asm/fpregdef.h

+0 −1
Original line number Diff line number Diff line
@@ -48,6 +48,5 @@ 
#define fcsr1	$r1

#define fcsr2	$r2

#define fcsr3	$r3

#define vcsr16	$r16



#endif /* _ASM_FPREGDEF_H */

arch/loongarch/include/asm/page.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define _ASM_PAGE_H



#include <linux/const.h>

#include <asm/addrspace.h>



/*

 * PAGE_SHIFT determines the page size

arch/loongarch/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ BUILD_FPR_ACCESS(64) 


struct loongarch_fpu {

	unsigned int	fcsr;

	unsigned int	vcsr;

	uint64_t	fcc;	/* 8x8 */

	union fpureg	fpr[NUM_FPU_REGS];

};
@@ -161,7 +160,6 @@ struct thread_struct { 
	 */							\

	.fpu			= {				\

		.fcsr		= 0,				\

		.vcsr		= 0,				\

		.fcc		= 0,				\

		.fpr		= {{{0,},},},			\

	},							\

arch/loongarch/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ void output_thread_fpu_defines(void) 


	OFFSET(THREAD_FCSR, loongarch_fpu, fcsr);

	OFFSET(THREAD_FCC,  loongarch_fpu, fcc);

	OFFSET(THREAD_VCSR, loongarch_fpu, vcsr);

	BLANK();

}