aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 19:18:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 19:18:12 -0800
commit40b9672a2f071cbf931eb144997a21332bc0a747 (patch)
tree9ca1d0e049e3163cec7d337e9d4458e7ab2c857f /arch/sparc
parentdc1efc3cfaf5e16870a9a7b1b903dcf6e3ef15e8 (diff)
parentc68070d0408eb2297331a9c9ae538a7bec13fc81 (diff)
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
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/asm-prototypes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/asm-prototypes.h b/arch/sparc/include/asm/asm-prototypes.h
index 96e0972e8dbf..4987c735ff56 100644
--- a/arch/sparc/include/asm/asm-prototypes.h
+++ b/arch/sparc/include/asm/asm-prototypes.h
@@ -6,7 +6,7 @@
#include <asm/xor.h>
#include <asm/checksum.h>
#include <asm/trap_block.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/ftrace.h>
#include <asm/cacheflush.h>

Privacy Policy