projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[linux-block.git]
/
arch
/
x86
/
include
/
asm
/
thread_info.h
diff --git
a/arch/x86/include/asm/thread_info.h
b/arch/x86/include/asm/thread_info.h
index 73cfe0d309c9cfc5f84cd9d5da0d9b2b4d57a5cb..3c9aebc00d39b8ad8b6fcff5cef2eddc3d4635f1 100644
(file)
--- a/
arch/x86/include/asm/thread_info.h
+++ b/
arch/x86/include/asm/thread_info.h
@@
-204,7
+204,7
@@
DECLARE_PER_CPU(unsigned long, kernel_stack);
static inline struct thread_info *current_thread_info(void)
{
struct thread_info *ti;
- ti = (void *)(
per
cpu_read_stable(kernel_stack) +
+ ti = (void *)(
this_
cpu_read_stable(kernel_stack) +
KERNEL_STACK_OFFSET - THREAD_SIZE);
return ti;
}