diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/linux/percpu.h | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index c74088ab103b..9e4761caa80c 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -375,22 +375,6 @@ do { \ | |||
| 375 | # define this_cpu_or(pcp, val) __pcpu_size_call(this_cpu_or_, (pcp), (val)) | 375 | # define this_cpu_or(pcp, val) __pcpu_size_call(this_cpu_or_, (pcp), (val)) |
| 376 | #endif | 376 | #endif |
| 377 | 377 | ||
| 378 | #ifndef this_cpu_xor | ||
| 379 | # ifndef this_cpu_xor_1 | ||
| 380 | # define this_cpu_xor_1(pcp, val) _this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 381 | # endif | ||
| 382 | # ifndef this_cpu_xor_2 | ||
| 383 | # define this_cpu_xor_2(pcp, val) _this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 384 | # endif | ||
| 385 | # ifndef this_cpu_xor_4 | ||
| 386 | # define this_cpu_xor_4(pcp, val) _this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 387 | # endif | ||
| 388 | # ifndef this_cpu_xor_8 | ||
| 389 | # define this_cpu_xor_8(pcp, val) _this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 390 | # endif | ||
| 391 | # define this_cpu_xor(pcp, val) __pcpu_size_call(this_cpu_or_, (pcp), (val)) | ||
| 392 | #endif | ||
| 393 | |||
| 394 | #define _this_cpu_generic_add_return(pcp, val) \ | 378 | #define _this_cpu_generic_add_return(pcp, val) \ |
| 395 | ({ \ | 379 | ({ \ |
| 396 | typeof(pcp) ret__; \ | 380 | typeof(pcp) ret__; \ |
| @@ -629,22 +613,6 @@ do { \ | |||
| 629 | # define __this_cpu_or(pcp, val) __pcpu_size_call(__this_cpu_or_, (pcp), (val)) | 613 | # define __this_cpu_or(pcp, val) __pcpu_size_call(__this_cpu_or_, (pcp), (val)) |
| 630 | #endif | 614 | #endif |
| 631 | 615 | ||
| 632 | #ifndef __this_cpu_xor | ||
| 633 | # ifndef __this_cpu_xor_1 | ||
| 634 | # define __this_cpu_xor_1(pcp, val) __this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 635 | # endif | ||
| 636 | # ifndef __this_cpu_xor_2 | ||
| 637 | # define __this_cpu_xor_2(pcp, val) __this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 638 | # endif | ||
| 639 | # ifndef __this_cpu_xor_4 | ||
| 640 | # define __this_cpu_xor_4(pcp, val) __this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 641 | # endif | ||
| 642 | # ifndef __this_cpu_xor_8 | ||
| 643 | # define __this_cpu_xor_8(pcp, val) __this_cpu_generic_to_op((pcp), (val), ^=) | ||
| 644 | # endif | ||
| 645 | # define __this_cpu_xor(pcp, val) __pcpu_size_call(__this_cpu_xor_, (pcp), (val)) | ||
| 646 | #endif | ||
| 647 | |||
| 648 | #define __this_cpu_generic_add_return(pcp, val) \ | 616 | #define __this_cpu_generic_add_return(pcp, val) \ |
| 649 | ({ \ | 617 | ({ \ |
| 650 | __this_cpu_add(pcp, val); \ | 618 | __this_cpu_add(pcp, val); \ |