Messages in this thread Patch in this message | | | From | Rusty Russell <> | Subject | [PATCH] kstat_this_cpu in terms of __get_cpu_var and use it | Date | Fri, 04 Jul 2003 11:53:16 +1000 |
| |
Linus, please apply.
kstat_this_cpu() is defined in terms of per_cpu instead of __get_cpu_var. This patch changes that, and uses it where appropriate.
Name: Make kstat_this_cpu in terms of __get_cpu_var and use it Author: Rusty Russell Status: Tested on 2.5.74-bk1
D: kstat_this_cpu is defined in terms of per_cpu instead of __get_cpu_var. D: This patch changes that, and uses it everywhere appropriate.
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .19878-linux-2.5.74-bk1/arch/i386/kernel/irq.c .19878-linux-2.5.74-bk1.updated/arch/i386/kernel/irq.c --- .19878-linux-2.5.74-bk1/arch/i386/kernel/irq.c 2003-06-15 11:29:47.000000000 +1000 +++ .19878-linux-2.5.74-bk1.updated/arch/i386/kernel/irq.c 2003-07-04 11:40:36.000000000 +1000 @@ -416,7 +416,6 @@ asmlinkage unsigned int do_IRQ(struct pt * handled by some other CPU. (or is disabled) */ int irq = regs.orig_eax & 0xff; /* high bits used in ret_from_ code */ - int cpu = smp_processor_id(); irq_desc_t *desc = irq_desc + irq; struct irqaction * action; unsigned int status; @@ -437,7 +436,7 @@ asmlinkage unsigned int do_IRQ(struct pt } } #endif - kstat_cpu(cpu).irqs[irq]++; + kstat_this_cpu.irqs[irq]++; spin_lock(&desc->lock); desc->handler->ack(irq); /* diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .19878-linux-2.5.74-bk1/include/linux/kernel_stat.h .19878-linux-2.5.74-bk1.updated/include/linux/kernel_stat.h --- .19878-linux-2.5.74-bk1/include/linux/kernel_stat.h 2003-02-07 19:17:07.000000000 +1100 +++ .19878-linux-2.5.74-bk1.updated/include/linux/kernel_stat.h 2003-07-04 11:39:39.000000000 +1000 @@ -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); diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .19878-linux-2.5.74-bk1/kernel/sched.c .19878-linux-2.5.74-bk1.updated/kernel/sched.c --- .19878-linux-2.5.74-bk1/kernel/sched.c 2003-07-03 09:44:01.000000000 +1000 +++ .19878-linux-2.5.74-bk1.updated/kernel/sched.c 2003-07-04 11:39:39.000000000 +1000 @@ -1184,19 +1184,19 @@ void scheduler_tick(int user_ticks, int if (p == rq->idle) { /* note: this timer irq context must be accounted for as well */ if (irq_count() - HARDIRQ_OFFSET >= SOFTIRQ_OFFSET) - kstat_cpu(cpu).cpustat.system += sys_ticks; + kstat_this_cpu.cpustat.system += sys_ticks; else if (atomic_read(&rq->nr_iowait) > 0) - kstat_cpu(cpu).cpustat.iowait += sys_ticks; + kstat_this_cpu.cpustat.iowait += sys_ticks; else - kstat_cpu(cpu).cpustat.idle += sys_ticks; + kstat_this_cpu.cpustat.idle += sys_ticks; rebalance_tick(rq, 1); return; } if (TASK_NICE(p) > 0) - kstat_cpu(cpu).cpustat.nice += user_ticks; + kstat_this_cpu.cpustat.nice += user_ticks; else - kstat_cpu(cpu).cpustat.user += user_ticks; - kstat_cpu(cpu).cpustat.system += sys_ticks; + kstat_this_cpu.cpustat.user += user_ticks; + kstat_this_cpu.cpustat.system += sys_ticks; /* Task might have expired already, but not scheduled off yet */ if (p->array != rq->active) { -- Anyone who quotes me in their sig is an idiot. -- Rusty Russell. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |