Commit e8a4e1c1 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -54,7 +54,6 @@ config LOONGARCH ...@@ -54,7 +54,6 @@ config LOONGARCH
select GENERIC_CMOS_UPDATE select GENERIC_CMOS_UPDATE
select GENERIC_CPU_AUTOPROBE select GENERIC_CPU_AUTOPROBE
select GENERIC_ENTRY select GENERIC_ENTRY
select GENERIC_FIND_FIRST_BIT
select GENERIC_GETTIMEOFDAY select GENERIC_GETTIMEOFDAY
select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_MULTI_HANDLER
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
...@@ -77,7 +76,6 @@ config LOONGARCH ...@@ -77,7 +76,6 @@ config LOONGARCH
select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_TRANSPARENT_HUGEPAGE
select HAVE_ASM_MODVERSIONS select HAVE_ASM_MODVERSIONS
select HAVE_CONTEXT_TRACKING select HAVE_CONTEXT_TRACKING
select HAVE_COPY_THREAD_TLS
select HAVE_DEBUG_STACKOVERFLOW select HAVE_DEBUG_STACKOVERFLOW
select HAVE_DMA_CONTIGUOUS select HAVE_DMA_CONTIGUOUS
select HAVE_EXIT_THREAD select HAVE_EXIT_THREAD
...@@ -86,8 +84,6 @@ config LOONGARCH ...@@ -86,8 +84,6 @@ config LOONGARCH
select HAVE_IOREMAP_PROT select HAVE_IOREMAP_PROT
select HAVE_IRQ_EXIT_ON_IRQ_STACK select HAVE_IRQ_EXIT_ON_IRQ_STACK
select HAVE_IRQ_TIME_ACCOUNTING select HAVE_IRQ_TIME_ACCOUNTING
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
select HAVE_MOD_ARCH_SPECIFIC select HAVE_MOD_ARCH_SPECIFIC
select HAVE_NMI select HAVE_NMI
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
......
...@@ -48,6 +48,5 @@ ...@@ -48,6 +48,5 @@
#define fcsr1 $r1 #define fcsr1 $r1
#define fcsr2 $r2 #define fcsr2 $r2
#define fcsr3 $r3 #define fcsr3 $r3
#define vcsr16 $r16
#endif /* _ASM_FPREGDEF_H */ #endif /* _ASM_FPREGDEF_H */
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define _ASM_PAGE_H #define _ASM_PAGE_H
#include <linux/const.h> #include <linux/const.h>
#include <asm/addrspace.h>
/* /*
* PAGE_SHIFT determines the page size * PAGE_SHIFT determines the page size
......
...@@ -80,7 +80,6 @@ BUILD_FPR_ACCESS(64) ...@@ -80,7 +80,6 @@ BUILD_FPR_ACCESS(64)
struct loongarch_fpu { struct loongarch_fpu {
unsigned int fcsr; unsigned int fcsr;
unsigned int vcsr;
uint64_t fcc; /* 8x8 */ uint64_t fcc; /* 8x8 */
union fpureg fpr[NUM_FPU_REGS]; union fpureg fpr[NUM_FPU_REGS];
}; };
...@@ -161,7 +160,6 @@ struct thread_struct { ...@@ -161,7 +160,6 @@ struct thread_struct {
*/ \ */ \
.fpu = { \ .fpu = { \
.fcsr = 0, \ .fcsr = 0, \
.vcsr = 0, \
.fcc = 0, \ .fcc = 0, \
.fpr = {{{0,},},}, \ .fpr = {{{0,},},}, \
}, \ }, \
......
...@@ -166,7 +166,6 @@ void output_thread_fpu_defines(void) ...@@ -166,7 +166,6 @@ void output_thread_fpu_defines(void)
OFFSET(THREAD_FCSR, loongarch_fpu, fcsr); OFFSET(THREAD_FCSR, loongarch_fpu, fcsr);
OFFSET(THREAD_FCC, loongarch_fpu, fcc); OFFSET(THREAD_FCC, loongarch_fpu, fcc);
OFFSET(THREAD_VCSR, loongarch_fpu, vcsr);
BLANK(); BLANK();
} }
......
...@@ -146,16 +146,6 @@ ...@@ -146,16 +146,6 @@
movgr2fcsr fcsr0, \tmp0 movgr2fcsr fcsr0, \tmp0
.endm .endm
.macro sc_save_vcsr base, tmp0
movfcsr2gr \tmp0, vcsr16
EX st.w \tmp0, \base, 0
.endm
.macro sc_restore_vcsr base, tmp0
EX ld.w \tmp0, \base, 0
movgr2fcsr vcsr16, \tmp0
.endm
/* /*
* Save a thread's fp context. * Save a thread's fp context.
*/ */
......
...@@ -429,7 +429,6 @@ int __init init_numa_memory(void) ...@@ -429,7 +429,6 @@ int __init init_numa_memory(void)
return 0; return 0;
} }
EXPORT_SYMBOL(init_numa_memory);
#endif #endif
void __init paging_init(void) void __init paging_init(void)
......
...@@ -21,6 +21,7 @@ ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS)) ...@@ -21,6 +21,7 @@ ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS))
endif endif
cflags-vdso := $(ccflags-vdso) \ cflags-vdso := $(ccflags-vdso) \
-isystem $(shell $(CC) -print-file-name=include) \
$(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \ $(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \
-O2 -g -fno-strict-aliasing -fno-common -fno-builtin -G0 \ -O2 -g -fno-strict-aliasing -fno-common -fno-builtin -G0 \
-fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \ -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment