Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acab1f88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/ia64/include/asm/percpu.h

+2 −2
Original line number Diff line number Diff line
@@ -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) (*({					\