From patchwork Thu Jun 9 00:43:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Basehore X-Patchwork-Id: 9166047 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 15EEA60467 for ; Thu, 9 Jun 2016 00:43:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0780528309 for ; Thu, 9 Jun 2016 00:43:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0A6628310; Thu, 9 Jun 2016 00:43:49 +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 905DC28309 for ; Thu, 9 Jun 2016 00:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933792AbcFIAnr (ORCPT ); Wed, 8 Jun 2016 20:43:47 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34698 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753540AbcFIAnq (ORCPT ); Wed, 8 Jun 2016 20:43:46 -0400 Received: by mail-pa0-f51.google.com with SMTP id bz2so7236589pad.1 for ; Wed, 08 Jun 2016 17:43:45 -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=YUfZWPk5Q+syEnDF/dgK+lVj6PaYFex4py9UE05iTgXUAlLXzwq+rczgRv5yoKCVGA p/wZo4RLR9psqh+D1ocBeVahiUqhP8cg158uF/nKHy3a3BtlOkR0QkirOJy9cu7Bnyvx yKkU7KgxyXG9qh0/VApfu4bZvPUNilsSI65Q4= 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=l320tvPgpVs9ORgRoBc6EHURizXC8h98LoUCOuzzHLqTLJYPPo0Cxas+zJNX8l48BD oInJp4GkItf7b3xv5IYGocyb3mLpdSf2p4J0EZZKZ05x1e9FK6qYWQG1XKjAsRbBC5LY 8cyfJeXvUPx1763yEKieFKIWUNyO+zKjBRt9/FWjA8Y+oGVDjUFmd1LM6qFKxq3xoKqj 51eVNx1ti++3AAO9/BjgwD/6RbG0ffOqGZM7u8S+zTpwWGgSYf/GsGuj8TdlbYGXTFER qFypaXMFS4mvJhbBZV7QrMb7lZzS3QaQTxI4Ptoc0vVyn2OUwDSIG17eW9m8ZsAnfoZk Vxeg== X-Gm-Message-State: ALyK8tItvg7CRgyZAknUQxzftCxiPJbmQDV6O9Hl0wdxQDXyiKllP+vJkRERMbQ78GDFIiRD X-Received: by 10.66.41.43 with SMTP id c11mr8883061pal.96.1465433025300; Wed, 08 Jun 2016 17:43:45 -0700 (PDT) Received: from ketosis.mtv.corp.google.com ([172.22.65.104]) by smtp.gmail.com with ESMTPSA id cc6sm5094696pac.5.2016.06.08.17.43.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jun 2016 17:43:44 -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, gnomes@lxorguk.ukuu.org.uk, peterz@infradead.org Subject: [PATCH v2 1/5] x86: stub out pmc function Date: Wed, 8 Jun 2016 17:43:33 -0700 Message-Id: <1465433017-13602-2-git-send-email-dbasehore@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1465433017-13602-1-git-send-email-dbasehore@chromium.org> References: <1465433017-13602-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 */