From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752423AbcEMJa3 (ORCPT ); Fri, 13 May 2016 05:30:29 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:64305 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751272AbcEMJa2 (ORCPT ); Fri, 13 May 2016 05:30:28 -0400 From: Arnd Bergmann To: Andy Lutomirski Cc: Steven Rostedt , Guenter Roeck , Russell King , 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 Date: Fri, 13 May 2016 11:28:26 +0200 Message-ID: <8253941.065j8toVxx@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: References: <1461919995-21001-1-git-send-email-arnd@arndb.de> <20160429094218.61b26849@gandalf.local.home> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:XDk5veULiOQjS2vT6gQ0WdePIjvRYKRSCyYRvZuPP7xoPCi2Igy YzLwwDL0EsT5j7Rf6fCCeIbJTVfUngn7rltOBicF1thKlw7MTQWl2Gz/SgFY/b13YddGMDk KfB/K/QQu8FDNDDKce6s3owygLtx40vAbKnyuYAEObRY8zkjzsBvmAZ5R0ix9V1goz5JgLP HzP1WPaTxi2h1hCoHJy4w== X-UI-Out-Filterresults: notjunk:1;V01:K0:fZKghSCJtew=:9GKrzNnxQO5g4Z1FlIbxE/ b1OqcXdgjTqt1qQIZoSVqoRmAvYaaQU5R0S9RW7g9K8QDuHIlZSXIg3tFwgW1Mvwl1C3JJT5n v8AmoOwxGlsCyvFukEj1E7jJJldqhmJLT9DJEIykEFOgEW421/jFjgJCz3HxBToim3w3SpDON IT01cAEi3NEisyK/Ot1mytpF1U7NS+fN6LvYOxhQr6U074+qKZF7qeN2PbYh6DWGJgHkNa9Ha 06GAe2ebM5fGDOjy2yjev9ftKOtqT0TGjH2j3ZLtYS1+z/NFsGf/1nKB81oXDb7sX37x7M06m F0WFN9ZhegUkvS+Z33iWEp2NThVal85RyzVpSxTaUX0LJJdHe1Awhb7vOmi8LokUugqhT2/7f MC7C3nlmD9Uc+RlYjuqCz6BN7tQY8jlbVtZS9rkHhoxTD36bvk78arVEpi6+SLUmKNYxJF9Oz 1G8OLfDupFIWshh2nCAqr7IUV6aUoHJaAGkjvGYu52qHuz8ZgCsaZHQwPoWRUuCW8z7nRf8Vi X2yifEzRjNE2+zzHY7zoR5BQjkR5KuVkOivDVjaXGrlMUCvOEPk3/rEkVe/wT6/7rB0AgNSpj 5Gr79Eo40iXxrS4FHkNSfhvsbwMwtHXpnNJ5LZeSN5d6J9QZKGUSOFVRPNXRdHN5OKl80T1e+ mWJZwyqwyHXarLaJI5KHtiveOBvihYGEtd3fg9g/fFDMBUB3vMFKEnK/EsKH+Rt+X82/msIXg CnxlgZZOVeydlV56 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 12 May 2016 22:46:56 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 forgot about this when I had my original patch in the randconfig patch stack. I've reverted this now and am testing with Steve's version. If I see no other regressions, I'll resend this with a proper changelog and Russell's Ack. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 13 May 2016 11:28:26 +0200 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: <8253941.065j8toVxx@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thursday 12 May 2016 22:46:56 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 forgot about this when I had my original patch in the randconfig patch stack. I've reverted this now and am testing with Steve's version. If I see no other regressions, I'll resend this with a proper changelog and Russell's Ack. Arnd