diff options
| author | David S. Miller <davem@davemloft.net> | 2020-04-25 19:24:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-25 20:18:53 -0700 |
| commit | d483389678f9e03d53f226641ea39679debcbc81 (patch) | |
| tree | e33c9e59627e806ef97be9ef66c48afb1e4ab393 /include/linux/vermagic.h | |
| parent | 6033cebdfff9b10192eb254e8cc60fedd595ea7f (diff) | |
| parent | b2768df24ec400dd4f7fa79542f797e904812053 (diff) | |
| download | linux-d483389678f9e03d53f226641ea39679debcbc81.tar.gz linux-d483389678f9e03d53f226641ea39679debcbc81.tar.bz2 linux-d483389678f9e03d53f226641ea39679debcbc81.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Simple overlapping changes to linux/vermagic.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/vermagic.h')
| -rw-r--r-- | include/linux/vermagic.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h index 7768d20ada39..1eaaa93c37bf 100644 --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h @@ -1,10 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_VERMAGIC_H +#define _LINUX_VERMAGIC_H #ifndef INCLUDE_VERMAGIC #error "This header can be included from kernel/module.c or *.mod.c only" #endif #include <generated/utsrelease.h> +#include <asm/vermagic.h> /* Simply sanity version stamp for modules. */ #ifdef CONFIG_SMP @@ -29,9 +32,6 @@ #else #define MODULE_VERMAGIC_MODVERSIONS "" #endif -#ifndef MODULE_ARCH_VERMAGIC -#define MODULE_ARCH_VERMAGIC "" -#endif #ifdef RANDSTRUCT_PLUGIN #include <generated/randomize_layout_hash.h> #define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED @@ -46,3 +46,4 @@ MODULE_ARCH_VERMAGIC \ MODULE_RANDSTRUCT_PLUGIN +#endif /* _LINUX_VERMAGIC_H */ |