tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'nds32-for-linus-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux

Pull nds32 updates from Greentime Hu:

- Clean up codes and Makefile

- Fix a vDSO bug

- Remove useless functions/header files

- Update git repo path in MAINTAINERS

* tag 'nds32-for-linus-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
nds32: Fix vDSO clock_getres()
MAINTAINERS: update nds32 git repo path
nds32: don't export low-level cache flushing routines
arch: nds32: Kconfig: pedantic formatting
nds32: fix semicolon code style issue
nds32: vdso: drop unnecessary cc-ldoption
nds32: remove unused generic-y += cmpxchg-local.h
nds32: Use the correct style for SPDX License Identifier
nds32: remove __virt_to_bus and __bus_to_virt
nds32: vdso: fix and clean-up Makefile
nds32: add vmlinux.lds and vdso.so to .gitignore
nds32: ex-exit: Remove unneeded need_resched() loop
nds32/io: Remove useless definition of mmiowb()
nds32: Removed unused thread flag TIF_USEDFPU

Linus Torvalds 4489da71 80111bfb

+72 -87
+1 -1
MAINTAINERS
··· 1000 1000 ANDES ARCHITECTURE 1001 1001 M: Greentime Hu <green.hu@gmail.com> 1002 1002 M: Vincent Chen <deanbo422@gmail.com> 1003 - T: git https://github.com/andestech/linux.git 1003 + T: git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git 1004 1004 S: Supported 1005 1005 F: arch/nds32/ 1006 1006 F: Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
+8 -8
arch/nds32/Kconfig
··· 4 4 # 5 5 6 6 config NDS32 7 - def_bool y 7 + def_bool y 8 8 select ARCH_32BIT_OFF_T 9 9 select ARCH_HAS_SYNC_DMA_FOR_CPU 10 10 select ARCH_HAS_SYNC_DMA_FOR_DEVICE ··· 51 51 def_bool y 52 52 53 53 config GENERIC_CSUM 54 - def_bool y 54 + def_bool y 55 55 56 56 config GENERIC_HWEIGHT 57 - def_bool y 57 + def_bool y 58 58 59 59 config GENERIC_LOCKBREAK 60 - def_bool y 60 + def_bool y 61 61 depends on PREEMPT 62 62 63 63 config TRACE_IRQFLAGS_SUPPORT 64 64 def_bool y 65 65 66 66 config STACKTRACE_SUPPORT 67 - def_bool y 67 + def_bool y 68 68 69 69 config FIX_EARLYCON_MEM 70 70 def_bool y ··· 79 79 default 1 80 80 81 81 config MMU 82 - def_bool y 82 + def_bool y 83 83 84 84 config NDS32_BUILTIN_DTB 85 - string "Builtin DTB" 86 - default "" 85 + string "Builtin DTB" 86 + default "" 87 87 help 88 88 User can use it to specify the dts of the SoC 89 89 endmenu
-1
arch/nds32/include/asm/Kbuild
··· 6 6 generic-y += checksum.h 7 7 generic-y += clkdev.h 8 8 generic-y += cmpxchg.h 9 - generic-y += cmpxchg-local.h 10 9 generic-y += compat.h 11 10 generic-y += cputime.h 12 11 generic-y += device.h
+1 -1
arch/nds32/include/asm/assembler.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_ASSEMBLER_H__
+1 -1
arch/nds32/include/asm/barrier.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_ASM_BARRIER_H
+1 -1
arch/nds32/include/asm/bitfield.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_BITFIELD_H__
+1 -1
arch/nds32/include/asm/cache.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_CACHE_H__
+1 -1
arch/nds32/include/asm/cache_info.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 struct cache_info {
+1 -1
arch/nds32/include/asm/cacheflush.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_CACHEFLUSH_H__
+1 -1
arch/nds32/include/asm/current.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASM_NDS32_CURRENT_H
+1 -1
arch/nds32/include/asm/delay.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_DELAY_H__
+1 -1
arch/nds32/include/asm/elf.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASMNDS32_ELF_H
+1 -1
arch/nds32/include/asm/fixmap.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_FIXMAP_H
+1 -1
arch/nds32/include/asm/futex.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_FUTEX_H__
+1 -1
arch/nds32/include/asm/highmem.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASM_HIGHMEM_H
+1 -1
arch/nds32/include/asm/io.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_IO_H
+1 -1
arch/nds32/include/asm/irqflags.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #include <asm/nds32.h>
+1 -1
arch/nds32/include/asm/l2_cache.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef L2_CACHE_H
+1 -1
arch/nds32/include/asm/linkage.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_LINKAGE_H
+1 -9
arch/nds32/include/asm/memory.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_MEMORY_H ··· 13 13 14 14 #ifndef PHYS_OFFSET 15 15 #define PHYS_OFFSET (0x0) 16 - #endif 17 - 18 - #ifndef __virt_to_bus 19 - #define __virt_to_bus __virt_to_phys 20 - #endif 21 - 22 - #ifndef __bus_to_virt 23 - #define __bus_to_virt __phys_to_virt 24 16 #endif 25 17 26 18 /*
+1 -1
arch/nds32/include/asm/mmu.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_MMU_H
+1 -1
arch/nds32/include/asm/mmu_context.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_MMU_CONTEXT_H
+1 -1
arch/nds32/include/asm/module.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASM_NDS32_MODULE_H
+1 -1
arch/nds32/include/asm/nds32.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASM_NDS32_NDS32_H_
+1 -1
arch/nds32/include/asm/page.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 - * SPDX-License-Identifier: GPL-2.0 3 3 * Copyright (C) 2005-2017 Andes Technology Corporation 4 4 */ 5 5
+1 -1
arch/nds32/include/asm/pgalloc.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASMNDS32_PGALLOC_H
+1 -1
arch/nds32/include/asm/pgtable.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASMNDS32_PGTABLE_H
+1 -1
arch/nds32/include/asm/proc-fns.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_PROCFNS_H__
+1 -1
arch/nds32/include/asm/processor.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_PROCESSOR_H
+1 -1
arch/nds32/include/asm/ptrace.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_PTRACE_H
+1 -1
arch/nds32/include/asm/shmparam.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASMNDS32_SHMPARAM_H
+1 -1
arch/nds32/include/asm/string.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_STRING_H
+1 -1
arch/nds32/include/asm/swab.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_SWAB_H__
+1 -1
arch/nds32/include/asm/syscall.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. 3 3 // Copyright (C) 2005-2017 Andes Technology Corporation 4 4
+1 -1
arch/nds32/include/asm/syscalls.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_SYSCALLS_H
+1 -3
arch/nds32/include/asm/thread_info.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_THREAD_INFO_H ··· 42 42 * TIF_SIGPENDING - signal pending 43 43 * TIF_NEED_RESCHED - rescheduling necessary 44 44 * TIF_NOTIFY_RESUME - callback before returning to user 45 - * TIF_USEDFPU - FPU was used by this task this quantum (SMP) 46 45 * TIF_POLLING_NRFLAG - true if poll_idle() is polling TIF_NEED_RESCHED 47 46 */ 48 47 #define TIF_SIGPENDING 1 ··· 49 50 #define TIF_SINGLESTEP 3 50 51 #define TIF_NOTIFY_RESUME 4 /* callback before returning to user */ 51 52 #define TIF_SYSCALL_TRACE 8 52 - #define TIF_USEDFPU 16 53 53 #define TIF_POLLING_NRFLAG 17 54 54 #define TIF_MEMDIE 18 55 55 #define TIF_FREEZE 19
+1 -1
arch/nds32/include/asm/tlb.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASMNDS32_TLB_H
+1 -1
arch/nds32/include/asm/tlbflush.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASMNDS32_TLBFLUSH_H
+1 -1
arch/nds32/include/asm/uaccess.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASMANDES_UACCESS_H
+1 -1
arch/nds32/include/asm/unistd.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #define __ARCH_WANT_SYS_CLONE
+1 -1
arch/nds32/include/asm/vdso.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 - * SPDX-License-Identifier: GPL-2.0 3 3 * Copyright (C) 2005-2017 Andes Technology Corporation 4 4 */ 5 5
+2 -1
arch/nds32/include/asm/vdso_datapage.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2012 ARM Limited 3 3 // Copyright (C) 2005-2017 Andes Technology Corporation 4 4 #ifndef __ASM_VDSO_DATAPAGE_H ··· 20 20 u32 xtime_clock_sec; /* CLOCK_REALTIME - seconds */ 21 21 u32 cs_mult; /* clocksource multiplier */ 22 22 u32 cs_shift; /* Cycle to nanosecond divisor (power of two) */ 23 + u32 hrtimer_res; /* hrtimer resolution */ 23 24 24 25 u64 cs_cycle_last; /* last cycle value */ 25 26 u64 cs_mask; /* clocksource mask */
+1 -1
arch/nds32/include/asm/vdso_timer_info.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 extern struct timer_info_t timer_info;
+1 -1
arch/nds32/include/uapi/asm/auxvec.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_AUXVEC_H
+1 -1
arch/nds32/include/uapi/asm/byteorder.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __NDS32_BYTEORDER_H__
+1 -1
arch/nds32/include/uapi/asm/cachectl.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 1994, 1995, 1996 by Ralf Baechle 3 3 // Copyright (C) 2005-2017 Andes Technology Corporation 4 4 #ifndef _ASM_CACHECTL
+1 -1
arch/nds32/include/uapi/asm/param.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __ASM_NDS32_PARAM_H
+1 -1
arch/nds32/include/uapi/asm/ptrace.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef __UAPI_ASM_NDS32_PTRACE_H
+1 -1
arch/nds32/include/uapi/asm/sigcontext.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #ifndef _ASMNDS32_SIGCONTEXT_H
+1 -1
arch/nds32/include/uapi/asm/unistd.h
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 2 // Copyright (C) 2005-2017 Andes Technology Corporation 3 3 4 4 #define __ARCH_WANT_STAT64
+1
arch/nds32/kernel/.gitignore
··· 1 + vmlinux.lds
+1 -1
arch/nds32/kernel/cacheinfo.c
··· 13 13 this_leaf->level = level; 14 14 this_leaf->type = type; 15 15 this_leaf->coherency_line_size = CACHE_LINE_SIZE(cache_type); 16 - this_leaf->number_of_sets = CACHE_SET(cache_type);; 16 + this_leaf->number_of_sets = CACHE_SET(cache_type); 17 17 this_leaf->ways_of_associativity = CACHE_WAY(cache_type); 18 18 this_leaf->size = this_leaf->number_of_sets * 19 19 this_leaf->coherency_line_size * this_leaf->ways_of_associativity;
+2 -2
arch/nds32/kernel/ex-exit.S
··· 163 163 gie_disable 164 164 lwi $t0, [tsk+#TSK_TI_PREEMPT] 165 165 bnez $t0, no_work_pending 166 - need_resched: 166 + 167 167 lwi $t0, [tsk+#TSK_TI_FLAGS] 168 168 andi $p1, $t0, #_TIF_NEED_RESCHED 169 169 beqz $p1, no_work_pending ··· 173 173 beqz $t0, no_work_pending 174 174 175 175 jal preempt_schedule_irq 176 - b need_resched 176 + b no_work_pending 177 177 #endif 178 178 179 179 /*
-6
arch/nds32/kernel/nds32_ksyms.c
··· 23 23 EXPORT_SYMBOL(__arch_copy_from_user); 24 24 EXPORT_SYMBOL(__arch_copy_to_user); 25 25 EXPORT_SYMBOL(__arch_clear_user); 26 - 27 - /* cache handling */ 28 - EXPORT_SYMBOL(cpu_icache_inval_all); 29 - EXPORT_SYMBOL(cpu_dcache_wbinval_all); 30 - EXPORT_SYMBOL(cpu_dma_inval_range); 31 - EXPORT_SYMBOL(cpu_dma_wb_range);
+1
arch/nds32/kernel/vdso.c
··· 220 220 vdso_data->xtime_coarse_sec = tk->xtime_sec; 221 221 vdso_data->xtime_coarse_nsec = tk->tkr_mono.xtime_nsec >> 222 222 tk->tkr_mono.shift; 223 + vdso_data->hrtimer_res = hrtimer_resolution; 223 224 vdso_write_end(vdso_data); 224 225 } 225 226
+1
arch/nds32/kernel/vdso/.gitignore
··· 1 + vdso.lds
+5 -9
arch/nds32/kernel/vdso/Makefile
··· 11 11 targets := $(obj-vdso) vdso.so vdso.so.dbg 12 12 obj-vdso := $(addprefix $(obj)/, $(obj-vdso)) 13 13 14 - ccflags-y := -shared -fno-common -fno-builtin 15 - ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 \ 16 - $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) 17 - ccflags-y += -fPIC -Wl,-shared -g 14 + ccflags-y := -shared -fno-common -fno-builtin -nostdlib -fPIC -Wl,-shared -g \ 15 + -Wl,-soname=linux-vdso.so.1 -Wl,--hash-style=sysv 18 16 19 17 # Disable gcov profiling for VDSO code 20 18 GCOV_PROFILE := n ··· 26 28 $(obj)/vdso.o : $(obj)/vdso.so 27 29 28 30 # Link rule for the .so file, .lds has to be first 29 - $(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) 31 + $(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE 30 32 $(call if_changed,vdsold) 31 33 32 34 ··· 38 40 # Generate VDSO offsets using helper script 39 41 gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh 40 42 quiet_cmd_vdsosym = VDSOSYM $@ 41 - define cmd_vdsosym 42 - $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ 43 - endef 43 + cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ 44 44 45 45 include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE 46 46 $(call if_changed,vdsosym) ··· 61 65 62 66 # Actual build commands 63 67 quiet_cmd_vdsold = VDSOL $@ 64 - cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ 68 + cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $(real-prereqs) -o $@ 65 69 quiet_cmd_vdsoas = VDSOA $@ 66 70 cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $< 67 71 quiet_cmd_vdsocc = VDSOA $@
+3 -1
arch/nds32/kernel/vdso/gettimeofday.c
··· 208 208 209 209 notrace int __vdso_clock_getres(clockid_t clk_id, struct timespec *res) 210 210 { 211 + struct vdso_data *vdata = __get_datapage(); 212 + 211 213 if (res == NULL) 212 214 return 0; 213 215 switch (clk_id) { ··· 217 215 case CLOCK_MONOTONIC: 218 216 case CLOCK_MONOTONIC_RAW: 219 217 res->tv_sec = 0; 220 - res->tv_nsec = CLOCK_REALTIME_RES; 218 + res->tv_nsec = vdata->hrtimer_res; 221 219 break; 222 220 case CLOCK_REALTIME_COARSE: 223 221 case CLOCK_MONOTONIC_COARSE:
+1 -1
arch/nds32/mm/init.c
··· 260 260 261 261 BUG_ON(idx <= FIX_HOLE || idx >= __end_of_fixed_addresses); 262 262 263 - pte = (pte_t *)&fixmap_pmd_p[pte_index(addr)];; 263 + pte = (pte_t *)&fixmap_pmd_p[pte_index(addr)]; 264 264 265 265 if (pgprot_val(flags)) { 266 266 set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, flags));