summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-10-07 16:42:54 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-10-07 16:45:18 -0700
commit55572b293b3a5929e8c54bc91d14ae6264186bf6 (patch)
treec78868ed3708beca7095645e32eb5d8459bc3a11
parentcb655d0f3d57c23db51b981648e452988c0223f9 (diff)
downloadlinux-3.10-55572b293b3a5929e8c54bc91d14ae6264186bf6.tar.gz
linux-3.10-55572b293b3a5929e8c54bc91d14ae6264186bf6.tar.bz2
linux-3.10-55572b293b3a5929e8c54bc91d14ae6264186bf6.zip
x86, mrst: A function in a header file needs to be marked "inline"
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> Cc: <stable@kernel.org> v2.6.36 LKML-Reference: <1274295685-6774-3-git-send-email-jacob.jun.pan@linux.intel.com>
-rw-r--r--arch/x86/include/asm/mrst.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index 16350740edf..33fc2966beb 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;
}