Re: [PATCH] x86: fix two sparse warnings in early boot string handling

[Paul Gortmaker <paul.gortmaker@windriver.com>]

On 14-02-12 09:57 AM, Paul Gortmaker wrote:
> On 14-02-11 09:23 PM, David Rientjes wrote:
>> On Tue, 11 Feb 2014, Paul Gortmaker wrote:
>>
>>>>> Fixes:
>>>>>
>>>>> arch/x86/boot/compressed/../string.c:60:14: warning: symbol 'atou' was not declared. Should it be static?
>>>>> arch/x86/boot/string.c:133:6: warning: symbol 'strstr' was not declared. Should it be static?
>>>>>
>>>>> The atou one could be considered a false positive; it seems somehow
>>>>> caused by including ./string.c from within /compressed/string.c file.
>>>>> However git grep shows only the atou prototype and declaration, so
>>>>> it is completely unused and we can hence delete it.
>>>>>
>>>>
>>>> Declaring a prototype in a header file would be pointless if there is no 
>>>> current breakage; I don't see why you can't remove strstr() in 
>>>> arch/x86/boot/string.c entirely.  What breaks?
>>>
>>> Explicit breakage vs. sparse warnings are two different things.  It may
>>> be that we can delete strstr() just like I did for atou() -- but in the
>>> interest of doing the minimal change, I did just what was needed for
>>> fixing the sparse warnings for strstr.  I can test if it can be removed,
>>> but it has the smell of generic-libc usage all over it...
>>>
>>
>> When the minimal change is to add an unnecessary prototype for a function 
>> that is not referenced, it doesn't seem acceptable.
> 
> OK, fair enough -- it seems surprisingly unused, as well as strcmp, despite
> my gut feeling that they'd be used in multiple places.  I'll send a v2
> that deletes all three once it passes allyesconfig on linux-next for x86
> 32/64/uml.

Actually no v2 pending.  The original v1 patch was/is correct as-is.

While x86-64 defconfig passed, it turns out that both strcmp and strstr
have to stay, else we will get this on i386 allyesconfig builds:

arch/x86/boot/compressed/eboot.o: In function `handle_cmdline_files.isra.5.constprop.6':
eboot.c:(.text+0x4cf): undefined reference to `strstr'
eboot.c:(.text+0x601): undefined reference to `strstr'
make[2]: *** [arch/x86/boot/compressed/vmlinux] Error 1

arch/x86/boot/edd.o: In function `query_edd':
arch/x86/boot/edd.c:136: undefined reference to `strcmp'
arch/x86/boot/edd.c:136: undefined reference to `strcmp'
arch/x86/boot/edd.c:140: undefined reference to `strcmp'
arch/x86/boot/edd.c:142: undefined reference to `strcmp'
make[1]: *** [arch/x86/boot/setup.elf] Error 1

So my gut feeling was right after all.  ;)

Thanks,
Paul.
--