From: Linus Torvalds Date: Sat, 20 Dec 2014 01:07:27 +0000 (-0800) Subject: Merge tag 'please-pull-misc-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: omap-for-v3.19/fixes-rc1~22 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acab1f8857aad3bed826efe240cc10113c4fae51;hp=e589c9e13aeb0c5539bf1314b3a78442ea8fc0c2;p=pandora-kernel.git Merge tag 'please-pull-misc-3.19' of git://git./linux/kernel/git/aegl/linux Pull ia64 __get_cpu_var removal from Tony Luck: "__get_cpu_var removed from rest of tree, drop reference from comments in arch/ia64" * tag 'please-pull-misc-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] Update comment that references __get_cpu_var --- diff --git a/arch/ia64/include/asm/percpu.h b/arch/ia64/include/asm/percpu.h index 14aa1c58912b..0ec484d2dcbc 100644 --- a/arch/ia64/include/asm/percpu.h +++ b/arch/ia64/include/asm/percpu.h @@ -35,8 +35,8 @@ extern void *per_cpu_init(void); /* * Be extremely careful when taking the address of this variable! Due to virtual - * remapping, it is different from the canonical address returned by __get_cpu_var(var)! - * On the positive side, using __ia64_per_cpu_var() instead of __get_cpu_var() is slightly + * remapping, it is different from the canonical address returned by this_cpu_ptr(&var)! + * On the positive side, using __ia64_per_cpu_var() instead of this_cpu_ptr() is slightly * more efficient. */ #define __ia64_per_cpu_var(var) (*({ \