projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63332a8
)
x86/entry: Remove unused 'kernel_stack' per-cpu variable
author
Denys Vlasenko
<dvlasenk@redhat.com>
Fri, 24 Apr 2015 15:31:34 +0000
(17:31 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Fri, 8 May 2015 11:49:43 +0000
(13:49 +0200)
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Drewry <wad@chromium.org>
Link:
http://lkml.kernel.org/r/1429889495-27850-2-git-send-email-dvlasenk@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/thread_info.h
patch
|
blob
|
blame
|
history
arch/x86/kernel/cpu/common.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/process_32.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/process_64.c
patch
|
blob
|
blame
|
history
arch/x86/kernel/smpboot.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/include/asm/thread_info.h
b/arch/x86/include/asm/thread_info.h
index d656a363e1eb86b209ee1df102bb801ac6608dbe..472288962c99a916f3be20e7bc8a4129aacfbae1 100644
(file)
--- a/
arch/x86/include/asm/thread_info.h
+++ b/
arch/x86/include/asm/thread_info.h
@@
-177,8
+177,6
@@
struct thread_info {
*/
#ifndef __ASSEMBLY__
*/
#ifndef __ASSEMBLY__
-DECLARE_PER_CPU(unsigned long, kernel_stack);
-
static inline struct thread_info *current_thread_info(void)
{
return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
static inline struct thread_info *current_thread_info(void)
{
return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
diff --git
a/arch/x86/kernel/cpu/common.c
b/arch/x86/kernel/cpu/common.c
index a62cf04dac8ae99d1310b02b827bca528311d490..6bec0b55863e315c65ca40ff18454aaf55844d06 100644
(file)
--- a/
arch/x86/kernel/cpu/common.c
+++ b/
arch/x86/kernel/cpu/common.c
@@
-1155,10
+1155,6
@@
static __init int setup_disablecpuid(char *arg)
}
__setup("clearcpuid=", setup_disablecpuid);
}
__setup("clearcpuid=", setup_disablecpuid);
-DEFINE_PER_CPU(unsigned long, kernel_stack) =
- (unsigned long)&init_thread_union + THREAD_SIZE;
-EXPORT_PER_CPU_SYMBOL(kernel_stack);
-
#ifdef CONFIG_X86_64
struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
#ifdef CONFIG_X86_64
struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
diff --git
a/arch/x86/kernel/process_32.c
b/arch/x86/kernel/process_32.c
index 8ed2106b06da63e0a8e0dcf561aad7a1fc112e40..a99900cedc22c4fc9836a0c956ef3723c4863215 100644
(file)
--- a/
arch/x86/kernel/process_32.c
+++ b/
arch/x86/kernel/process_32.c
@@
-302,13
+302,10
@@
__switch_to(struct task_struct *prev_p, struct task_struct *next_p)
arch_end_context_switch(next_p);
/*
arch_end_context_switch(next_p);
/*
- * Reload esp0
, kernel_stack, and
current_top_of_stack. This changes
+ * Reload esp0
and cpu_
current_top_of_stack. This changes
* current_thread_info().
*/
load_sp0(tss, next);
* current_thread_info().
*/
load_sp0(tss, next);
- this_cpu_write(kernel_stack,
- (unsigned long)task_stack_page(next_p) +
- THREAD_SIZE);
this_cpu_write(cpu_current_top_of_stack,
(unsigned long)task_stack_page(next_p) +
THREAD_SIZE);
this_cpu_write(cpu_current_top_of_stack,
(unsigned long)task_stack_page(next_p) +
THREAD_SIZE);
diff --git
a/arch/x86/kernel/process_64.c
b/arch/x86/kernel/process_64.c
index ddfdbf74f1744c235fb80ee2ee0718152882b2ce..82134506faa8ae939c9b1e216898ef66b1392e4b 100644
(file)
--- a/
arch/x86/kernel/process_64.c
+++ b/
arch/x86/kernel/process_64.c
@@
-409,9
+409,6
@@
__switch_to(struct task_struct *prev_p, struct task_struct *next_p)
/* Reload esp0 and ss1. This changes current_thread_info(). */
load_sp0(tss, next);
/* Reload esp0 and ss1. This changes current_thread_info(). */
load_sp0(tss, next);
- this_cpu_write(kernel_stack,
- (unsigned long)task_stack_page(next_p) + THREAD_SIZE);
-
/*
* Now maybe reload the debug registers and handle I/O bitmaps
*/
/*
* Now maybe reload the debug registers and handle I/O bitmaps
*/
diff --git
a/arch/x86/kernel/smpboot.c
b/arch/x86/kernel/smpboot.c
index 50e547eac8cd4b64e9e6892410366ec3a64a7a13..023cccf5a4aefb255f72a3a2673e3a827f453623 100644
(file)
--- a/
arch/x86/kernel/smpboot.c
+++ b/
arch/x86/kernel/smpboot.c
@@
-792,8
+792,6
@@
void common_cpu_up(unsigned int cpu, struct task_struct *idle)
clear_tsk_thread_flag(idle, TIF_FORK);
initial_gs = per_cpu_offset(cpu);
#endif
clear_tsk_thread_flag(idle, TIF_FORK);
initial_gs = per_cpu_offset(cpu);
#endif
- per_cpu(kernel_stack, cpu) =
- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
}
/*
}
/*
This page took
0.029548 seconds
and
5
git commands to generate.