tools/power turbostat: Handle cap_get_proc() ENOSYS

[ Upstream commit d34fe509f5f76d9dc36291242d67c6528027ebbd ]

Kernels configured with CONFIG_MULTIUSER=n have no cap_get_proc().
Check for ENOSYS to recognize this case, and continue on to
attempt to access the requested MSRs (such as temperature).

Signed-off-by: Calvin Owens <calvin@wbinvd.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 9eb8e8a850ec6dbdb78cbdabddabb6557545e521..5c747131f1555e04656551940ebbd68a7e3c9d73 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -6573,8 +6573,16 @@ int check_for_cap_sys_rawio(void)
        int ret = 0;
 
        caps = cap_get_proc();
-       if (caps == NULL)
+       if (caps == NULL) {
+               /*
+                * CONFIG_MULTIUSER=n kernels have no cap_get_proc()
+                * Allow them to continue and attempt to access MSRs
+                */
+               if (errno == ENOSYS)
+                       return 0;
+
                return 1;
+       }
 
        if (cap_get_flag(caps, CAP_SYS_RAWIO, CAP_EFFECTIVE, &cap_flag_value)) {
                ret = 1;