From patchwork Thu Jun 2 04:33:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Basehore X-Patchwork-Id: 9148991 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 39A866074E for ; Thu, 2 Jun 2016 04:33:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 176092665D for ; Thu, 2 Jun 2016 04:33:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC162271FD; Thu, 2 Jun 2016 04:33:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C3142665D for ; Thu, 2 Jun 2016 04:33:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751208AbcFBEdf (ORCPT ); Thu, 2 Jun 2016 00:33:35 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35106 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbcFBEdd (ORCPT ); Thu, 2 Jun 2016 00:33:33 -0400 Received: by mail-pa0-f42.google.com with SMTP id xk1so2494591pac.2 for ; Wed, 01 Jun 2016 21:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aWOzfrltL9QMERoAhm/x3Cn5LE0/0OIOYNLsL7DAmcY=; b=Lngt6XpqQwm1mJO4bdolfBgli/Nxz1hGsoYGdsBtXxs1HEYk2OwkRbP5nVx1Zn9Vuu +S4ynMKZifzm0t1Lqww3YZGfztmMEGi/Ju1BNSPjNagv/y6bkS4a2CQBoLeM4X9RQgZv XuAFo9RNmCe/0nyziiUJ623tTi3jgBb3U/Euw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aWOzfrltL9QMERoAhm/x3Cn5LE0/0OIOYNLsL7DAmcY=; b=FhlmkivP6y/Vj4W/uQSmUKhun6D1pG/QQJi5APtP+9/S2zJJ55YwkupB+AqJwguO4N ORjMXSC4kPvMQZTWjScwW0aZ7zpq+AZzPSJY186tXqejb1f5dMY6asmJekcNrhPWHdU4 L5JIpp0mJ8mziQrr8YeBjs1YPqiwkCt90gceKaislGnujl2w0fwo/Q7TVkpbXocOtc5u v0crw7ubDe9Kh3SpCj263iDApsvX+blijFEHRHJslckwKWeDm+z0TQg/e9WREUfWkTsI y2GeIBNwlD2Saqyez5LOecIO9udR3AYhQjtj22XRHtg66L3GeqzzK23vpAsUOcjPtvxb Lo8A== X-Gm-Message-State: ALyK8tI1ziOdpruH9fE83fWqJEvwxcUJeyS62mK0JB1ve9g1mxRW0USPu/a0gKaGJ1kBGfRZ X-Received: by 10.66.66.10 with SMTP id b10mr2780199pat.12.1464842013734; Wed, 01 Jun 2016 21:33:33 -0700 (PDT) Received: from ketosis.mtv.corp.google.com ([172.22.65.104]) by smtp.gmail.com with ESMTPSA id w190sm3743142pfd.58.2016.06.01.21.33.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 21:33:33 -0700 (PDT) From: dbasehore@chromium.org To: linux-kernel@vger.kernel.org Cc: dbasehore@chromium.org, linux-pm@vger.kernel.org, rjw@rjwysocki.net, pavel@ucw.cz, len.brown@intel.com, tglx@linutronix.de Subject: [PATCH 1/5] x86: stub out pmc function Date: Wed, 1 Jun 2016 21:33:25 -0700 Message-Id: <1464842009-21789-2-git-send-email-dbasehore@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1464842009-21789-1-git-send-email-dbasehore@chromium.org> References: <1464842009-21789-1-git-send-email-dbasehore@chromium.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Derek Basehore This creates an inline function of intel_pmc_slp_s0_counter_read for !CONFIG_INTEL_PMC_CORE. Signed-off-by: Derek Basehore --- arch/x86/include/asm/pmc_core.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pmc_core.h b/arch/x86/include/asm/pmc_core.h index d4855f1..786e526 100644 --- a/arch/x86/include/asm/pmc_core.h +++ b/arch/x86/include/asm/pmc_core.h @@ -22,6 +22,10 @@ #define _ASM_PMC_CORE_H /* API to read SLP_S0_RESIDENCY counter */ -int intel_pmc_slp_s0_counter_read(u32 *data); +#ifdef CONFIG_INTEL_PMC_CORE +extern int intel_pmc_slp_s0_counter_read(u32 *data); +#else +static inline int intel_pmc_slp_s0_counter_read(u32 *data) { return -ENOSYS; } +#endif #endif /* _ASM_PMC_CORE_H */