Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6dc3e71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-4.17-rc3' of... 

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
parents 26ed24e4 85602bea

arch/riscv/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -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

arch/riscv/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/riscv/kernel/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 $@