summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-16 21:26:37 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-16 21:26:37 +0300
commit27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc (patch)
tree321883ef69804066ccdc90e3ca1c63ca0f7bcd0c /arch/ia64
parentd396360acdf7e57edcd9e2d080343b0353d65d63 (diff)
parent6edd1dbace0e8529ed167e8a5f9da63c0cc763cc (diff)
downloadlinux-27ebbf9d5bc0ab0a8ca875119e0ce4cd267fa2fc.tar.xz
Merge tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull nommu generic uaccess updates from Arnd Bergmann: "asm-generic: kill <asm/segment.h> and improve nommu generic uaccess helpers Christoph Hellwig writes: This is a series doing two somewhat interwinded things. It improves the asm-generic nommu uaccess helper to optionally be entirely generic and not require any arch helpers for the actual uaccess. For the generic uaccess.h to actually be generically useful I also had to kill off the mess we made of <asm/segment.h>, which really shouldn't exist on most architectures" * tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: asm-generic: optimize generic uaccess for 8-byte loads and stores asm-generic: provide entirely generic nommu uaccess arch: mostly remove <asm/segment.h> asm-generic: don't include <asm/segment.h> from <asm/uaccess.h>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/segment.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/segment.h b/arch/ia64/include/asm/segment.h
deleted file mode 100644
index b89e2b3d648f..000000000000
--- a/arch/ia64/include/asm/segment.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_IA64_SEGMENT_H
-#define _ASM_IA64_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* _ASM_IA64_SEGMENT_H */