From patchwork Fri Jan 17 02:03:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 23279 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6D55B20555 for ; Fri, 17 Jan 2014 02:07:13 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf7915104pab.11 for ; Thu, 16 Jan 2014 18:07:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=BFwbXN8q1b4cyGBcuTAMOZ6SWADN66CULYlZ6EA2JGI=; b=AJSi+WWaH04vR1F9qkcqM/CXSBkrT5F8F0R2e2FZqEiPVtgurdoSnVGiIzdyZQpNLm Hwpv7hPDfxvhKTpok55Wiq8TNBMUZwx8uFIRrYmSpdttKOa+qL2fxYZLmpoFaIMDXR5Q bHKuMNEJoDB1BPyPlWWGIhpMuxC74ybCBAlAjhXWE8/jibZgBNCIhtRS3Hllo/j+cb4W kk8FGvrLtroirt9APToixGY2Bxxx8psWQNzZxVRuyIW0+wy8Rehx9hvSMyX4+64s0hAu 7JjZEkelXVtFxVQE8OSJNKCfSV6Psgh9FkoarJMJqqFzH2T2h4fBVA+r645bj0J17O9m /5OQ== X-Gm-Message-State: ALoCoQlSDteteee/NqSVSOrtPfkFyOTZ7BcJep+fKBD2RcaVFYsEo3eXBfbf3UH0uMF3n4RRU0B+ X-Received: by 10.68.201.7 with SMTP id jw7mr4604776pbc.8.1389924432771; Thu, 16 Jan 2014 18:07:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.110 with SMTP id y101ls357822qgd.0.gmail; Thu, 16 Jan 2014 18:07:12 -0800 (PST) X-Received: by 10.58.226.163 with SMTP id rt3mr331725vec.34.1389924337753; Thu, 16 Jan 2014 18:05:37 -0800 (PST) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id u6si4143300vcx.22.2014.01.16.18.05.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 18:05:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id p17so1279873vbe.26 for ; Thu, 16 Jan 2014 18:05:37 -0800 (PST) X-Received: by 10.52.229.195 with SMTP id ss3mr151484vdc.45.1389924337675; Thu, 16 Jan 2014 18:05:37 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp390557ved; Thu, 16 Jan 2014 18:05:37 -0800 (PST) X-Received: by 10.68.162.66 with SMTP id xy2mr13874057pbb.46.1389924336545; Thu, 16 Jan 2014 18:05:36 -0800 (PST) Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by mx.google.com with ESMTPS id bc9si8713199pbd.131.2014.01.16.18.05.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 18:05:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.178 is neither permitted nor denied by best guess record for domain of hanjun.guo@linaro.org) client-ip=209.85.192.178; Received: by mail-pd0-f178.google.com with SMTP id y13so3368481pdi.23 for ; Thu, 16 Jan 2014 18:05:36 -0800 (PST) X-Received: by 10.68.204.161 with SMTP id kz1mr13845193pbc.156.1389924336127; Thu, 16 Jan 2014 18:05:36 -0800 (PST) Received: from localhost ([218.17.215.175]) by mx.google.com with ESMTPSA id yd4sm18393309pbc.13.2014.01.16.18.05.14 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 16 Jan 2014 18:05:35 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , Will Deacon , Russell King - ARM Linux , Daniel Lezcano Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Grant Likely , Matthew Garrett , Olof Johansson , Linus Walleij , Bjorn Helgaas , Rob Herring , Mark Rutland , Jon Masters , patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH 1/3] ACPI / idle: Move idle_boot_override out of the arch directory Date: Fri, 17 Jan 2014 10:03:25 +0800 Message-Id: <1389924207-7360-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389924207-7360-1-git-send-email-hanjun.guo@linaro.org> References: <1389924207-7360-1-git-send-email-hanjun.guo@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Move idle_boot_override out of the arch directory to be a single enum including both platforms values, this will make it rather easier to avoid ifdefs around which definitions are for which processor in generally used ACPI code. IDLE_FORCE_MWAIT for IA64 is not used anywhere, so romove it. No functional change in this patch. Suggested-by: Alan Signed-off-by: Hanjun Guo --- arch/ia64/include/asm/processor.h | 3 --- arch/powerpc/include/asm/processor.h | 1 - arch/x86/include/asm/processor.h | 3 --- arch/x86/kernel/process.c | 1 + include/linux/cpu.h | 8 ++++++++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h index 5a84b3a..ccd63a0 100644 --- a/arch/ia64/include/asm/processor.h +++ b/arch/ia64/include/asm/processor.h @@ -698,9 +698,6 @@ prefetchw (const void *x) extern unsigned long boot_option_idle_override; -enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT, - IDLE_NOMWAIT, IDLE_POLL}; - void default_idle(void); #define ia64_platform_is(x) (strcmp(x, ia64_platform_name) == 0) diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index fc14a38..06689c0 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -440,7 +440,6 @@ static inline unsigned long get_clean_sp(unsigned long sp, int is_32) #endif extern unsigned long cpuidle_disable; -enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF}; extern int powersave_nap; /* set if nap mode can be used in idle loop */ extern void power7_nap(void); diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 7b034a4..4bee51a 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -729,9 +729,6 @@ extern void init_amd_e400_c1e_mask(void); extern unsigned long boot_option_idle_override; extern bool amd_e400_c1e_detected; -enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT, - IDLE_POLL}; - extern void enable_sep_cpu(void); extern int sysenter_setup(void); diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 3fb8d95..62764ff 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 03e235ad..e324561 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -220,6 +220,14 @@ void cpu_idle(void); void cpu_idle_poll_ctrl(bool enable); +enum idle_boot_override { + IDLE_NO_OVERRIDE = 0, + IDLE_HALT, + IDLE_NOMWAIT, + IDLE_POLL, + IDLE_POWERSAVE_OFF +}; + void arch_cpu_idle(void); void arch_cpu_idle_prepare(void); void arch_cpu_idle_enter(void);