From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2020 19:55:20 +0000 (-0700)
Subject: Merge tag 'riscv-for-linus-5.8-mw1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: baikal/aarch64/sdk6.1~9090
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=2122326ac85655091a13fea7ca2d941d1e353870;p=kernel.git

Merge tag 'riscv-for-linus-5.8-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Pull more RISC-V updates from Palmer Dabbelt:

 - Kconfig select statements are now sorted alphanumerically

 - first-level interrupts are now handled via a full irqchip driver

 - CPU hotplug is fixed

 - vDSO calls now use the common vDSO infrastructure

* tag 'riscv-for-linus-5.8-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: set the permission of vdso_data to read-only
  riscv: use vDSO common flow to reduce the latency of the time-related functions
  riscv: fix build warning of missing prototypes
  RISC-V: Don't mark init section as non-executable
  RISC-V: Force select RISCV_INTC for CONFIG_RISCV
  RISC-V: Remove do_IRQ() function
  clocksource/drivers/timer-riscv: Use per-CPU timer interrupt
  irqchip: RISC-V per-HART local interrupt controller driver
  RISC-V: Rename and move plic_find_hart_id() to arch directory
  RISC-V: self-contained IPI handling routine
  RISC-V: Sort select statements alphanumerically
---

2122326ac85655091a13fea7ca2d941d1e353870
diff --cc arch/riscv/kernel/vdso.c
index e827fae3bf903,94450332aa4f2..678204231700c
--- a/arch/riscv/kernel/vdso.c
+++ b/arch/riscv/kernel/vdso.c
@@@ -79,11 -84,19 +84,19 @@@ int arch_setup_additional_pages(struct 
  		(VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC),
  		vdso_pagelist);
  
- 	if (unlikely(ret))
+ 	if (unlikely(ret)) {
  		mm->context.vdso = NULL;
+ 		goto end;
+ 	}
  
+ 	vdso_base += (vdso_pages << PAGE_SHIFT);
+ 	ret = install_special_mapping(mm, vdso_base, PAGE_SIZE,
+ 		(VM_READ | VM_MAYREAD), &vdso_pagelist[vdso_pages]);
+ 
+ 	if (unlikely(ret))
+ 		mm->context.vdso = NULL;
  end:
 -	up_write(&mm->mmap_sem);
 +	mmap_write_unlock(mm);
  	return ret;
  }