diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 11:01:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 11:01:28 -0400 |
| commit | 55e0715f612f19b44c17497929091df2f3357e5d (patch) | |
| tree | 31e139ebb4fcd98357b3af7af6c4becb41fa9563 /arch/x86/kernel/process_64.c | |
| 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/kernel/process_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index a28279dbb07c..ad535b683170 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -55,9 +55,6 @@ | |||
| 55 | 55 | ||
| 56 | asmlinkage extern void ret_from_fork(void); | 56 | asmlinkage extern void ret_from_fork(void); |
| 57 | 57 | ||
| 58 | DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; | ||
| 59 | EXPORT_PER_CPU_SYMBOL(current_task); | ||
| 60 | |||
| 61 | DEFINE_PER_CPU(unsigned long, old_rsp); | 58 | DEFINE_PER_CPU(unsigned long, old_rsp); |
| 62 | static DEFINE_PER_CPU(unsigned char, is_idle); | 59 | static DEFINE_PER_CPU(unsigned char, is_idle); |
| 63 | 60 | ||