Commit 5929a1f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-4.20-rc2' of... 

Merge tag 'riscv-for-linus-4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull RISC-V fixes from Palmer Dabbelt:
 "This contains a few patches that fix various issues in the RISC-V
  port:

   - enable printk timestamps in the RISC-V defconfig.

   - a whitespace fix to "struct pt_regs".

   - add a "vdso_install" target for RISC-V.

   - a pair of build fixes: one to fix a typo in our makefile, and one
     to clean up some warnings.

  There will probably be more patches from us for 4.20, but I don't have
  anything that's ready to go right now so I'm going to hold off a bit.

  Right now the only concrete thing I know I want to make sure gets
  sorted out is our 32-bit stat interface, which I don't want sitting in
  limbo for another cycle as we have to get RV32I glibc sone"

* tag 'riscv-for-linus-4.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  RISC-V: Silence some module warnings on 32-bit
  RISC-V: lib: Fix build error for 64-bit
  riscv: add missing vdso_install target
  riscv: fix spacing in struct pt_regs
  RISC-V: defconfig: Enable printk timestamps
parents 9746e467 ef3a6140

arch/riscv/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -77,4 +77,8 @@ core-y += arch/riscv/kernel/ arch/riscv/mm/ 


libs-y += arch/riscv/lib/



PHONY += vdso_install

vdso_install:

	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@



all: vmlinux

arch/riscv/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -76,4 +76,5 @@ CONFIG_NFS_V4_1=y 
CONFIG_NFS_V4_2=y

CONFIG_ROOT_NFS=y

CONFIG_CRYPTO_USER_API_HASH=y

CONFIG_PRINTK_TIME=y

# CONFIG_RCU_TRACE is not set

arch/riscv/kernel/module.c

+6 −6
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int apply_r_riscv_32_rela(struct module *me, u32 *location, Elf_Addr v) 
{

	if (v != (u32)v) {

		pr_err("%s: value %016llx out of range for 32-bit field\n",

		       me->name, v);

		       me->name, (long long)v);

		return -EINVAL;

	}

	*location = v;
@@ -102,7 +102,7 @@ static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u32 *location, 
	if (offset != (s32)offset) {

		pr_err(

		  "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",

		  me->name, v, location);

		  me->name, (long long)v, location);

		return -EINVAL;

	}
@@ -144,7 +144,7 @@ static int apply_r_riscv_hi20_rela(struct module *me, u32 *location, 
	if (IS_ENABLED(CMODEL_MEDLOW)) {

		pr_err(

		  "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",

		  me->name, v, location);

		  me->name, (long long)v, location);

		return -EINVAL;

	}
@@ -188,7 +188,7 @@ static int apply_r_riscv_got_hi20_rela(struct module *me, u32 *location, 
	} else {

		pr_err(

		  "%s: can not generate the GOT entry for symbol = %016llx from PC = %p\n",

		  me->name, v, location);

		  me->name, (long long)v, location);

		return -EINVAL;

	}
@@ -212,7 +212,7 @@ static int apply_r_riscv_call_plt_rela(struct module *me, u32 *location, 
		} else {

			pr_err(

			  "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",

			  me->name, v, location);

			  me->name, (long long)v, location);

			return -EINVAL;

		}

	}
@@ -234,7 +234,7 @@ static int apply_r_riscv_call_rela(struct module *me, u32 *location, 
	if (offset != fill_v) {

		pr_err(

		  "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",

		  me->name, v, location);

		  me->name, (long long)v, location);

		return -EINVAL;

	}

arch/riscv/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ lib-y += memcpy.o 
lib-y	+= memset.o

lib-y	+= uaccess.o



lib-(CONFIG_64BIT) += tishift.o

lib-$(CONFIG_64BIT) += tishift.o



lib-$(CONFIG_32BIT) += udivdi3.o

arch/riscv/include/asm/ptrace.h

+2 −2

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE