summaryrefslogtreecommitdiffstats
path: root/arch/nds32/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-17 10:17:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-17 10:17:29 -0700
commit4489da7183099f569a7d3dd819c975073c04bc72 (patch)
tree79d4c1f337467108ed6cdbe95179ba7494040197 /arch/nds32/mm
parent80111bfb672d8c04d60c25559243554f732f2848 (diff)
parentaf9abd65983cf3602c03ef3d16fe549ba1f3eeed (diff)
downloadtalos-op-linux-4489da7183099f569a7d3dd819c975073c04bc72.tar.gz
talos-op-linux-4489da7183099f569a7d3dd819c975073c04bc72.zip
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
Diffstat (limited to 'arch/nds32/mm')
-rw-r--r--arch/nds32/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c
index 1a4ab1b7525f..55703b03d172 100644
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c
@@ -260,7 +260,7 @@ void __set_fixmap(enum fixed_addresses idx,
BUG_ON(idx <= FIX_HOLE || idx >= __end_of_fixed_addresses);
- pte = (pte_t *)&fixmap_pmd_p[pte_index(addr)];;
+ pte = (pte_t *)&fixmap_pmd_p[pte_index(addr)];
if (pgprot_val(flags)) {
set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, flags));
OpenPOWER on IntegriCloud