• Arnd Bergmann's avatar
    ARM: orion: fix orion_ge00_switch_board_info initialization · 8337d083
    Arnd Bergmann authored
    A section type mismatch warning shows up when building with LTO,
    since orion_ge00_mvmdio_bus_name was put in __initconst but not marked
    const itself:
    
    include/linux/of.h: In function 'spear_setup_of_timer':
    arch/arm/mach-spear/time.c:207:34: error: 'timer_of_match' causes a section type conflict with 'orion_ge00_mvmdio_bus_name'
     static const struct of_device_id timer_of_match[] __initconst = {
                                      ^
    arch/arm/plat-orion/common.c:475:32: note: 'orion_ge00_mvmdio_bus_name' was declared here
     static __initconst const char *orion_ge00_mvmdio_bus_name = "orion-mii";
                                    ^
    
    As pointed out by Andrew Lunn, it should in fact be 'const' but not
    '__initconst' because the string is never copied but may be accessed
    after the init sections are freed. To fix that, I get rid of the
    extra symbol and rewrite the initialization in a simpler way that
    assigns both the bus_id and modalias statically.
    
    I spotted another theoretical bug in the same place, where d->netdev[i]
    may be an out of bounds access, this can be fixed by moving the device
    assignment into the loop.
    
    Cc: stable@vger.kernel.org
    Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    8337d083
common.c 23.1 KB