diff options
| author | Daniel Kiper <daniel.kiper@oracle.com> | 2019-04-12 12:50:04 +0200 |
|---|---|---|
| committer | Daniel Kiper <daniel.kiper@oracle.com> | 2019-04-23 11:04:07 +0200 |
| commit | acc726f812a907ee70f9ee6f8d29c1d9c57c73e1 (patch) | |
| tree | ff9f37801da11ed3ef9b007752564cf5cce857e3 /include | |
| parent | 94d9926a664014007130796616210b68e421d54a (diff) | |
x86/msr: Fix build with older GCC versions
Some older GCC versions produce following error when x86 MSR modules are build:
In file included from commands/i386/rdmsr.c:29:0:
../include/grub/i386/rdmsr.h:27:29: error: no previous prototype for ‘grub_msr_read’ [-Werror=missing-prototypes]
extern inline grub_uint64_t grub_msr_read (grub_uint32_t msr_id)
^
cc1: all warnings being treated as errors
This happens due to lack of support for a such usage of extern keyword
in older GCCs. Additionally, this usage is not consistent with the rest
of codebase. So, replace it with static keyword.
Additionally, fix incorrect coding style.
Reported-by: Eric Snowberg <eric.snowberg@oracle.com>
Reported-by: adrian15 <adrian15sgd@gmail.com>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Reviewed-by: Eric Snowberg <eric.snowberg@oracle.com>
Tested-by: adrian15 <adrian15sgd@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/grub/i386/rdmsr.h | 3 | ||||
| -rw-r--r-- | include/grub/i386/wrmsr.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/grub/i386/rdmsr.h b/include/grub/i386/rdmsr.h index bddb7bbbb..c0a0c717a 100644 --- a/include/grub/i386/rdmsr.h +++ b/include/grub/i386/rdmsr.h @@ -24,7 +24,8 @@ * Accessing a reserved or unimplemented MSR address results in a GP#. */ -extern inline grub_uint64_t grub_msr_read (grub_uint32_t msr_id) +static inline grub_uint64_t +grub_msr_read (grub_uint32_t msr_id) { grub_uint32_t low, high; diff --git a/include/grub/i386/wrmsr.h b/include/grub/i386/wrmsr.h index e14d7807f..dea60aed1 100644 --- a/include/grub/i386/wrmsr.h +++ b/include/grub/i386/wrmsr.h @@ -24,7 +24,8 @@ * Accessing a reserved or unimplemented MSR address results in a GP#. */ -extern inline void grub_msr_write(grub_uint32_t msr_id, grub_uint64_t msr_value) +static inline void +grub_msr_write(grub_uint32_t msr_id, grub_uint64_t msr_value) { grub_uint32_t low = msr_value, high = msr_value >> 32; |