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

Commit 40b9672a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull asm/uaccess.h whack-a-mole from Al Viro:
 "It's linux/uaccess.h, damnit... Oh, well - eventually they'll stop
  cropping up..."

* 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  asm-prototypes.h: use linux/uaccess.h, not asm/uaccess.h
  riscv: use linux/uaccess.h, not asm/uaccess.h...
  ppc: for put_user() pull linux/uaccess.h, not asm/uaccess.h
parents dc1efc3c c68070d0

arch/alpha/include/asm/asm-prototypes.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <asm/console.h>

#include <asm/page.h>

#include <asm/string.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>



#include <asm-generic/asm-prototypes.h>

arch/ia64/include/asm/asm-prototypes.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <asm/page.h>

#include <asm/pal.h>

#include <asm/string.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <asm/unwind.h>

#include <asm/xor.h>

arch/mips/include/asm/asm-prototypes.h

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
#include <asm/page.h>

#include <asm/fpu.h>

#include <asm-generic/asm-prototypes.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <asm/ftrace.h>

arch/powerpc/kvm/book3s_xive.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/delay.h>

#include <linux/percpu.h>

#include <linux/cpumask.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <asm/kvm_book3s.h>

#include <asm/kvm_ppc.h>

#include <asm/hvcall.h>

arch/riscv/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ 
#include <linux/sched/task_stack.h>

#include <linux/tick.h>

#include <linux/ptrace.h>

#include <linux/uaccess.h>



#include <asm/unistd.h>

#include <asm/uaccess.h>

#include <asm/processor.h>

#include <asm/csr.h>

#include <asm/string.h>