summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-03 23:24:54 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-03 23:24:54 +0300
commite8f4abf8fd1a2beb94983cb95ed713df75b3d135 (patch)
tree7a8e8aed0db97f3e4f13b13d6526c05894c1d184 /arch/ia64
parente7c93cbfe9cb4b0a47633099e78c455b1f79bbac (diff)
parent174e1ea8a2f6140078b6c61068b478cf3c4aa74f (diff)
downloadlinux-e8f4abf8fd1a2beb94983cb95ed713df75b3d135.tar.xz
Merge branch 'uaccess.csum' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull ia64 build regression fix from Al Viro: "Fix a braino in ia64 uaccess csum changes" * 'uaccess.csum' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix a braino in ia64 uaccess csum changes
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/lib/csum_partial_copy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c
index 5d147a33d648..6e82e0be8040 100644
--- a/arch/ia64/lib/csum_partial_copy.c
+++ b/arch/ia64/lib/csum_partial_copy.c
@@ -12,7 +12,7 @@
#include <linux/types.h>
#include <linux/string.h>
-#include <linux/uaccess.h>
+#include <net/checksum.h>
/*
* XXX Fixme: those 2 inlines are meant for debugging and will go away