summaryrefslogtreecommitdiffstats
path: root/arch/nds32/mm/mmap.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2018-06-14 15:28:52 +0100
committerGreentime Hu <greentime@andestech.com>2018-06-19 15:41:31 +0800
commita78945c357f58665d6a5da8a69e085898e831c70 (patch)
tree371247437d35bfbad0d7176370c5ead84b94866a /arch/nds32/mm/mmap.c
parent97d1e3dc8d98f97b65350f8ab221e6d061705abc (diff)
downloadlinux-stable-a78945c357f58665d6a5da8a69e085898e831c70.tar.gz
linux-stable-a78945c357f58665d6a5da8a69e085898e831c70.tar.bz2
linux-stable-a78945c357f58665d6a5da8a69e085898e831c70.zip
nds32: Fix build error caused by configuration flag rename
Fix build error on nds32 due to the merge of commit e3d5980568f ("lib: Rename compiler intrinsic selects to GENERIC_LIB_*") during the 4.18 merge window which renames Kconfig symbols. This had raced with commit aeaa7af744fa ("nds32: lib: To use generic lib instead of libgcc to prevent the symbol undefined issue.") merged late in the 4.17 cycle, which added selects to nds32 using the original Kconfig symbol names. When they came together in merge commit 763f96944c95 ("Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") this resulted in the following build errors: nds32le-linux-ld: kernel/time/timekeeping.o: in function `timekeeping_init': timekeeping.c:(.init.text+0x140): undefined reference to `__ashldi3' nds32le-linux-ld: timekeeping.c:(.init.text+0x144): undefined reference to `__ashldi3' nds32le-linux-ld: timekeeping.c:(.init.text+0x17e): undefined reference to `__lshrdi3' nds32le-linux-ld: timekeeping.c:(.init.text+0x182): undefined reference to `__lshrdi3' nds32le-linux-ld: drivers/clocksource/mmio.o: in function `clocksource_mmio_init': mmio.c:(.init.text+0x54): undefined reference to `__lshrdi3' nds32le-linux-ld: mmio.c:(.init.text+0x58): undefined reference to `__lshrdi3' Rename all 6 selects in nds32 and adjust the ordering accordingly to be alphabetical. Fixes: 763f96944c95 ("Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") Signed-off-by: Guenter Roeck <linux@roeck-us.net> [jhogan@kernel.org: Rename all 6 symbols, sort, update commit message] Signed-off-by: James Hogan <jhogan@kernel.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Vincent Chen <deanbo422@gmail.com> Cc: Matt Redfearn <matt.redfearn@mips.com> Cc: Palmer Dabbelt <palmer@sifive.com> Acked-by: Greentime Hu <greentime@andestech.com> Signed-off-by: Greentime Hu <greentime@andestech.com>
Diffstat (limited to 'arch/nds32/mm/mmap.c')
0 files changed, 0 insertions, 0 deletions