diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-07 16:42:54 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-22 11:03:03 -0800 |
commit | faee3f8d2565b40f9d9c17b6aebd238275bd7397 (patch) | |
tree | 03d4fc06102c4f856a04563384ead1333b4dd2e2 /arch/x86 | |
parent | fda2027cf4356022698e51be3124a5b29d0c7ca3 (diff) |
x86, mrst: A function in a header file needs to be marked "inline"
commit 55572b293b3a5929e8c54bc91d14ae6264186bf6 upstream.
A function in a header file needs to be explicitly marked "inline", or
gcc will complain if it is not used.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
LKML-Reference: <1274295685-6774-3-git-send-email-jacob.jun.pan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/mrst.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h index 16350740edf6..33fc2966beb7 100644 --- a/arch/x86/include/asm/mrst.h +++ b/arch/x86/include/asm/mrst.h @@ -26,7 +26,7 @@ enum mrst_cpu_type { }; extern enum mrst_cpu_type __mrst_cpu_chip; -static enum mrst_cpu_type mrst_identify_cpu(void) +static inline enum mrst_cpu_type mrst_identify_cpu(void) { return __mrst_cpu_chip; } |