From patchwork Fri Apr 10 22:17:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6200041 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0DEF59F2E9 for ; Fri, 10 Apr 2015 22:17:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A8B7201FA for ; Fri, 10 Apr 2015 22:17:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50F19201BC for ; Fri, 10 Apr 2015 22:17:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932763AbbDJWRZ (ORCPT ); Fri, 10 Apr 2015 18:17:25 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:59240 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911AbbDJWRX (ORCPT ); Fri, 10 Apr 2015 18:17:23 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0MBO0z-1YZJEt378n-00AH8h; Sat, 11 Apr 2015 00:17:14 +0200 From: Arnd Bergmann To: Viresh Kumar , "Rafael J. Wysocki" Cc: Tang Yuantian , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] cpufreq: fix qoriq uniprocessor build Date: Sat, 11 Apr 2015 00:17:11 +0200 Message-ID: <8186394.6fcP6P730e@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:PdQc1x9+LSWlAUUUJr4VGe7rGc+RJ3qxk8oYgEi/sV4S6iSh1sq hDI1/z2NRy/VmEKCV+8m0HEMQAsUrUau1+J040e9HTCUnRuyLkE+UKOH/lHb7bOz/83zmje 1jY2uLazcVB4X9bTJfeRWYDHiC7sfao+cDLLZJsah/sNOKWfXiD37lYPq8V721jK7FxwZak rbgzFnVr6/qt86l/RWFUw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The qoriq-cpufreq driver contains a hack for powerpc to include asm/smp.h on uniprocessor builds so it can get the hardware CPU number. On ARM, it does not require this hack, but instead gets a compile error: In file included from drivers/cpufreq/qoriq-cpufreq.c:24:0: arch/arm/include/asm/smp.h:18:3: error: #error " included in non-SMP build" arch/arm/include/asm/smp.h:21:0: warning: "raw_smp_processor_id" redefined This adds an #ifdef to mirror the one in its get_cpu_physical_id() function. Signed-off-by: Arnd Bergmann Fixes: 2f249358eedaf ("cpufreq: qoriq: rename the driver") Cc: Tang Yuantian Acked-by: Viresh Kumar --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c index 9fd51c860308..88b21ae0d6b0 100644 --- a/drivers/cpufreq/qoriq-cpufreq.c +++ b/drivers/cpufreq/qoriq-cpufreq.c @@ -21,7 +21,9 @@ #include #include +#if !defined(CONFIG_ARM) #include /* for get_hard_smp_processor_id() in UP configs */ +#endif /** * struct cpu_data