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
Unified · Split
| @@ -54,7 +54,6 @@ config LOONGARCH · 53 unmodified lines | ||
| 54 | 54 | select GENERIC_CMOS_UPDATE |
| 55 | 55 | select GENERIC_CPU_AUTOPROBE |
| 56 | 56 | select GENERIC_ENTRY |
| 57 | − select GENERIC_FIND_FIRST_BIT | |
| 58 | 57 | select GENERIC_GETTIMEOFDAY |
| 59 | 58 | select GENERIC_IRQ_MULTI_HANDLER |
| 60 | 59 | select GENERIC_IRQ_PROBE |
| @@ -77,7 +76,6 @@ config LOONGARCH · 16 unmodified lines | ||
| 77 | 76 | select HAVE_ARCH_TRANSPARENT_HUGEPAGE |
| 78 | 77 | select HAVE_ASM_MODVERSIONS |
| 79 | 78 | select HAVE_CONTEXT_TRACKING |
| 80 | − select HAVE_COPY_THREAD_TLS | |
| 81 | 79 | select HAVE_DEBUG_STACKOVERFLOW |
| 82 | 80 | select HAVE_DMA_CONTIGUOUS |
| 83 | 81 | select HAVE_EXIT_THREAD |
| @@ -86,8 +84,6 @@ config LOONGARCH · 2 unmodified lines | ||
| 86 | 84 | select HAVE_IOREMAP_PROT |
| 87 | 85 | select HAVE_IRQ_EXIT_ON_IRQ_STACK |
| 88 | 86 | select HAVE_IRQ_TIME_ACCOUNTING |
| 89 | − select HAVE_MEMBLOCK | |
| 90 | − select HAVE_MEMBLOCK_NODE_MAP | |
| 91 | 87 | select HAVE_MOD_ARCH_SPECIFIC |
| 92 | 88 | select HAVE_NMI |
| 93 | 89 | select HAVE_PERF_EVENTS |
| @@ -48,6 +48,5 @@ · 47 unmodified lines | ||
| 48 | 48 | #define fcsr1 $r1 |
| 49 | 49 | #define fcsr2 $r2 |
| 50 | 50 | #define fcsr3 $r3 |
| 51 | −#define vcsr16 $r16 | |
| 52 | 51 | |
| 53 | 52 | #endif /* _ASM_FPREGDEF_H */ |
| @@ -6,6 +6,7 @@ · 5 unmodified lines | ||
| 6 | 6 | #define _ASM_PAGE_H |
| 7 | 7 | |
| 8 | 8 | #include <linux/const.h> |
| 9 | +#include <asm/addrspace.h> | |
| 9 | 10 | |
| 10 | 11 | /* |
| 11 | 12 | * PAGE_SHIFT determines the page size |
| @@ -80,7 +80,6 @@ BUILD_FPR_ACCESS(64) · 79 unmodified lines | ||
| 80 | 80 | |
| 81 | 81 | struct loongarch_fpu { |
| 82 | 82 | unsigned int fcsr; |
| 83 | − unsigned int vcsr; | |
| 84 | 83 | uint64_t fcc; /* 8x8 */ |
| 85 | 84 | union fpureg fpr[NUM_FPU_REGS]; |
| 86 | 85 | }; |
| @@ -161,7 +160,6 @@ struct thread_struct { · 74 unmodified lines | ||
| 161 | 160 | */ \ |
| 162 | 161 | .fpu = { \ |
| 163 | 162 | .fcsr = 0, \ |
| 164 | − .vcsr = 0, \ | |
| 165 | 163 | .fcc = 0, \ |
| 166 | 164 | .fpr = {{{0,},},}, \ |
| 167 | 165 | }, \ |
| @@ -166,7 +166,6 @@ void output_thread_fpu_defines(void) · 165 unmodified lines | ||
| 166 | 166 | |
| 167 | 167 | OFFSET(THREAD_FCSR, loongarch_fpu, fcsr); |
| 168 | 168 | OFFSET(THREAD_FCC, loongarch_fpu, fcc); |
| 169 | − OFFSET(THREAD_VCSR, loongarch_fpu, vcsr); | |
| 170 | 169 | BLANK(); |
| 171 | 170 | } |
| 172 | 171 | |
| @@ -146,16 +146,6 @@ · 145 unmodified lines | ||
| 146 | 146 | movgr2fcsr fcsr0, \tmp0 |
| 147 | 147 | .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 | 150 | * Save a thread's fp context. |
| 161 | 151 | */ |
| @@ -429,7 +429,6 @@ int __init init_numa_memory(void) · 428 unmodified lines | ||
| 429 | 429 | return 0; |
| 430 | 430 | } |
| 431 | 431 | |
| 432 | −EXPORT_SYMBOL(init_numa_memory); | |
| 433 | 432 | #endif |
| 434 | 433 | |
| 435 | 434 | void __init paging_init(void) |
| @@ -21,6 +21,7 @@ ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS)) · 20 unmodified lines | ||
| 21 | 21 | endif |
| 22 | 22 | |
| 23 | 23 | cflags-vdso := $(ccflags-vdso) \ |
| 24 | + -isystem $(shell $(CC) -print-file-name=include) \ | |
| 24 | 25 | $(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \ |
| 25 | 26 | -O2 -g -fno-strict-aliasing -fno-common -fno-builtin -G0 \ |
| 26 | 27 | -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \ |