linux-mips
[Top] [All Lists]

Re: [PATCH]: Fix 3.7 mips build if !CONFIG_MODULES

To: Linux MIPS List <linux-mips@linux-mips.org>
Subject: Re: [PATCH]: Fix 3.7 mips build if !CONFIG_MODULES
From: Joshua Kinard <kumba@gentoo.org>
Date: Thu, 27 Dec 2012 14:44:10 -0500
Cc: Ralf Baechle <ralf@linux-mips.org>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1356637433; bh=YWRFQj+xdISLhCQY3o1Cv0x+uD5UsidzOWdkrUod3kI=; h=Received:Received:Message-ID:Date:From:MIME-Version:To:Subject: Content-Type; b=ea2ToXJQKUO5yGtAI/COfqodlquDaCkXNYNLAh0BqK0vIF3CNIz7ZDGd09WOZo+3l ri+v6gU0r05YgUmISCxO4dSJdaUvIMYYhXewlWSAEqHpU2B+fMFnGpjmXHl/fPjFoq fqQo32lvIOYMUeKbo8ARoEpiMqgZ/ATQPER9mykgp1z1g3i7yltgTGg7fokl3Yw3ey ooR3PpJkHElHMp2GciNQJy/IqwEOaokq9tKOWVaLdnB7+Qy46QG2N6/7WObyMFWMVp E0RBeXDg5dnZRoOsFYcv1gXnrVaOzlLLu5ycBpPXLvOpyEbmiTUXHQwplE1iRf1XI5 M9Pq69Ysv/cQA==
In-reply-to: <CAMuHMdXyMzQtejXOHEcSUO7fLh7CP+sPvNYdVnzKjwZx9Vj6xg@mail.gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <50DC174D.6090302@gentoo.org> <CAMuHMdXyMzQtejXOHEcSUO7fLh7CP+sPvNYdVnzKjwZx9Vj6xg@mail.gmail.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/17.0 Thunderbird/17.0
On 12/27/2012 4:45 AM, Geert Uytterhoeven wrote:
> On Thu, Dec 27, 2012 at 10:39 AM, Joshua Kinard <kumba@gentoo.org> wrote:
>> The attached patch fixes a build failure if building a monolithic kernel due
>> to arch/mips/kernel/Kconfig selecting MODULES_USE_ELF_REL[A] without
>> checking to see if MODULES is set or not.  This leads to 'struct module' not
>> existing, which triggers a compile failure in arch/mips/kernel/module-rela.c
>> when the compiler attempts to dereference me->name on lines 36, 48, and 133.
>>
>> Signed-off-by: Joshua Kinard <kumba@gentoo.org>
>> ---
>>
>>  Kconfig |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>>
>> diff -Naurp a/arch/mips/Kconfig b/arch/mips/Kconfig
>> --- a/arch/mips/Kconfig 2012-12-22 22:52:28.264461836 -0500
>> +++ b/arch/mips/Kconfig 2012-12-26 23:00:46.202996691 -0500
>> @@ -39,8 +39,8 @@ config MIPS
>>         select GENERIC_CLOCKEVENTS
>>         select GENERIC_CMOS_UPDATE
>>         select HAVE_MOD_ARCH_SPECIFIC
>> -       select MODULES_USE_ELF_REL
>> -       select MODULES_USE_ELF_RELA if 64BIT
>> +       select MODULES_USE_ELF_REL && MODULES
> 
> Shouldn't that be
> 
>     select MODULES_USE_ELF_REL if MODULES
> 
> ?
> 
>> +       select MODULES_USE_ELF_RELA if MODULES && 64BIT

Whoops, yep!  Thanks for the catch, I'll resend a fixed patch.

-- 
Joshua Kinard
Gentoo/MIPS
kumba@gentoo.org
4096R/D25D95E3 2011-03-28

"The past tempts us, the present confuses us, the future frightens us.  And
our lives slip away, moment by moment, lost in that vast, terrible in-between."

--Emperor Turhan, Centauri Republic

Attachment: signature.asc
Description: OpenPGP digital signature

<Prev in Thread] Current Thread [Next in Thread>