Skip to content

Commit e8a4e1c

Browse files
committed
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
2 parents ef4ab3b + f0fbe65 commit e8a4e1c

File tree

8 files changed

+2
-19
lines changed

8 files changed

+2
-19
lines changed

arch/loongarch/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ config LOONGARCH
5454
select GENERIC_CMOS_UPDATE
5555
select GENERIC_CPU_AUTOPROBE
5656
select GENERIC_ENTRY
57-
select GENERIC_FIND_FIRST_BIT
5857
select GENERIC_GETTIMEOFDAY
5958
select GENERIC_IRQ_MULTI_HANDLER
6059
select GENERIC_IRQ_PROBE
@@ -77,7 +76,6 @@ config LOONGARCH
7776
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
7877
select HAVE_ASM_MODVERSIONS
7978
select HAVE_CONTEXT_TRACKING
80-
select HAVE_COPY_THREAD_TLS
8179
select HAVE_DEBUG_STACKOVERFLOW
8280
select HAVE_DMA_CONTIGUOUS
8381
select HAVE_EXIT_THREAD
@@ -86,8 +84,6 @@ config LOONGARCH
8684
select HAVE_IOREMAP_PROT
8785
select HAVE_IRQ_EXIT_ON_IRQ_STACK
8886
select HAVE_IRQ_TIME_ACCOUNTING
89-
select HAVE_MEMBLOCK
90-
select HAVE_MEMBLOCK_NODE_MAP
9187
select HAVE_MOD_ARCH_SPECIFIC
9288
select HAVE_NMI
9389
select HAVE_PERF_EVENTS

arch/loongarch/include/asm/fpregdef.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,5 @@
4848
#define fcsr1 $r1
4949
#define fcsr2 $r2
5050
#define fcsr3 $r3
51-
#define vcsr16 $r16
5251

5352
#endif /* _ASM_FPREGDEF_H */

arch/loongarch/include/asm/page.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define _ASM_PAGE_H
77

88
#include <linux/const.h>
9+
#include <asm/addrspace.h>
910

1011
/*
1112
* PAGE_SHIFT determines the page size

arch/loongarch/include/asm/processor.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ BUILD_FPR_ACCESS(64)
8080

8181
struct loongarch_fpu {
8282
unsigned int fcsr;
83-
unsigned int vcsr;
8483
uint64_t fcc; /* 8x8 */
8584
union fpureg fpr[NUM_FPU_REGS];
8685
};
@@ -161,7 +160,6 @@ struct thread_struct {
161160
*/ \
162161
.fpu = { \
163162
.fcsr = 0, \
164-
.vcsr = 0, \
165163
.fcc = 0, \
166164
.fpr = {{{0,},},}, \
167165
}, \

arch/loongarch/kernel/asm-offsets.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ void output_thread_fpu_defines(void)
166166

167167
OFFSET(THREAD_FCSR, loongarch_fpu, fcsr);
168168
OFFSET(THREAD_FCC, loongarch_fpu, fcc);
169-
OFFSET(THREAD_VCSR, loongarch_fpu, vcsr);
170169
BLANK();
171170
}
172171

arch/loongarch/kernel/fpu.S

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,6 @@
146146
movgr2fcsr fcsr0, \tmp0
147147
.endm
148148

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-
159149
/*
160150
* Save a thread's fp context.
161151
*/

arch/loongarch/kernel/numa.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ int __init init_numa_memory(void)
429429
return 0;
430430
}
431431

432-
EXPORT_SYMBOL(init_numa_memory);
433432
#endif
434433

435434
void __init paging_init(void)

arch/loongarch/vdso/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS))
2121
endif
2222

2323
cflags-vdso := $(ccflags-vdso) \
24+
-isystem $(shell $(CC) -print-file-name=include) \
2425
$(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \
2526
-O2 -g -fno-strict-aliasing -fno-common -fno-builtin -G0 \
2627
-fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \

0 commit comments

Comments
 (0)