Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* '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/

diff --combined arch/x86/include/asm/unistd_64.h
index 2010405,940d720..0a6ba33
--- 1/arch/x86/include/asm/unistd_64.h
--- 2/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@@ -414,7 -414,7 +414,7 @@@ __SYSCALL(__NR_query_module, sys_ni_sys
  __SYSCALL(__NR_quotactl, sys_quotactl)
  
  #define __NR_nfsservctl                               180
 -__SYSCALL(__NR_nfsservctl, sys_nfsservctl)
 +__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
  
  /* reserved for LiS/STREAMS */
  #define __NR_getpmsg                          181
@@@ -624,7 -624,6 +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