From: Linus Torvalds Date: Mon, 14 Sep 2009 15:01:28 +0000 (-0700) Subject: Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=55e0715f612f19b44c17497929091df2f3357e5d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'x86-percpu-for-linus' of git://git./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 --- 55e0715f612f19b44c17497929091df2f3357e5d diff --cc arch/x86/kernel/cpu/common.c index 55a6abe40394,1bd88ed978bd..2055fc2b2e6b --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@@ -1042,8 -1049,11 +1049,11 @@@ DEFINE_PER_CPU(struct orig_ist, orig_is #else /* CONFIG_X86_64 */ + DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; + EXPORT_PER_CPU_SYMBOL(current_task); + #ifdef CONFIG_CC_STACKPROTECTOR -DEFINE_PER_CPU(unsigned long, stack_canary); +DEFINE_PER_CPU_ALIGNED(struct stack_canary, stack_canary); #endif /* Make sure %fs and %gs are initialized properly in idle threads */