drivers: Remove inclusion of vermagic header (1c79031f) · Commits · 戴 / test

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: ("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>

drivers/net/bonding/bonding_priv.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@

		#ifndef _BONDING_PRIV_H
		#define _BONDING_PRIV_H
		#include <linux/vermagic.h>
		#include <generated/utsrelease.h>

		#define DRV_NAME "bonding"
		#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"

drivers/net/ethernet/3com/3c509.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@
		#include <linux/device.h>
		#include <linux/eisa.h>
		#include <linux/bitops.h>
		#include <linux/vermagic.h>

		#include <linux/uaccess.h>
		#include <asm/io.h>

drivers/net/ethernet/3com/3c515.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@

		*/

		#include <linux/vermagic.h>
		#define DRV_NAME "3c515"

		#define CORKSCREW 1

drivers/net/ethernet/adaptec/starfire.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@
		#include <asm/processor.h> /* Processor type for cache alignment. */
		#include <linux/uaccess.h>
		#include <asm/io.h>
		#include <linux/vermagic.h>

		/*
		* The current frame processor firmware fails to checksum a fragment

drivers/net/ethernet/pensando/ionic/ionic_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		#include <linux/module.h>
		#include <linux/netdevice.h>
		#include <linux/utsname.h>
		#include <linux/vermagic.h>
		#include <generated/utsrelease.h>

		#include "ionic.h"
		#include "ionic_bus.h"

Admin message