diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-07-08 04:24:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-07-08 04:24:04 -0700 |
| commit | 6fee4e4eae95a053b1148537c1fe1ee9ff3d7a45 (patch) | |
| tree | fea61da3aecfaa64c024bea99e9216039d61fc5a /include/linux/kernel_stat.h | |
| parent | 58af6e3af0578edece898ea59261812bad7a3576 (diff) | |
| parent | a1bafab5cbe2ce874fe5b0e012cc9ab74a672b39 (diff) | |
Resolve conflicts in ipconfig.c changes.
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 88425e94cdc5..9971827a3c4b 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -31,7 +31,8 @@ struct kernel_stat { DECLARE_PER_CPU(struct kernel_stat, kstat); #define kstat_cpu(cpu) per_cpu(kstat, cpu) -#define kstat_this_cpu kstat_cpu(smp_processor_id()) +/* Must have preemption disabled for this to be meaningful. */ +#define kstat_this_cpu __get_cpu_var(kstat) extern unsigned long nr_context_switches(void); |