Patchwork [2/2,nexus4] UBUNTU: remove CONFIG_NO_ERROR_ON_MISMATCH check

login
register
mail settings
Submitter Colin King
Date May 14, 2013, 2:58 p.m.
Message ID <1368543499-32647-3-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/243737/
State New
Headers show

Comments

Colin King - May 14, 2013, 2:58 p.m.
From: Colin Ian King <colin.king@canonical.com>

Commit 3f2bc4d6eb5a4fada842462ba22bb6bbb41d00c7 added in a
CONFIG_NO_ERROR_ON_MISMATCH which deviates from the normal Ubuntu
configs and makes this kernel more pedantic than normal Ubuntu
kernels.  This breaks DKMS builds such as lttng-modules which may
have section mismatch warnings which otherwise are trival issues and
won't actually cause breakage.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 scripts/Makefile.modpost |    1 -
 1 file changed, 1 deletion(-)
Andy Whitcroft - May 15, 2013, 3:46 p.m.
On Tue, May 14, 2013 at 03:58:19PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Commit 3f2bc4d6eb5a4fada842462ba22bb6bbb41d00c7 added in a
> CONFIG_NO_ERROR_ON_MISMATCH which deviates from the normal Ubuntu
> configs and makes this kernel more pedantic than normal Ubuntu
> kernels.  This breaks DKMS builds such as lttng-modules which may
> have section mismatch warnings which otherwise are trival issues and
> won't actually cause breakage.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  scripts/Makefile.modpost |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> index c1bc458..08dce14 100644
> --- a/scripts/Makefile.modpost
> +++ b/scripts/Makefile.modpost
> @@ -80,7 +80,6 @@ modpost = scripts/mod/modpost                    \
>   $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
>   $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
>   $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
> - $(if $(CONFIG_NO_ERROR_ON_MISMATCH),,-E)	 \

Is this not just a configuration option in the kernel config?  Could we
not have just changed that rather than changing the code?

-apw
Tim Gardner - May 15, 2013, 7:02 p.m.
On 05/15/2013 09:46 AM, Andy Whitcroft wrote:
> On Tue, May 14, 2013 at 03:58:19PM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Commit 3f2bc4d6eb5a4fada842462ba22bb6bbb41d00c7 added in a
>> CONFIG_NO_ERROR_ON_MISMATCH which deviates from the normal Ubuntu
>> configs and makes this kernel more pedantic than normal Ubuntu
>> kernels.  This breaks DKMS builds such as lttng-modules which may
>> have section mismatch warnings which otherwise are trival issues and
>> won't actually cause breakage.
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>>  scripts/Makefile.modpost |    1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
>> index c1bc458..08dce14 100644
>> --- a/scripts/Makefile.modpost
>> +++ b/scripts/Makefile.modpost
>> @@ -80,7 +80,6 @@ modpost = scripts/mod/modpost                    \
>>   $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
>>   $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
>>   $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
>> - $(if $(CONFIG_NO_ERROR_ON_MISMATCH),,-E)	 \
> 
> Is this not just a configuration option in the kernel config?  Could we
> not have just changed that rather than changing the code?
> 
> -apw
> 

CONFIG_NO_ERROR_ON_MISMATCH is not defined in any Kconfig, so there is
nothing to hold it in a config file. Furthermore, this is cruft added by
Android, so it seemed fine to just hack it out. We likely should have
gone all the way and removed the corresponding hacks to
scripts/mod/modpost.c

rtg

Patch

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index c1bc458..08dce14 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -80,7 +80,6 @@  modpost = scripts/mod/modpost                    \
  $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
- $(if $(CONFIG_NO_ERROR_ON_MISMATCH),,-E)	 \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \
  $(if $(cross_build),-c)