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

Commit 17413f5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 

* 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: Fixup __this_cpu_xchg* operations
parents 5a791ea4 688d3be8

arch/x86/include/asm/percpu.h

+5 −6
Original line number Original line Diff line number Diff line
@@ -388,12 +388,9 @@ do { \ 
#define __this_cpu_xor_1(pcp, val)	percpu_to_op("xor", (pcp), val)

#define __this_cpu_xor_1(pcp, val)	percpu_to_op("xor", (pcp), val)

#define __this_cpu_xor_2(pcp, val)	percpu_to_op("xor", (pcp), val)

#define __this_cpu_xor_2(pcp, val)	percpu_to_op("xor", (pcp), val)

#define __this_cpu_xor_4(pcp, val)	percpu_to_op("xor", (pcp), val)

#define __this_cpu_xor_4(pcp, val)	percpu_to_op("xor", (pcp), val)

/*

#define __this_cpu_xchg_1(pcp, val)	percpu_xchg_op(pcp, val)

 * Generic fallback operations for __this_cpu_xchg_[1-4] are okay and much

#define __this_cpu_xchg_2(pcp, val)	percpu_xchg_op(pcp, val)

 * faster than an xchg with forced lock semantics.

#define __this_cpu_xchg_4(pcp, val)	percpu_xchg_op(pcp, val)

 */

#define __this_cpu_xchg_8(pcp, nval)	percpu_xchg_op(pcp, nval)

#define __this_cpu_cmpxchg_8(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)





#define this_cpu_read_1(pcp)		percpu_from_op("mov", (pcp), "m"(pcp))

#define this_cpu_read_1(pcp)		percpu_from_op("mov", (pcp), "m"(pcp))

#define this_cpu_read_2(pcp)		percpu_from_op("mov", (pcp), "m"(pcp))

#define this_cpu_read_2(pcp)		percpu_from_op("mov", (pcp), "m"(pcp))
@@ -485,6 +482,8 @@ do { \ 
#define __this_cpu_or_8(pcp, val)	percpu_to_op("or", (pcp), val)

#define __this_cpu_or_8(pcp, val)	percpu_to_op("or", (pcp), val)

#define __this_cpu_xor_8(pcp, val)	percpu_to_op("xor", (pcp), val)

#define __this_cpu_xor_8(pcp, val)	percpu_to_op("xor", (pcp), val)

#define __this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val)

#define __this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val)

#define __this_cpu_xchg_8(pcp, nval)	percpu_xchg_op(pcp, nval)

#define __this_cpu_cmpxchg_8(pcp, oval, nval)	percpu_cmpxchg_op(pcp, oval, nval)





#define this_cpu_read_8(pcp)		percpu_from_op("mov", (pcp), "m"(pcp))

#define this_cpu_read_8(pcp)		percpu_from_op("mov", (pcp), "m"(pcp))

#define this_cpu_write_8(pcp, val)	percpu_to_op("mov", (pcp), val)

#define this_cpu_write_8(pcp, val)	percpu_to_op("mov", (pcp), val)