Hi Olof,
Here are three more fixes that I'd like to merge through the arm-soc
as time permits. All of them should be completely harmless and they
only fix harmless gcc warnings.
I don't know what your plans are for sending the next fixes branch.
I've uploaded these into a new "fixes2" branch on top of the patches
that are already in "fixes". We can either send them all together,
or you send the ones that are already queued first and these ones
with the next batch. Feel free to rebase if necessary.
Arnd
Arnd Bergmann (3):
ARM: shmobile: mark shmobile_init_late as __init
ARM: assabet: fix bogus warning in get_assabet_scr (again)
ARM: integrator: use __iomem pointers for MMIO, part 2
arch/arm/mach-integrator/include/mach/cm.h | 2 +-
arch/arm/mach-integrator/include/mach/platform.h | 6 +++---
arch/arm/mach-integrator/integrator_ap.c | 2 +-
arch/arm/mach-integrator/integrator_cp.c | 4 ++--
arch/arm/mach-sa1100/assabet.c | 2 +-
arch/arm/mach-shmobile/include/mach/common.h | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
--
1.7.10
Cc: Linus Walleij <redacted>
Cc: Magnus Damm <redacted>
Cc: Rafael J. Wysocki <redacted>
Cc: Russell King <redacted>
Cc: Simon Horman <horms@verge.net.au>
Russell fixed this bogus warning before in 2f3eca8b4f "Shut up gcc
warning in assabet.c", but apparently gcc has become smarter (or dumber)
since 2005, and the same warning came up again.
This uses the uninitialized_var() macro to convince gcc that the
variable is actually being initialized. 100 times in fact.
Without this patch, building assabet_defconfig results in:
arch/arm/mach-sa1100/assabet.c: In function 'fixup_assabet':
arch/arm/mach-sa1100/assabet.c:397:6: warning: 'scr' may be used uninitialized in this function [-Wuninitialized]
arch/arm/mach-sa1100/assabet.c:389:16: note: 'scr' was declared here
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <redacted>
---
arch/arm/mach-sa1100/assabet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Due to some interesting merges in the integrator code, not
all users of mmio pointers were converted before, this
fixes all warnings that got introduced as a consequence.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <redacted>
Cc: Russell King <redacted>
---
arch/arm/mach-integrator/include/mach/cm.h | 2 +-
arch/arm/mach-integrator/include/mach/platform.h | 6 +++---
arch/arm/mach-integrator/integrator_ap.c | 2 +-
arch/arm/mach-integrator/integrator_cp.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
Patch 35f2b0bd59 "ARM: shmobile: Move definition of shmobile_init_late()
to header" moved the definition of the shmobile_init_late function, but
dropped the __init annotation, which is now causing warnings because
the function calls shmobile_suspend_init, which is also marked init.
Without this patch, building kota2_defconfig results in:
WARNING: vmlinux.o(.text+0xb7c8): Section mismatch in reference from the function shmobile_init_late() to the function .init.text:shmobile_suspend_init()
The function shmobile_init_late() references
the function __init shmobile_suspend_init().
This is often because shmobile_init_late lacks a __init
annotation or the annotation of shmobile_suspend_init is wrong.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rafael J. Wysocki <redacted>
Cc: Magnus Damm <redacted>
Cc: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Olof Johansson <hidden> Date: 2012-10-09 17:46:16
On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
Hi Olof,
Here are three more fixes that I'd like to merge through the arm-soc
as time permits. All of them should be completely harmless and they
only fix harmless gcc warnings.
I don't know what your plans are for sending the next fixes branch.
I've uploaded these into a new "fixes2" branch on top of the patches
that are already in "fixes". We can either send them all together,
or you send the ones that are already queued first and these ones
with the next batch. Feel free to rebase if necessary.
I've pulled it in and will send up with fixes tonight (Tony has OMAP
fixes coming, others might too).
-Olof
On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
quoted
Hi Olof,
Here are three more fixes that I'd like to merge through the arm-soc
as time permits. All of them should be completely harmless and they
only fix harmless gcc warnings.
I don't know what your plans are for sending the next fixes branch.
I've uploaded these into a new "fixes2" branch on top of the patches
that are already in "fixes". We can either send them all together,
or you send the ones that are already queued first and these ones
with the next batch. Feel free to rebase if necessary.
I've pulled it in and will send up with fixes tonight (Tony has OMAP
fixes coming, others might too).
Ok, thanks!
I just noticed that I was missing yet another one, which I now added
directly. It was part of a longer series I sent last week. I wasn't
really sure whether this one would better be included in arm-soc or
Russell's arm tree and then I ended up not putting it in either series :(
Arnd
8<----------
From bfbad32a63fa6287723961f07bcd043dc9c5965c Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 13:34:13 +0000
Subject: [PATCH] ARM: pxa: armcore: fix PCI PIO warnings
The it8152 PCI host used on the pxa/cm_x2xx machines
uses the old-style I/O window registration. This should
eventually get converted to pci_ioremap_io() but for
now, let's cast the IT8152_IO_BASE constant to an integer
type to get rid of the warnings.
Without this patch, building cm_x2xx_defconfig results in:
arch/arm/common/it8152.c: In function 'it8152_pci_setup':
arch/arm/common/it8152.c:287:18: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:288:16: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:291:17: warning: assignment makes integer from pointer without a cast [enabled by default]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Igor Grinberg <redacted>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Mike Rapoport <redacted>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Eric Miao <redacted>
From: Olof Johansson <hidden> Date: 2012-10-09 21:26:24
On Tue, Oct 09, 2012 at 08:01:26PM +0000, Arnd Bergmann wrote:
On Tuesday 09 October 2012, Olof Johansson wrote:
quoted
On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
quoted
Hi Olof,
Here are three more fixes that I'd like to merge through the arm-soc
as time permits. All of them should be completely harmless and they
only fix harmless gcc warnings.
I don't know what your plans are for sending the next fixes branch.
I've uploaded these into a new "fixes2" branch on top of the patches
that are already in "fixes". We can either send them all together,
or you send the ones that are already queued first and these ones
with the next batch. Feel free to rebase if necessary.
I've pulled it in and will send up with fixes tonight (Tony has OMAP
fixes coming, others might too).
Ok, thanks!
I just noticed that I was missing yet another one, which I now added
directly. It was part of a longer series I sent last week. I wasn't
really sure whether this one would better be included in arm-soc or
Russell's arm tree and then I ended up not putting it in either series :(
On Tue, Oct 9, 2012 at 5:34 PM, Arnd Bergmann [off-list ref] wrote:
Due to some interesting merges in the integrator code, not
all users of mmio pointers were converted before, this
fixes all warnings that got introduced as a consequence.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <redacted>
Cc: Russell King <redacted>
Yeah I told you it was gonna collide ;-)
Thanks a lot for fixing it up and following through
on this!
Acked-by: Linus Walleij <redacted>
Yours,
Linus Walleij