From: Randy Dunlap <rdunlap@xenotime.net>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
x86 maintainers <x86@kernel.org>
Subject: Re: [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled
Date: Thu, 29 Sep 2011 16:16:29 -0700 [thread overview]
Message-ID: <4E84FC4D.3080506@xenotime.net> (raw)
In-Reply-To: <20110929235708.1bbd1166@lxorguk.ukuu.org.uk>
On 09/29/11 15:57, Alan Cox wrote:
> On Thu, 29 Sep 2011 13:35:16 -0700
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> 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.
arch/x86/platform/mrst/mrst.c -- where __mrst_cpu_chip lives --
is only built when CONFIG_X86_MRST is enabled. You make it sound like
__mrst_cpu_chip needs to live any time that CONFIG_X86_INTEL_MID
is enabled, which sounds reasonable to me.
caveat: given the current linux-next merge trees (as you mentioned).
Does anyone care? If so, please help fix this muck.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
next prev parent reply other threads:[~2011-09-29 23:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-29 6:57 linux-next: Tree for Sept 29 Stephen Rothwell
2011-09-29 19:50 ` linux-next: Tree for Sept 29 (kvm) Randy Dunlap
2011-09-29 22:58 ` Stephen Rothwell
2011-09-30 11:50 ` [PATCH] KVM: x86: Use do_div for tsc deadline calculation Jan Kiszka
2011-09-30 17:35 ` Randy Dunlap
2011-10-02 9:05 ` Avi Kivity
2011-09-29 20:17 ` [PATCH] olpc: olpc-xo1-sci.c is an input driver, depends on INPUT Randy Dunlap
2011-09-29 20:34 ` Andres Salomon
2011-09-29 20:36 ` Randy Dunlap
2011-10-06 17:12 ` Randy Dunlap
2011-09-29 20:35 ` [PATCH -next] x86 mrst: fix build error when X86_MRST is not enabled Randy Dunlap
2011-09-29 22:57 ` Alan Cox
2011-09-29 23:10 ` Andrew Morton
2011-09-30 9:07 ` Alan Cox
2011-09-29 23:16 ` Randy Dunlap [this message]
2011-09-30 9:04 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E84FC4D.3080506@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).