diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-23 19:56:35 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-23 19:56:35 +0200 |
| commit | aeb8f932080d62cdc305a7ccca9d60de34908b30 (patch) | |
| tree | f563df19e10e0d1fb5f8ab73902cc1d39f2ec177 /include/linux/kernel_stat.h | |
| parent | caf1578aefe7ebbc22376737e91ffa29ac14a33f (diff) | |
| parent | 9e6f3f472c8f95021ad048acc7cd3e40a827f8ce (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index ecbc52f9ff77..8422b4ed6882 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -44,8 +44,8 @@ DECLARE_PER_CPU(struct kernel_stat, kstat); DECLARE_PER_CPU(struct kernel_cpustat, kernel_cpustat); /* Must have preemption disabled for this to be meaningful. */ -#define kstat_this_cpu (&__get_cpu_var(kstat)) -#define kcpustat_this_cpu (&__get_cpu_var(kernel_cpustat)) +#define kstat_this_cpu this_cpu_ptr(&kstat) +#define kcpustat_this_cpu this_cpu_ptr(&kernel_cpustat) #define kstat_cpu(cpu) per_cpu(kstat, cpu) #define kcpustat_cpu(cpu) per_cpu(kernel_cpustat, cpu) |