diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
| commit | b9f12a5d97f652c77ef6803dccd0d40d1290f5be (patch) | |
| tree | 8f58c8620ffef0d350a5ec022feda492a96b179a /include/linux/percpu.h | |
| parent | 9d8dc3e529a19e427fd379118acd132520935c5d (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
Merge tag 'v3.16-rc6' into next
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index e7a0b95ed527..8419053d0f2e 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | #define get_cpu_var(var) (*({ \ | 30 | #define get_cpu_var(var) (*({ \ |
| 31 | preempt_disable(); \ | 31 | preempt_disable(); \ |
| 32 | &__get_cpu_var(var); })) | 32 | this_cpu_ptr(&var); })) |
| 33 | 33 | ||
| 34 | /* | 34 | /* |
| 35 | * The weird & is necessary because sparse considers (void)(var) to be | 35 | * The weird & is necessary because sparse considers (void)(var) to be |
| @@ -639,7 +639,7 @@ do { \ | |||
| 639 | # define raw_cpu_add_return_8(pcp, val) raw_cpu_generic_add_return(pcp, val) | 639 | # define raw_cpu_add_return_8(pcp, val) raw_cpu_generic_add_return(pcp, val) |
| 640 | # endif | 640 | # endif |
| 641 | # define raw_cpu_add_return(pcp, val) \ | 641 | # define raw_cpu_add_return(pcp, val) \ |
| 642 | __pcpu_size_call_return2(raw_add_return_, pcp, val) | 642 | __pcpu_size_call_return2(raw_cpu_add_return_, pcp, val) |
| 643 | #endif | 643 | #endif |
| 644 | 644 | ||
| 645 | #define raw_cpu_sub_return(pcp, val) raw_cpu_add_return(pcp, -(typeof(pcp))(val)) | 645 | #define raw_cpu_sub_return(pcp, val) raw_cpu_add_return(pcp, -(typeof(pcp))(val)) |