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>

diff --git a/include/grub/i386/rdmsr.h b/include/grub/i386/rdmsr.h
index bddb7bbbba18c116ae5f18db070312c3bcec4bde..c0a0c717a0e9e834e6bea634d4344a7d79081ae8 100644 (file)
--- 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 e14d7807f2b6b466675ce750673e8862606e0d29..dea60aed1fc08daa5fd5027993a93b5d7c93ba92 100644 (file)
--- 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;