Messages in this thread Patch in this message | | | Date | Sat, 11 Apr 2020 19:35:04 +0200 | From | Borislav Petkov <> | Subject | Re: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition |
| |
On Sat, Apr 11, 2020 at 07:11:56PM +0300, Leon Romanovsky wrote: > Probably, this is the right change, but I have a feeling that the right > solution will be inside headers itself. It is a little bit strange that > both very common kernel headers like module.h and vermagic.h are location > dependant.
Judging by how only a couple of net drivers include vermagic.h directly, doh, of course:
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c index b762176a1406..139d0120f511 100644 --- a/drivers/net/ethernet/3com/3c509.c +++ b/drivers/net/ethernet/3com/3c509.c @@ -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> diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c index 90312fcd6319..47b4215bb93b 100644 --- a/drivers/net/ethernet/3com/3c515.c +++ b/drivers/net/ethernet/3com/3c515.c @@ -22,7 +22,6 @@ */ -#include <linux/vermagic.h> #define DRV_NAME "3c515" #define CORKSCREW 1 --- Drivers include
#include <linux/module.h>
which includes
#include <asm/module.h>
which defines the arch-specific MODULE_ARCH_VERMAGIC.
Why did you need to include vermagic.h directly? i386 builds fine with the vermagic.h includes removed or was it some other arches which needed it?
Thx.
-- Regards/Gruss, Boris.
https://people.kernel.org/tglx/notes-about-netiquette
| |