From a736ecfe821b8eaa91b891ccd1b694d5e1b4adc3 Mon Sep 17 00:00:00 2001 From: Akira Takeuchi Date: Wed, 27 Oct 2010 17:28:54 +0100 Subject: [PATCH] --- yaml --- r: 218730 b: refs/heads/master c: 04157a6e7df99fd5ed64955233d6e00ab6613614 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mn10300/include/asm/hardirq.h | 1 - trunk/arch/mn10300/kernel/process.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aa2df2873875..b0e827069730 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37e4ec96365a4b1179b994861e824e3c2fce32a1 +refs/heads/master: 04157a6e7df99fd5ed64955233d6e00ab6613614 diff --git a/trunk/arch/mn10300/include/asm/hardirq.h b/trunk/arch/mn10300/include/asm/hardirq.h index 54d950117674..7bd9b7cc2451 100644 --- a/trunk/arch/mn10300/include/asm/hardirq.h +++ b/trunk/arch/mn10300/include/asm/hardirq.h @@ -19,7 +19,6 @@ /* assembly code in softirq.h is sensitive to the offsets of these fields */ typedef struct { unsigned int __softirq_pending; - unsigned long idle_timestamp; unsigned int __nmi_count; /* arch dependent */ unsigned int __irq_count; /* arch dependent */ } ____cacheline_aligned irq_cpustat_t; diff --git a/trunk/arch/mn10300/kernel/process.c b/trunk/arch/mn10300/kernel/process.c index f48373e2bc1c..243e33cd874b 100644 --- a/trunk/arch/mn10300/kernel/process.c +++ b/trunk/arch/mn10300/kernel/process.c @@ -88,8 +88,6 @@ void cpu_idle(void) idle = pm_idle; if (!idle) idle = default_idle; - - irq_stat[cpu].idle_timestamp = jiffies; idle(); }