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

Linus Torvalds 7 years ago 5929a1f0 9746e467

+14 -9

5 changed files

expand all

arch

riscv

Makefile

configs

defconfig

include

asm

ptrace.h

kernel

module.c

lib

Makefile

arch/riscv/Makefile

··· 77 77 78 78 libs-y += arch/riscv/lib/ 79 79 80 + PHONY += vdso_install 81 + vdso_install: 82 + $(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@ 83 + 80 84 all: vmlinux

arch/riscv/configs/defconfig

··· 76 76 CONFIG_NFS_V4_2=y 77 77 CONFIG_ROOT_NFS=y 78 78 CONFIG_CRYPTO_USER_API_HASH=y 79 + CONFIG_PRINTK_TIME=y 79 80 # CONFIG_RCU_TRACE is not set

+2 -2

arch/riscv/include/asm/ptrace.h

··· 56 56 unsigned long sstatus; 57 57 unsigned long sbadaddr; 58 58 unsigned long scause; 59 - /* a0 value before the syscall */ 60 - unsigned long orig_a0; 59 + /* a0 value before the syscall */ 60 + unsigned long orig_a0; 61 61 }; 62 62 63 63 #ifdef CONFIG_64BIT

+6 -6

arch/riscv/kernel/module.c

··· 21 21 { 22 22 if (v != (u32)v) { 23 23 pr_err("%s: value %016llx out of range for 32-bit field\n", 24 - me->name, v); 24 + me->name, (long long)v); 25 25 return -EINVAL; 26 26 } 27 27 *location = v; ··· 102 102 if (offset != (s32)offset) { 103 103 pr_err( 104 104 "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", 105 - me->name, v, location); 105 + me->name, (long long)v, location); 106 106 return -EINVAL; 107 107 } 108 108 ··· 144 144 if (IS_ENABLED(CMODEL_MEDLOW)) { 145 145 pr_err( 146 146 "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", 147 - me->name, v, location); 147 + me->name, (long long)v, location); 148 148 return -EINVAL; 149 149 } 150 150 ··· 188 188 } else { 189 189 pr_err( 190 190 "%s: can not generate the GOT entry for symbol = %016llx from PC = %p\n", 191 - me->name, v, location); 191 + me->name, (long long)v, location); 192 192 return -EINVAL; 193 193 } 194 194 ··· 212 212 } else { 213 213 pr_err( 214 214 "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", 215 - me->name, v, location); 215 + me->name, (long long)v, location); 216 216 return -EINVAL; 217 217 } 218 218 } ··· 234 234 if (offset != fill_v) { 235 235 pr_err( 236 236 "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", 237 - me->name, v, location); 237 + me->name, (long long)v, location); 238 238 return -EINVAL; 239 239 } 240 240

+1 -1

arch/riscv/lib/Makefile

··· 3 3 lib-y += memset.o 4 4 lib-y += uaccess.o 5 5 6 - lib-(CONFIG_64BIT) += tishift.o 6 + lib-$(CONFIG_64BIT) += tishift.o 7 7 8 8 lib-$(CONFIG_32BIT) += udivdi3.o

Configure Feed

Configure Feed