Commit acab1f8857aad3bed826efe240cc10113c4fae51

Authored by Linus Torvalds

Merge tag 'please-pull-misc-3.19' of git://git.kernel.org/pub/scm/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

Showing 1 changed file Side-by-side Diff

arch/ia64/include/asm/percpu.h
... ... @@ -35,8 +35,8 @@
35 35  
36 36 /*
37 37 * Be extremely careful when taking the address of this variable! Due to virtual
38   - * remapping, it is different from the canonical address returned by __get_cpu_var(var)!
39   - * On the positive side, using __ia64_per_cpu_var() instead of __get_cpu_var() is slightly
  38 + * remapping, it is different from the canonical address returned by this_cpu_ptr(&var)!
  39 + * On the positive side, using __ia64_per_cpu_var() instead of this_cpu_ptr() is slightly
40 40 * more efficient.
41 41 */
42 42 #define __ia64_per_cpu_var(var) (*({ \