Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers: Remove inclusion of vermagic header

Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
the arch header arch/x86/include/asm/module.h won't be redefined.

In file included from ./include/linux/module.h:30,
from drivers/net/ethernet/3com/3c515.c:56:
./arch/x86/include/asm/module.h:73: warning: "MODULE_ARCH_VERMAGIC"
redefined
73 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
|
In file included from drivers/net/ethernet/3com/3c515.c:25:
./include/linux/vermagic.h:28: note: this is the location of the
previous definition
28 | #define MODULE_ARCH_VERMAGIC ""
|

Fixes: 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers")
Co-developed-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Shannon Nelson <snelson@pensando.io> # ionic
Acked-by: Sebastian Reichel <sre@kernel.org> # power
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Leon Romanovsky and committed by
David S. Miller
1c79031f b6246f4d

+4 -8
+1 -1
drivers/net/bonding/bonding_priv.h
··· 14 14 15 15 #ifndef _BONDING_PRIV_H 16 16 #define _BONDING_PRIV_H 17 - #include <linux/vermagic.h> 17 + #include <generated/utsrelease.h> 18 18 19 19 #define DRV_NAME "bonding" 20 20 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
-1
drivers/net/ethernet/3com/3c509.c
··· 85 85 #include <linux/device.h> 86 86 #include <linux/eisa.h> 87 87 #include <linux/bitops.h> 88 - #include <linux/vermagic.h> 89 88 90 89 #include <linux/uaccess.h> 91 90 #include <asm/io.h>
-1
drivers/net/ethernet/3com/3c515.c
··· 22 22 23 23 */ 24 24 25 - #include <linux/vermagic.h> 26 25 #define DRV_NAME "3c515" 27 26 28 27 #define CORKSCREW 1
-1
drivers/net/ethernet/adaptec/starfire.c
··· 45 45 #include <asm/processor.h> /* Processor type for cache alignment. */ 46 46 #include <linux/uaccess.h> 47 47 #include <asm/io.h> 48 - #include <linux/vermagic.h> 49 48 50 49 /* 51 50 * The current frame processor firmware fails to checksum a fragment
+1 -1
drivers/net/ethernet/pensando/ionic/ionic_main.c
··· 6 6 #include <linux/module.h> 7 7 #include <linux/netdevice.h> 8 8 #include <linux/utsname.h> 9 - #include <linux/vermagic.h> 9 + #include <generated/utsrelease.h> 10 10 11 11 #include "ionic.h" 12 12 #include "ionic_bus.h"
+1 -1
drivers/power/supply/test_power.c
··· 16 16 #include <linux/power_supply.h> 17 17 #include <linux/errno.h> 18 18 #include <linux/delay.h> 19 - #include <linux/vermagic.h> 19 + #include <generated/utsrelease.h> 20 20 21 21 enum test_power_id { 22 22 TEST_AC,
+1 -2
net/ethtool/ioctl.c
··· 17 17 #include <linux/phy.h> 18 18 #include <linux/bitops.h> 19 19 #include <linux/uaccess.h> 20 - #include <linux/vermagic.h> 21 20 #include <linux/vmalloc.h> 22 21 #include <linux/sfp.h> 23 22 #include <linux/slab.h> ··· 27 28 #include <net/xdp_sock.h> 28 29 #include <net/flow_offload.h> 29 30 #include <linux/ethtool_netlink.h> 30 - 31 + #include <generated/utsrelease.h> 31 32 #include "common.h" 32 33 33 34 /*