From patchwork Thu Jun 9 21:02:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Basehore X-Patchwork-Id: 9168003 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 80BC1607DA for ; Thu, 9 Jun 2016 21:10:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7175828338 for ; Thu, 9 Jun 2016 21:10:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6571F2835C; Thu, 9 Jun 2016 21:10:15 +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 0129428338 for ; Thu, 9 Jun 2016 21:10:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149AbcFIVJv (ORCPT ); Thu, 9 Jun 2016 17:09:51 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34745 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751856AbcFIVC0 (ORCPT ); Thu, 9 Jun 2016 17:02:26 -0400 Received: by mail-pf0-f182.google.com with SMTP id 62so16361100pfd.1 for ; Thu, 09 Jun 2016 14:02:25 -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=O3LEfsZ4YV+cKAH66fcfuJkYZJt6V7h9mAZ8Tg8ma+ScJyzSPkYNm9y6o6vzqqJNaz uplwrIjsZJQmWjyWW6ewzlK8jI7SNeGEN8145SIhGwkuVos7LWu7bN0i2/thg4rAbAEh b91sGdWuSoq4EuNrd0ZtYLLUlNDwyPOCGMFX4= 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=P+tyht2J+u8dW8KazMMamKf2cuPZiJY6KB+avM/fq8rmY1MXbNgiEasGcF+KRaTWCG lDEURGESzqSyC43AtcSocdpNWJkhMseH0lDDiuV0IBbItNG/T9GQzsdGygl/rA3qnCoD cuIo3Gtxo/ZobK83/ADhl3tnVVdeDYezU2NHyo6Si8Vzyipc4+emgGOir+RHdeH6S8Q4 +leZ9TpweTmhEgHbqA+TDG1tVuA/yfTZkjFGaUGeCizfwIdX4E++YZfu1VeujAWEWGjZ 8YQeZmjvZw9rHX7V8Q64iL0D1Nx738ZjKxXtIGPS/xDAmP4kZveCFNi3TOWSIOMtVSON gNtw== X-Gm-Message-State: ALyK8tJZuqNyvKhTuSQgxaMKr7sKYyiorNnEiS/L3yLBU467iQx6uF94NczF7a8H/JZ/HcmT X-Received: by 10.98.36.140 with SMTP id k12mr6557201pfk.118.1465506145246; Thu, 09 Jun 2016 14:02:25 -0700 (PDT) Received: from ketosis.mtv.corp.google.com ([172.22.65.104]) by smtp.gmail.com with ESMTPSA id tn7sm12163712pac.29.2016.06.09.14.02.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jun 2016 14:02:24 -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 v4 1/5] x86: stub out pmc function Date: Thu, 9 Jun 2016 14:02:15 -0700 Message-Id: <1465506139-25981-2-git-send-email-dbasehore@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1465506139-25981-1-git-send-email-dbasehore@chromium.org> References: <1465506139-25981-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 */