diff options
| author | Borislav Petkov <bp@suse.de> | 2020-05-07 12:27:43 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-05-07 12:27:43 +0200 |
| commit | 51485635ebc25267ebab548a1bce43f823d9c0c5 (patch) | |
| tree | 152408c7f8959f6871b655d9193a76b529faa4bb /arch/arc | |
| parent | e9d7144597b10ff13ff2264c059f7d4a7fbc89ac (diff) | |
| parent | fb9cbbc895eb6e986dc90c928a35c793d75f435a (diff) | |
Merge 'x86/urgent' into x86/cpu
... to resolve conflicting changes to arch/x86/kernel/apic/apic.c
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/include/asm/module.h | 5 | ||||
| -rw-r--r-- | arch/arc/include/asm/vermagic.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/arc/include/asm/module.h b/arch/arc/include/asm/module.h index 48f13a4ace4b..f534a1fef070 100644 --- a/arch/arc/include/asm/module.h +++ b/arch/arc/include/asm/module.h @@ -3,7 +3,6 @@ * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) * * Amit Bhor, Sameer Dhavale: Codito Technologies 2004 - */ #ifndef _ASM_ARC_MODULE_H @@ -19,8 +18,4 @@ struct mod_arch_specific { const char *secstr; }; -#define MODULE_PROC_FAMILY "ARC700" - -#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY - #endif /* _ASM_ARC_MODULE_H */ diff --git a/arch/arc/include/asm/vermagic.h b/arch/arc/include/asm/vermagic.h new file mode 100644 index 000000000000..a10257d2c62c --- /dev/null +++ b/arch/arc/include/asm/vermagic.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _ASM_VERMAGIC_H +#define _ASM_VERMAGIC_H + +#define MODULE_ARCH_VERMAGIC "ARC700" + +#endif /* _ASM_VERMAGIC_H */ |