diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 08:01:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 08:01:28 -0700 |
| commit | 55e0715f612f19b44c17497929091df2f3357e5d (patch) | |
| tree | 31e139ebb4fcd98357b3af7af6c4becb41fa9563 /arch/x86/include/asm/current.h | |
| parent | 7dfd54a905be0242bd604557d543c3a2d7b0a540 (diff) | |
| parent | bdf977b37418cdf8a2252504779a7e12a09b7575 (diff) | |
Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, percpu: Collect hot percpu variables into one cacheline
x86, percpu: Fix DECLARE/DEFINE_PER_CPU_PAGE_ALIGNED()
x86, percpu: Add 'percpu_read_stable()' interface for cacheable accesses
Diffstat (limited to 'arch/x86/include/asm/current.h')
| -rw-r--r-- | arch/x86/include/asm/current.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/current.h b/arch/x86/include/asm/current.h index c68c361697e..4d447b732d8 100644 --- a/arch/x86/include/asm/current.h +++ b/arch/x86/include/asm/current.h @@ -11,7 +11,7 @@ DECLARE_PER_CPU(struct task_struct *, current_task); static __always_inline struct task_struct *get_current(void) { - return percpu_read(current_task); + return percpu_read_stable(current_task); } #define current get_current() |