Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa4a423 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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/
parents 7b86572a 7e49b1c8

arch/x86/include/asm/unistd_64.h

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ void free_thread_xstate(struct task_struct *tsk) 
void free_thread_info(struct thread_info *ti)

{

	free_thread_xstate(ti->task);

	free_pages((unsigned long)ti, get_order(THREAD_SIZE));

	free_pages((unsigned long)ti, THREAD_ORDER);

}



void arch_task_cache_init(void)