aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/unistd_64.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 17:43:08 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 17:43:08 +0200
commitdfa4a423cf80afe8f81a36d8e663961c4acca343 (patch)
tree1ac7fa67256148b8fd8360d4d465e945800bb9df /arch/x86/include/asm/unistd_64.h
parentMerge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentx86-64, unistd: Remove bogus __IGNORE_getcpu (diff)
downloadlinux-dev-dfa4a423cf80afe8f81a36d8e663961c4acca343.tar.xz
linux-dev-dfa4a423cf80afe8f81a36d8e663961c4acca343.zip
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86-64, unistd: Remove bogus __IGNORE_getcpu x86, mm, trivial: Remove unnecessary get_order() in free_thread_info() x86, cleanup: Remove unneeded version.h include from arch/x86/
Diffstat (limited to 'arch/x86/include/asm/unistd_64.h')
-rw-r--r--arch/x86/include/asm/unistd_64.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h
index 201040573444..0a6ba337a2eb 100644
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@ -624,7 +624,6 @@ __SYSCALL(__NR_vmsplice, sys_vmsplice)
__SYSCALL(__NR_move_pages, sys_move_pages)
#define __NR_utimensat 280
__SYSCALL(__NR_utimensat, sys_utimensat)
-#define __IGNORE_getcpu /* implemented as a vsyscall */
#define __NR_epoll_pwait 281
__SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
#define __NR_signalfd 282