History

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

Linus Torvalds committed 4 years ago

Commit e8a4e1c2 parents ef4ab3b f0fbe658 files · +2 −19Browse files

Unified · Split

8 files
  1. arch/loongarch/Kconfig +0 −4
  2. arch/loongarch/include/asm/fpregdef.h +0 −1
  3. arch/loongarch/include/asm/page.h +1 −0
  4. arch/loongarch/include/asm/processor.h +0 −2
  5. arch/loongarch/kernel/asm-offsets.c +0 −1
  6. arch/loongarch/kernel/fpu.S +0 −10
  7. arch/loongarch/kernel/numa.c +0 −1
  8. arch/loongarch/vdso/Makefile +1 −0
arch/loongarch/Kconfig+0−4
@@ -54,7 +54,6 @@ config LOONGARCH · 53 unmodified lines
54 select GENERIC_CMOS_UPDATE54 select GENERIC_CMOS_UPDATE
55 select GENERIC_CPU_AUTOPROBE55 select GENERIC_CPU_AUTOPROBE
56 select GENERIC_ENTRY56 select GENERIC_ENTRY
57 select GENERIC_FIND_FIRST_BIT
58 select GENERIC_GETTIMEOFDAY57 select GENERIC_GETTIMEOFDAY
59 select GENERIC_IRQ_MULTI_HANDLER58 select GENERIC_IRQ_MULTI_HANDLER
60 select GENERIC_IRQ_PROBE59 select GENERIC_IRQ_PROBE
@@ -77,7 +76,6 @@ config LOONGARCH · 16 unmodified lines
77 select HAVE_ARCH_TRANSPARENT_HUGEPAGE76 select HAVE_ARCH_TRANSPARENT_HUGEPAGE
78 select HAVE_ASM_MODVERSIONS77 select HAVE_ASM_MODVERSIONS
79 select HAVE_CONTEXT_TRACKING78 select HAVE_CONTEXT_TRACKING
80 select HAVE_COPY_THREAD_TLS
81 select HAVE_DEBUG_STACKOVERFLOW79 select HAVE_DEBUG_STACKOVERFLOW
82 select HAVE_DMA_CONTIGUOUS80 select HAVE_DMA_CONTIGUOUS
83 select HAVE_EXIT_THREAD81 select HAVE_EXIT_THREAD
@@ -86,8 +84,6 @@ config LOONGARCH · 2 unmodified lines
86 select HAVE_IOREMAP_PROT84 select HAVE_IOREMAP_PROT
87 select HAVE_IRQ_EXIT_ON_IRQ_STACK85 select HAVE_IRQ_EXIT_ON_IRQ_STACK
88 select HAVE_IRQ_TIME_ACCOUNTING86 select HAVE_IRQ_TIME_ACCOUNTING
89 select HAVE_MEMBLOCK
90 select HAVE_MEMBLOCK_NODE_MAP
91 select HAVE_MOD_ARCH_SPECIFIC87 select HAVE_MOD_ARCH_SPECIFIC
92 select HAVE_NMI88 select HAVE_NMI
93 select HAVE_PERF_EVENTS89 select HAVE_PERF_EVENTS
arch/loongarch/include/asm/fpregdef.h+0−1
@@ -48,6 +48,5 @@ · 47 unmodified lines
48#define fcsr1 $r148#define fcsr1 $r1
49#define fcsr2 $r249#define fcsr2 $r2
50#define fcsr3 $r350#define fcsr3 $r3
51#define vcsr16 $r16
52 51
53#endif /* _ASM_FPREGDEF_H */52#endif /* _ASM_FPREGDEF_H */
arch/loongarch/include/asm/page.h+1−0
@@ -6,6 +6,7 @@ · 5 unmodified lines
6#define _ASM_PAGE_H6#define _ASM_PAGE_H
7 7
8#include <linux/const.h>8#include <linux/const.h>
9#include <asm/addrspace.h>
9 10
10/*11/*
11 * PAGE_SHIFT determines the page size12 * PAGE_SHIFT determines the page size
arch/loongarch/include/asm/processor.h+0−2
@@ -80,7 +80,6 @@ BUILD_FPR_ACCESS(64) · 79 unmodified lines
80 80
81struct loongarch_fpu {81struct loongarch_fpu {
82 unsigned int fcsr;82 unsigned int fcsr;
83 unsigned int vcsr;
84 uint64_t fcc; /* 8x8 */83 uint64_t fcc; /* 8x8 */
85 union fpureg fpr[NUM_FPU_REGS];84 union fpureg fpr[NUM_FPU_REGS];
86};85};
@@ -161,7 +160,6 @@ struct thread_struct { · 74 unmodified lines
161 */ \160 */ \
162 .fpu = { \161 .fpu = { \
163 .fcsr = 0, \162 .fcsr = 0, \
164 .vcsr = 0, \
165 .fcc = 0, \163 .fcc = 0, \
166 .fpr = {{{0,},},}, \164 .fpr = {{{0,},},}, \
167 }, \165 }, \
arch/loongarch/kernel/asm-offsets.c+0−1
@@ -166,7 +166,6 @@ void output_thread_fpu_defines(void) · 165 unmodified lines
166 166
167 OFFSET(THREAD_FCSR, loongarch_fpu, fcsr);167 OFFSET(THREAD_FCSR, loongarch_fpu, fcsr);
168 OFFSET(THREAD_FCC, loongarch_fpu, fcc);168 OFFSET(THREAD_FCC, loongarch_fpu, fcc);
169 OFFSET(THREAD_VCSR, loongarch_fpu, vcsr);
170 BLANK();169 BLANK();
171}170}
172 171
arch/loongarch/kernel/fpu.S+0−10
@@ -146,16 +146,6 @@ · 145 unmodified lines
146 movgr2fcsr fcsr0, \tmp0146 movgr2fcsr fcsr0, \tmp0
147 .endm147 .endm
148 148
149 .macro sc_save_vcsr base, tmp0
150 movfcsr2gr \tmp0, vcsr16
151 EX st.w \tmp0, \base, 0
152 .endm
153
154 .macro sc_restore_vcsr base, tmp0
155 EX ld.w \tmp0, \base, 0
156 movgr2fcsr vcsr16, \tmp0
157 .endm
158
159/*149/*
160 * Save a thread's fp context.150 * Save a thread's fp context.
161 */151 */
arch/loongarch/kernel/numa.c+0−1
@@ -429,7 +429,6 @@ int __init init_numa_memory(void) · 428 unmodified lines
429 return 0;429 return 0;
430}430}
431 431
432EXPORT_SYMBOL(init_numa_memory);
433#endif432#endif
434 433
435void __init paging_init(void)434void __init paging_init(void)
arch/loongarch/vdso/Makefile+1−0
@@ -21,6 +21,7 @@ ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS)) · 20 unmodified lines
21endif21endif
22 22
23cflags-vdso := $(ccflags-vdso) \23cflags-vdso := $(ccflags-vdso) \
24 -isystem $(shell $(CC) -print-file-name=include) \
24 $(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \25 $(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \
25 -O2 -g -fno-strict-aliasing -fno-common -fno-builtin -G0 \26 -O2 -g -fno-strict-aliasing -fno-common -fno-builtin -G0 \
26 -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \27 -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \