Commit acab1f88 authored by Linus Torvalds's avatar 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
parents e589c9e1 87b4bf6d
...@@ -35,8 +35,8 @@ extern void *per_cpu_init(void); ...@@ -35,8 +35,8 @@ extern void *per_cpu_init(void);
/* /*
* Be extremely careful when taking the address of this variable! Due to virtual * 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)! * 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 __get_cpu_var() is slightly * On the positive side, using __ia64_per_cpu_var() instead of this_cpu_ptr() is slightly
* more efficient. * more efficient.
*/ */
#define __ia64_per_cpu_var(var) (*({ \ #define __ia64_per_cpu_var(var) (*({ \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment