Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754088AbbG2TV3 (ORCPT ); Wed, 29 Jul 2015 15:21:29 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:55834 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753876AbbG2TV0 (ORCPT ); Wed, 29 Jul 2015 15:21:26 -0400 Message-Id: <20150729191659.847539750@infradead.org> User-Agent: quilt/0.61-1 Date: Wed, 29 Jul 2015 21:08:51 +0200 From: Peter Zijlstra To: mingo@kernel.org, linux-kernel@vger.kernel.org Cc: will.deacon@arm.com, linux@arm.linux.org.uk, ralf@linux-mips.org, egtvedt@samfundet.no, michael@amarulasolutions.com, cmetcalf@ezchip.com, peterz@infradead.org Subject: [RFC][PATCH 3/7] avr32: Remove finish_arch_switch() References: <20150729190848.678796654@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-avr32-finish_arch_switch.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1261 Lines: 42 Fold the tracing hook into switch_to() in order to remove finish_arch_switch(). Cc: Hans-Christian Egtvedt Signed-off-by: Peter Zijlstra (Intel) --- arch/avr32/include/asm/switch_to.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/arch/avr32/include/asm/switch_to.h +++ b/arch/avr32/include/asm/switch_to.h @@ -15,11 +15,13 @@ */ #ifdef CONFIG_OWNERSHIP_TRACE #include -#define finish_arch_switch(prev) \ +#define ocd_switch(prev, next) \ do { \ ocd_write(PID, prev->pid); \ - ocd_write(PID, current->pid); \ + ocd_write(PID, next->pid); \ } while(0) +#else +#define ocd_switch(prev, next) #endif /* @@ -38,6 +40,7 @@ extern struct task_struct *__switch_to(s struct cpu_context *); #define switch_to(prev, next, last) \ do { \ + ocd_switch(prev, next); \ last = __switch_to(prev, &prev->thread.cpu_context + 1, \ &next->thread.cpu_context); \ } while (0) -- 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/