Re: [PATCH] x86: fix unconditional arch/x86/kernel/pcspeaker.c compiling

[Michael Opdenacker <michael-lists@free-electrons.com>]

On 01/17/2008 06:13 PM, Matt Mackall wrote:
> On Thu, 2008-01-17 at 18:05 +0100, Michael Opdenacker wrote:
>   
>> Hi Matt,
>>
>> Thanks for your feedback!
>>
>> On 01/17/2008 05:36 PM, Matt Mackall wrote:
>>     
>>> On Thu, 2008-01-17 at 16:43 +0100, Michael Opdenacker wrote:
>>>   
>>>       
>>>> diff -Naur linux-2.6.24-rc8-git1/arch/x86/kernel/Makefile_32 linux-2.6.24-rc8-git1-nopcspeaker/arch/x86/kernel/Makefile_32
>>>> --- linux-2.6.24-rc8-git1/arch/x86/kernel/Makefile_32	2008-01-17 09:48:58.000000000 +0100
>>>> +++ linux-2.6.24-rc8-git1-nopcspeaker/arch/x86/kernel/Makefile_32	2008-01-17 10:06:56.000000000 +0100
>>>> @@ -45,10 +45,13 @@
>>>>  
>>>>  obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
>>>>  obj-$(CONFIG_PARAVIRT)		+= paravirt_32.o
>>>> -obj-y				+= pcspeaker.o
>>>> -
>>>>  obj-$(CONFIG_SCx200)		+= scx200_32.o
>>>>  
>>>> +ifeq ($(CONFIG_INPUT_PCSPKR),y)
>>>> +	obj-y			+= pcspeaker.o
>>>> +endif
>>>>     
>>>>         
>>> I'm not sure this does what you want. What if CONFIG_INPUT_PCSPKR = m?
>>>   
>>>       
>> Does it make sense to compile arch/x86/kernel/pcspeaker.c as a module?
>> It defines no init and exit functions, and it defines an initcall, which
>> only makes sense at boot time.
>>     
>
> Probably not. However, the above code won't build pcspeaker.o if
> CONFIG_INPUT_PCSPKR = m. In other words, it'll break.
>
>   
Oops, I got it. I will post a fix soon. Thanks!

:-)

Michael.

-- 
Michael Opdenacker, Free Electrons
Free Embedded Linux Training Materials
on http://free-electrons.com/training
(More than 1500 pages!)