From: H. Peter Anvin Date: Thu, 7 Oct 2010 23:42:54 +0000 (-0700) Subject: x86, mrst: A function in a header file needs to be marked "inline" X-Git-Tag: firefly_0821_release~9833^2~79^2^2~337 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=faee3f8d2565b40f9d9c17b6aebd238275bd7397;p=firefly-linux-kernel-4.4.55.git 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 Cc: Jacob Pan LKML-Reference: <1274295685-6774-3-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman --- 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; }