diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-01-28 13:37:09 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-02-12 10:58:04 +0300 |
| commit | d6ace935eafa321e22d6a68c50801c4b914fd2a9 (patch) | |
| tree | 2921f8b31b7068c9a242f886e4fd27fc415bc6b0 /arch/x86 | |
| parent | 1fa9b58c6284c20971a0750acb9b17b22775151d (diff) | |
| download | linux-d6ace935eafa321e22d6a68c50801c4b914fd2a9.tar.xz | |
x86: vvar, fix excessive gcc-6 DECLARE_VVAR warnings
On 3.12, with gcc-6, I see a lot of:
arch/x86/include/asm/vvar.h:33:28: warning: ‘vvaraddr_jiffies’ defined but not used [-Wunused-const-variable]
static type const * const vvaraddr_ ## name = \
^
arch/x86/include/asm/vvar.h:46:1: note: in expansion of macro ‘DECLARE_VVAR’
DECLARE_VVAR(0, volatile unsigned long, jiffies)
^~~~~~~~~~~~
In upstream, this is fixed by ef721987ae (x86, vdso: Introduce VVAR
marco for vdso32) and f40c330091 (x86, vdso: Move the vvar and hpet
mappings next to the 64-bit vDSO). But this is not applicable to
stable.
So mark the vvar declaration as __maybe_unused and be done with it.
This will generate it to the code only if it is used. I.e. the same as
with gcc < 6.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Andy Lutomirski <luto@amacapital.net>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/vvar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/vvar.h b/arch/x86/include/asm/vvar.h index d76ac40da206..9fb01a91c013 100644 --- a/arch/x86/include/asm/vvar.h +++ b/arch/x86/include/asm/vvar.h @@ -30,7 +30,7 @@ #else #define DECLARE_VVAR(offset, type, name) \ - static type const * const vvaraddr_ ## name = \ + static type const * const vvaraddr_ ## name __maybe_unused = \ (void *)(VVAR_ADDRESS + (offset)); #define DEFINE_VVAR(type, name) \ |