mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 13:51:44 +00:00
RISC-V Fixes for 4.17-rc3
This pull request contains three small fixes related to the RISC-V port that I'd like to target for 4.17-rc3: * A Kconfig cleanup to select DMA_DIRECT_OPS instead of redefining it in arch/riscv. * The removal of asm/handle_irq.h, which doesn't exist, from our arch header list. * The addition of "-no-pie" the link rules for our VDSO-related files, which fixes the build on systems where PIE is enabled by default. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEAM520YNJYN/OiG3470yhUCzLq0EFAlrgt60THHBhbG1lckBk YWJiZWx0LmNvbQAKCRDvTKFQLMurQWlSD/4w9Ftv5HYozvr63CzVgixjGAxPJJ8e cw/uDQWZfUo+Lr7f2tApZ8jx/UWsvmkOV5NjmLyT+wz+g7MYnijQjw/a4rlCx6Xm eoftU97nnplZrXdRNmPC0poHgEDWR0cSUmGf95kuoujvGmOd188+IFGFlpYaUAUA 8KgJ24K6QhLfP4nkwDw5jSHDVtQQlV5yFWNfGzsx5f/3mKBLyjZ5oMJZpoV+gawv ywFk5qKJVawYMg+cwc16ESsinlwdx4Ksxi3T4RyugdoHXOpz0lkEX9LXIKbkEAHA 6OPw2c3epvjAwWycRzPoYzovOtEB+VCIqLKT+xstzzApH8VWbr++3npybzD7UKqR NFu9Zwhd76Iyya7r67a6lfx0/kMNgTXPifRxJvTah34Rdq3p7NCbppoOaTtNOnz6 sBZbVwRaGDIDWNBxEEgDbapir1Deyow93fB4brQBU8UbHqEO28BVMzmW7an2KFPB tg52Ss8yRhAEyvelprYvFAFOTggHSFDtrh2JN8OWCajwCkx5f9FZ8THayjAalL5Q LQprU0Y3HZ5zzBtOcNTENKOU53kW04xIS/6kfiULvnRn9YFslm/2qzO+5cBNhGfW vubUaHVHDvl8hp4VVh3CEsVa8x16eTbH98TT3qlDeEoHlVqvViWKc4qP4kunpKBQ GLNXTUyMbu60Uw== =SdD5 -----END PGP SIGNATURE----- Merge tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux Pull RISC-V fixes from Palmer Dabbelt: "This contains three small fixes related to the RISC-V port that I'd like to target for 4.17-rc3: - a Kconfig cleanup to select DMA_DIRECT_OPS instead of redefining it in arch/riscv - the removal of asm/handle_irq.h, which doesn't exist, from our arch header list - the addition of "-no-pie" the link rules for our VDSO-related files, which fixes the build on systems where PIE is enabled by default" * tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux: RISC-V: build vdso-dummy.o with -no-pie riscv: there is no <asm/handle_irq.h> riscv: select DMA_DIRECT_OPS instead of redefining it
This commit is contained in:
commit
c6dc3e711a
@ -11,6 +11,7 @@ config RISCV
|
||||
select ARCH_WANT_FRAME_POINTERS
|
||||
select CLONE_BACKWARDS
|
||||
select COMMON_CLK
|
||||
select DMA_DIRECT_OPS
|
||||
select GENERIC_CLOCKEVENTS
|
||||
select GENERIC_CPU_DEVICES
|
||||
select GENERIC_IRQ_SHOW
|
||||
@ -89,9 +90,6 @@ config PGTABLE_LEVELS
|
||||
config HAVE_KPROBES
|
||||
def_bool n
|
||||
|
||||
config DMA_DIRECT_OPS
|
||||
def_bool y
|
||||
|
||||
menu "Platform type"
|
||||
|
||||
choice
|
||||
|
@ -15,7 +15,6 @@ generic-y += fcntl.h
|
||||
generic-y += futex.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += handle_irq.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
@ -52,7 +52,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
|
||||
# Add -lgcc so rv32 gets static muldi3 and lshrdi3 definitions.
|
||||
# Make sure only to export the intended __vdso_xxx symbol offsets.
|
||||
quiet_cmd_vdsold = VDSOLD $@
|
||||
cmd_vdsold = $(CC) $(KCFLAGS) -nostdlib $(SYSCFLAGS_$(@F)) \
|
||||
cmd_vdsold = $(CC) $(KCFLAGS) $(call cc-option, -no-pie) -nostdlib $(SYSCFLAGS_$(@F)) \
|
||||
-Wl,-T,$(filter-out FORCE,$^) -o $@.tmp -lgcc && \
|
||||
$(CROSS_COMPILE)objcopy \
|
||||
$(patsubst %, -G __vdso_%, $(vdso-syms)) $@.tmp $@
|
||||
|
Loading…
Reference in New Issue
Block a user