From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled Date: Thu, 29 Sep 2011 16:10:40 -0700 Message-ID: <20110929161040.41f23573.akpm00@gmail.com> References: <20110929165730.661cf28c9bb27b8a85432cd2@canb.auug.org.au> <4E84D684.107@xenotime.net> <20110929235708.1bbd1166@lxorguk.ukuu.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mail-iy0-f174.google.com ([209.85.210.174]:51801 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751322Ab1I2XKm (ORCPT ); Thu, 29 Sep 2011 19:10:42 -0400 In-Reply-To: <20110929235708.1bbd1166@lxorguk.ukuu.org.uk> Sender: linux-next-owner@vger.kernel.org List-ID: To: Alan Cox Cc: Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, LKML , x86 maintainers , Andrew Morton , Mathias Nyman On Thu, 29 Sep 2011 23:57:08 +0100 Alan Cox wrote: > On Thu, 29 Sep 2011 13:35:16 -0700 > Randy Dunlap wrote: > > > From: Randy Dunlap > > > > Fix build when CONFIG_X86_INTEL_MID is enabled but > > CONFIG_X86_MRST is not enabled. Fixes this build error: > > This looks wrong. Unfortunately until we get kernel.org back its hard to > do much about it and see what is in all the trees. > > > -#ifdef CONFIG_X86_INTEL_MID > > +#ifdef CONFIG_X86_MRST > > > > static inline enum mrst_cpu_type mrst_identify_cpu(void) > > { > > return __mrst_cpu_chip; > > } > > > > -#else /* !CONFIG_X86_INTEL_MID */ > > +#else /* !CONFIG_X86_MRST */ > > > > #define mrst_identify_cpu() (0) > > > > -#endif /* !CONFIG_X86_INTEL_MID */ > > +#endif /* !CONFIG_X86_MRST */ > > This breaks Medfield so NAK > > The correct behaviour should be > > INTEL_MID defined -> mrst_cpu_chip has meaning > INTEL_MID not defined -> mrst_identify_chip is 0 > > your change makes it 0 for Medfield which means it will crash on boot. Randy's patch is an attempt to fix Mathias's "x86: rtc: don't register a platform RTC device for Intel MID platforms". I'm tempted to do a mass droppage, but then some of the patches might get forever lost. I am presently babysitting these x86 patches: x86-fix-mmap-random-address-range.patch arch-x86-kernel-e820c-eliminate-bubble-sort-from-sanitize_e820_map.patch vrtc-change-its-year-offset-from-1960-to-1972.patch x86-rtc-dont-register-a-platform-rtc-device-for-intel-mid-platforms.patch x86-rtc-dont-register-a-platform-rtc-device-for-intel-mid-platforms-fix.patch mrst-battery-fixes.patch mrst-battery-fixes-fix.patch x86mrst-add-mapping-for-bma023.patch arch-x86-kernel-e820c-quiet-sparse-noise-about-plain-integer-as-null-pointer.patch arch-x86-kernel-ptracec-quiet-sparse-noise.patch arch-x86-mm-pageattrc-quiet-sparse-noise-local-functions-should-be-static.patch x86-tlb-flush-avoid-superflous-leave_mm.patch Could we please get some x86 maintainers on deck??