From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751913AbcEMJQS (ORCPT ); Fri, 13 May 2016 05:16:18 -0400 Received: from pandora.armlinux.org.uk ([78.32.30.218]:60788 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751302AbcEMJQP (ORCPT ); Fri, 13 May 2016 05:16:15 -0400 Date: Fri, 13 May 2016 10:15:07 +0100 From: Russell King - ARM Linux To: Andy Lutomirski Cc: Steven Rostedt , Guenter Roeck , Arnd Bergmann , Ingo Molnar , Peter Zijlstra , Andy Lutomirski , Borislav Petkov , Ard Biesheuvel , Thomas Gleixner , Frederic Weisbecker , Mel Gorman , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] sched/core: don't include asm/mmu_context from drivers Message-ID: <20160513091506.GS19428@n2100.arm.linux.org.uk> References: <1461919995-21001-1-git-send-email-arnd@arndb.de> <20160429094218.61b26849@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 12, 2016 at 10:46:56PM -0700, Andy Lutomirski wrote: > On Fri, Apr 29, 2016 at 6:42 AM, Steven Rostedt wrote: > > On Fri, 29 Apr 2016 10:52:32 +0200 > > Arnd Bergmann wrote: > > > >> This reverts the earlier fix attempt and works around the problem > >> by including both linux/mmu_context.h and asm/mmu_context.h from > >> kernel/sched/core.c. This is not a good solution but seems less > >> hacky than the alternatives. > > > > What about simply not compiling finish_arch_post_lock_switch() when > > building modules? > > > > (untested, not compiled or anything) > > > > Signed-off-by: Steven Rostedt > > --- > > diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h > > index fa5b42d44985..3f22d1b6bac8 100644 > > --- a/arch/arm/include/asm/mmu_context.h > > +++ b/arch/arm/include/asm/mmu_context.h > > @@ -66,6 +66,7 @@ static inline void check_and_switch_context(struct mm_struct *mm, > > cpu_switch_mm(mm->pgd, mm); > > } > > > > +#ifndef MODULE > > #define finish_arch_post_lock_switch \ > > finish_arch_post_lock_switch > > static inline void finish_arch_post_lock_switch(void) > > @@ -87,6 +88,7 @@ static inline void finish_arch_post_lock_switch(void) > > preempt_enable_no_resched(); > > } > > } > > +#endif /* !MODULE */ > > > > #endif /* CONFIG_MMU */ > > > > > Can someone in arm land ack this so Ingo can apply it? Sorry, I'm simply unable to read every message that comes in. Acked-by: Russell King -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@armlinux.org.uk (Russell King - ARM Linux) Date: Fri, 13 May 2016 10:15:07 +0100 Subject: [PATCH] sched/core: don't include asm/mmu_context from drivers In-Reply-To: References: <1461919995-21001-1-git-send-email-arnd@arndb.de> <20160429094218.61b26849@gandalf.local.home> Message-ID: <20160513091506.GS19428@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, May 12, 2016 at 10:46:56PM -0700, Andy Lutomirski wrote: > On Fri, Apr 29, 2016 at 6:42 AM, Steven Rostedt wrote: > > On Fri, 29 Apr 2016 10:52:32 +0200 > > Arnd Bergmann wrote: > > > >> This reverts the earlier fix attempt and works around the problem > >> by including both linux/mmu_context.h and asm/mmu_context.h from > >> kernel/sched/core.c. This is not a good solution but seems less > >> hacky than the alternatives. > > > > What about simply not compiling finish_arch_post_lock_switch() when > > building modules? > > > > (untested, not compiled or anything) > > > > Signed-off-by: Steven Rostedt > > --- > > diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h > > index fa5b42d44985..3f22d1b6bac8 100644 > > --- a/arch/arm/include/asm/mmu_context.h > > +++ b/arch/arm/include/asm/mmu_context.h > > @@ -66,6 +66,7 @@ static inline void check_and_switch_context(struct mm_struct *mm, > > cpu_switch_mm(mm->pgd, mm); > > } > > > > +#ifndef MODULE > > #define finish_arch_post_lock_switch \ > > finish_arch_post_lock_switch > > static inline void finish_arch_post_lock_switch(void) > > @@ -87,6 +88,7 @@ static inline void finish_arch_post_lock_switch(void) > > preempt_enable_no_resched(); > > } > > } > > +#endif /* !MODULE */ > > > > #endif /* CONFIG_MMU */ > > > > > Can someone in arm land ack this so Ingo can apply it? Sorry, I'm simply unable to read every message that comes in. Acked-by: Russell King -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.