Messages in this thread Patch in this message | | | Date | Wed, 26 Oct 2011 17:14:58 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL] x86/cleanups changes for v3.2 |
| |
Linus,
Please pull the latest x86-cleanups-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus
Thanks,
Ingo
------------------> Andy Lutomirski (1): x86-64, unistd: Remove bogus __IGNORE_getcpu
Jesper Juhl (1): x86, cleanup: Remove unneeded version.h include from arch/x86/
Zhao Jin (1): x86, mm, trivial: Remove unnecessary get_order() in free_thread_info()
arch/x86/include/asm/unistd_64.h | 1 - arch/x86/kernel/process.c | 2 +- arch/x86/mm/mmio-mod.c | 1 - 3 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h index d92641c..940d720 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 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index e7e3b01..b9b3b1a 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -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) diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index 67421f3..de54b9b 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c @@ -29,7 +29,6 @@ #include <linux/slab.h> #include <linux/uaccess.h> #include <linux/io.h> -#include <linux/version.h> #include <linux/kallsyms.h> #include <asm/pgtable.h> #include <linux/mmiotrace.h>
| |