From patchwork Thu Jan 12 19:44:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13098783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A52D2C678D8 for ; Thu, 12 Jan 2023 19:58:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EACF080017; Thu, 12 Jan 2023 14:57:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D9BFC8001D; Thu, 12 Jan 2023 14:57:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E19A80017; Thu, 12 Jan 2023 14:57:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 450F58001B for ; Thu, 12 Jan 2023 14:57:43 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 09F34140E12 for ; Thu, 12 Jan 2023 19:57:43 +0000 (UTC) X-FDA: 80347207206.09.DA8BE23 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id B04ADA0011 for ; Thu, 12 Jan 2023 19:57:40 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ATlfmILW; spf=none (imf15.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673553461; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=53PdPXBrlefs7aSWYtbVMctVqERBXlbNfkzlUyuHUdw=; b=ZgC0BHTLMfQiL2PtNEolPqMAxXSwc3us0Es1uVYOCususw8Bp9bWJRjyHUmzATGnvrTlVg MwcnDPoet+YXP7JTJ57AqOh62BvGCjOwDcoS4SCiSeJjxoEu34lUsj3GHgH6tPlPOVaV/1 /0QIuyR30G7HfuENtofofi/jpugi434= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ATlfmILW; spf=none (imf15.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673553461; a=rsa-sha256; cv=none; b=o3vpQoBZEb0lnxqwaF+W97uRK06gQs1kSCXF+y7lZrB0IFl2akktvKvvlrkJ1fLwa5moyN 4aoZmuxTnhsIFPjc+JcvtgSFuRVT3AJFxrWJo171I2jEuU0MlTLg2zzealDVGjgr6JlRvZ rF2QpxbQnbiHZ/8CK/0VL1q/sfUCrWE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=53PdPXBrlefs7aSWYtbVMctVqERBXlbNfkzlUyuHUdw=; b=ATlfmILWtdBMS162SLdQ7satXH lRrHA+Oo8xPovKk8FQq7RK98sDcnma5GRSfOFtLwNMoVkAXDXisud5eoVVLDZihpqE49vRJxWIbw2 /Y9OujIMxZk1pbjWaqUFjWo75kJhYQD0AKKQKJ+8CiSaiG3IgyCVvD8TMNqCScPpUugqNp41+I7do 5xU2L9cP7LTkQIolwptF5b7/KAQ9UdyvdXN5gS5y15We2Sa4zjrnXtrvDhbcZWdaP3QN6BMMn3InU Lq/+IhZFycZWB1LH1o2Fy8Qq8PGKdb6bDkxa8FbpQ30yPWc9p7g6EIAFIzA6F77JVZkL+nzT6pZrb 3DJjl/xg==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pG3hu-005P7G-BC; Thu, 12 Jan 2023 19:57:50 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 41FAD303481; Thu, 12 Jan 2023 20:57:14 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 767D32CD066F4; Thu, 12 Jan 2023 20:57:08 +0100 (CET) Message-ID: <20230112195542.335211484@infradead.org> User-Agent: quilt/0.66 Date: Thu, 12 Jan 2023 20:44:03 +0100 From: Peter Zijlstra To: peterz@infradead.org Cc: richard.henderson@linaro.org, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, linux@armlinux.org.uk, nsekhar@ti.com, brgl@bgdev.pl, ulli.kroll@googlemail.com, linus.walleij@linaro.org, shawnguo@kernel.org, Sascha Hauer , kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, tony@atomide.com, khilman@kernel.org, krzysztof.kozlowski@linaro.org, alim.akhtar@samsung.com, catalin.marinas@arm.com, will@kernel.org, guoren@kernel.org, bcain@quicinc.com, chenhuacai@kernel.org, kernel@xen0n.name, geert@linux-m68k.org, sammy@sammy.net, monstr@monstr.eu, tsbogend@alpha.franken.de, dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, shorne@gmail.com, James.Bottomley@HansenPartnership.com, deller@gmx.de, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, ysato@users.sourceforge.jp, dalias@libc.org, davem@davemloft.net, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, jgross@suse.com, srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, boris.ostrovsky@oracle.com, chris@zankel.net, jcmvbkbc@gmail.com, rafael@kernel.org, lenb@kernel.org, pavel@ucw.cz, gregkh@linuxfoundation.org, mturquette@baylibre.com, sboyd@kernel.org, daniel.lezcano@linaro.org, lpieralisi@kernel.org, sudeep.holla@arm.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, anup@brainfault.org, thierry.reding@gmail.com, jonathanh@nvidia.com, jacob.jun.pan@linux.intel.com, atishp@atishpatra.org, Arnd Bergmann , yury.norov@gmail.com, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, dennis@kernel.org, tj@kernel.org, cl@linux.com, rostedt@goodmis.org, mhiramat@kernel.org, frederic@kernel.org, paulmck@kernel.org, pmladek@suse.com, senozhatsky@chromium.org, john.ogness@linutronix.de, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, Andrew Morton , jpoimboe@kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-xtensa@linux-xtensa.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, kasan-dev@googlegroups.com Subject: [PATCH v3 49/51] cpuidle,arch: Mark all regular cpuidle_state::enter methods __cpuidle References: <20230112194314.845371875@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: B04ADA0011 X-Stat-Signature: swfs97qa4r7186qjm3ja6c164r49satw X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1673553460-929535 X-HE-Meta: U2FsdGVkX1+/cGn9JC1fzXqAVLEV1cQmDakHyDjGR3sVzPRi7c5Qpww/7MyRGvLatmrrtPOgSzVj3Nl4AkdSJtFfQ9v5MS5hjpUF1XMXnV57RVTxhdRTe6HOCMdM2pTiwKdP5S3fJHFp56I3lP7uy0BYYT9ZizL1oa5kA866a/2ZumRYMn3YzvKLsOByCaT2YSUM8JrX+Bl7UnQZHazuOuuApdE0k1bFUzUL0cy5+GGBblYju3svslUFk44ZtbLLmC9Lh5D7ND9+Qc+ioUmQjSjbihzMWV1MOkHWXG0g+UKDPEAhwYlmUunc3gT/yYQ+iu5j5T5NdXlZJUNPUZpuH/Er77B/nJW70fP03KpbmtAF47Ov5CBRm2VLeLKjDqNmm+8/C1v4ImUkuTcGPwITIFzSbldzTXv+6jHccJ0siH+RwB9aYiOIl1SMNZpT3IKnGEjm26S+fsh1FnS+x0Le4AUta4uteQbKgcWHX0LImuyqdfxJPC3kLlmTZ4yht5s7HlPVAZelaFbbO8w2yzxOG9DgGboPOmR7seGWTVzYNEow+2LfG2m/3rFfX52HxNiLRw0+jQsla75R9RT67nx/wmGpWZK5H/hB/8518yynVTcJqKlT61j/jNx8zM/JRuwALUPhL/OWVZZEeHJiD7xTISxmhN05SntEhMU05JQeqkKLu8lFWNaDa7C7o0uNFSLSic4o+jcr6RW+8xB3TCISCKuJaCxGfOoiz1ArVzSHkBUFPDf8InHJ/4Va09b7PvAxUap/cgucXIfSOUm0VQ3q4goe3Ll/IOykOILrxPzIUwbj9yUrSoP5UtICVMFID+MrbbN61RAOB9P5masZiAuZbZ+LDtn8DajnQkzKm+0UWRqJuAubafWqwf/BhTAu/se3/7BJ6ON2rf/r1pSK+eKjBe43Awl0KM8TrWziXpY0KDY8dMQ4rg3lxJNOl7pbMew7uf6u2XL7lQFM2pNbUwm IpgKr6k1 ivrKPwxXq1JzSy26yr2fBNLUiSwUhGsUtDBGVl9JVg7zYzrhEGg9KrUpiy8o5vIxvjiJAce3VQPcd0mFlgQrwRWP4bAtArKyv77q/2oB4hAfYyBwB9RQLAZasPwmTeHIDOocxaCyhig+v/NbyfvCT/Gxk2zbyaTykiiqrIPyYjq8+RnITKZMfjeogGVulkpULnUMhjb/bvx08PxEXdVP/hHvc8FF/puQ5i4GKx0tH543JsYdZ5/rbRtJ5lkGTedAGNakGaVhhOmc6TUr8L/+nQ1ZOzqDrmnm08lkGjyFL19ENtlpP0QgAMRKmE9b+OZ5NR3bvMari8/gnZ30ykK9fJgrwtpMnX5Hz64CGkevFNz5buZDwPh5YjGArANaL1xlxelADcR31sv4QDN40FErg5JvAVBxG1nX2CthE9yBBKF5TWsk+im5x++T4i7PioXRgNAvKhoP0C8C4zgROUpFhQ+5wXPinI0bz0mewr9I2yQkKX77UukupACYXQjoTTimEhqco93h9M6DcBtQ6rKKR8vuST4ud09F7nriSqf7oJNT7dCQ62orZV+TvpBYPSN+g/uKrjcs75hlkBJzErMPQsRnzcrE3wPi9Ynr+m2ObmwnYa6L+QGTeh/r4WuqOpMNJvaghut1WC6imDcQDeRpkhTQnyey4JAVl2blOBmmFdWFI0qKSFmbp3HtO+Jd+LJXoW+Papq7thbh2WhhvsdKRqMTkYKf8d0yIYtjeUTvVCrLXWLcGGf5rMa3Lr8XAm8Pqao7WMzUVxUahGnooS1bidbEKJ1wCrKLSFTn8wYaoy/6YHtVXgWDQ06uUH4QUTBKDuaQXtiuwil+fcNj53tjOge8OXmGqP4mVHdVvcAYXYwQa2uul0CFZZKgDkH0Ch1Oppug8J9mNI3KuArW1BAnu+7T2Eic/AgnZoQISL32aXUR75nRp45A6rYQp+Xntb/Q5qL99+DiRMWvy9tUWiVg5KoEnV7/y vz1J6ysp gHFwVhNvqyjvBXun49RLXNAIi01omMNUxqJyhTu49uCbyWowzjUaUwD0p8yKzfpb/AaW18mgfNNLnizAncuy2LTkOsvjVznreF7nH0cSkK+qkt9efSxg1nBZhm57nqSQ9/EoaycRPEoAkb8ErFyVhIE7xqXsXwis36tD8aZOXTuRNrih0gYk9kTTzZSkgcL/TkW/ogGkK8W4IIsrQaPXJDuipz3OSV8RoaFDvtrIniPuE0vkkW0m6ynv4EE2Ij3Yzer1xd2ImIy/6jtoW8maKRMPYxq/J7khDVVydYM+GidQ+u4ZKbQeQJWaV4l7lhvumFqlYCTkFpK8sXCSYy95m3K6nG8ZhJlKfQKeJtWjb1if5D7+80oqTTz2I49pt2GongDpT8NGgraj/IaXcktDO/7h70AVwzrV4oLUKd+GyqkOFKtgxmyP+T4hGk5+K4LHCyFn3ZMcpzW8BM8hew9E9N5wsiejfwaTXyAP7MUfUT+lR4XT97tNJ8TTNBib1gfF0lgaTrHN+RnfLM0CEQDosJvnVlYZs5aL0Aemp1QcwqtBOw2drXRt56MTWvIJeavCQ9K6AzR/c0/LTfFcLzDbGPPpc5FFkHiuhFo7avtnKzDvzsCBPyuYkcQViIYnAdq9dz4bFligqPwI1hZxoDQ+KNSHsKFLgvTx0U8YkJnEV8OsxUOQVvwG3GpcKTdzFNIQRtfzqvZdNmPj+ogDEwpj5Ol3BsHfdKRxxd/UZA55wUJC4nmX1TmusYFdUGHZY6c3rAcj26DjvsOkpNP2zfA0+gn3PUvT7Tj4gJ0MR2hj/BE182dRaYMUsutOEaRUDe+M/vyiqoT1DjUUAbo80XzaoVPh6M/mjvljCkXYkHj7PCBKqOHQwGFiDhO+OCKYS9gqKeAI/mXDtEDJFahSBaDMAiEOT85duGmeKztaO+Co4Ptnozw19EcAdACudKijUVD3YnkoXZRvyT/c0FBekCka1jycK2I8z Gi8Cv+pG ecbXu/yTH6hfh7G3OMdgptcVFnQpKAJ+mXNCJR7nkxCK3SE7XDNCtAinCjNEX1Noa6VfXoeMmuQFOfXsdkm/OwERbsGSvqzAYNLri6LVz0wP/8UUa8huZdUuALSrSl0hBpD/xXgF6lK73D9FkJbxN+U984YIBDSm9E4Q6lMSpx73YyZ0WMEbMRYkyCduEjTTSVOBe4dGLKcqtpPwAhmFLt2Y6ernOdCilRzeaOysMgEPwx6/N8c7NSNNFBH6MVFllEE408UREDdjDFbyX3yiBcdl6Es840CeoT6+odeU9e3og2EGUflPdineDPZZt+c0RmtSUwerPk6U7Gw4XowcxDoZfZHtX9K5+jJ0BerCLgDr27lBZXkxrdKAwiGOMZP/8Gcr0kHZao2/3+8dihy0qE2Dk0WRWYPmdq2dcIsYujH8wbgMZ3XFcuRuBoYr4Q2JjcS33UNfkWUTTHG2NFXNrLxazdajWJj4iyouNqQfupzMq9Z7gama964c+3Xb7pV7GpOX3wBGuNRTX96JT5YMCEALVr5cERzKlZYza1xS7BMmoC2aJvCTD3gnATBqUY5zmqEgIAtW8yn2aSfsAPQ5eW2fqgDgNMzJaCiBJUvSqWFr7T4L0PsofSMI+lFHjq/YggfTE9zFtvs8O36QrJMNfER6P4z7MViH1wLn6CBYW0cdRoYrZGRqWhte+41DTVQN+zX3YgPyjeRzg4mMdEiBsTR9sZnNEq26XkUMxhEakWn/WKXfAsQtbuwQ4SpfzXv6AzIFMKY8zvw+wfi2MzliAdMVy0mRShh49RSwgQzbzBZVaYXR4BR9UTi4RXiPXGn7jcRUIp0kPeTLCN0FJrOssa/+Ww2UX0gQvUesNgxTgnZwBHu2TCTcLdhPqrP+a/nKt2Mf24qqOCsjVdBnFwQ1YLIa88nyd77cRw07Mj2D06xAOFdOaHv4IroftKN9NzqoghU+JMqfNIjEy66VJt02CT1uaKuGy wwhhv/MV 8jqnA7UVqqcKnf2G1cRi9nOkABaTevq41ufkmNqLZm2kYbLtcRTv/kkDoKb/AP7uyZSzPjHK7qCq+ErDp9r3KmKU3fKJL5OQGzBhrpg1m08CjDKY2LnSZDD1R0ncRKvlMWMlZu+89oyzlGZQXGk/Co X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: For all cpuidle drivers that do not use CPUIDLE_FLAG_RCU_IDLE (iow, the simple ones) make sure all the functions are marked __cpuidle. ( due to lack of noinstr validation on these platforms it is entirely possible this isn't complete ) Signed-off-by: Peter Zijlstra (Intel) --- arch/arm/kernel/cpuidle.c | 4 ++-- arch/arm/mach-davinci/cpuidle.c | 4 ++-- arch/arm/mach-imx/cpuidle-imx5.c | 4 ++-- arch/arm/mach-imx/cpuidle-imx6sl.c | 4 ++-- arch/arm/mach-imx/cpuidle-imx7ulp.c | 4 ++-- arch/arm/mach-s3c/cpuidle-s3c64xx.c | 5 ++--- arch/mips/kernel/idle.c | 6 +++--- 7 files changed, 15 insertions(+), 16 deletions(-) --- a/arch/arm/kernel/cpuidle.c +++ b/arch/arm/kernel/cpuidle.c @@ -26,8 +26,8 @@ static struct cpuidle_ops cpuidle_ops[NR * * Returns the index passed as parameter */ -int arm_cpuidle_simple_enter(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +__cpuidle int arm_cpuidle_simple_enter(struct cpuidle_device *dev, struct + cpuidle_driver *drv, int index) { cpu_do_idle(); --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -44,8 +44,8 @@ static void davinci_save_ddr_power(int e } /* Actual code that puts the SoC in different idle states */ -static int davinci_enter_idle(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +static __cpuidle int davinci_enter_idle(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { davinci_save_ddr_power(1, ddr2_pdown); cpu_do_idle(); --- a/arch/arm/mach-imx/cpuidle-imx5.c +++ b/arch/arm/mach-imx/cpuidle-imx5.c @@ -8,8 +8,8 @@ #include #include "cpuidle.h" -static int imx5_cpuidle_enter(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +static __cpuidle int imx5_cpuidle_enter(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { arm_pm_idle(); return index; --- a/arch/arm/mach-imx/cpuidle-imx6sl.c +++ b/arch/arm/mach-imx/cpuidle-imx6sl.c @@ -11,8 +11,8 @@ #include "common.h" #include "cpuidle.h" -static int imx6sl_enter_wait(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +static __cpuidle int imx6sl_enter_wait(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { imx6_set_lpm(WAIT_UNCLOCKED); /* --- a/arch/arm/mach-imx/cpuidle-imx7ulp.c +++ b/arch/arm/mach-imx/cpuidle-imx7ulp.c @@ -12,8 +12,8 @@ #include "common.h" #include "cpuidle.h" -static int imx7ulp_enter_wait(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +static __cpuidle int imx7ulp_enter_wait(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { if (index == 1) imx7ulp_set_lpm(ULP_PM_WAIT); --- a/arch/arm/mach-s3c/cpuidle-s3c64xx.c +++ b/arch/arm/mach-s3c/cpuidle-s3c64xx.c @@ -19,9 +19,8 @@ #include "regs-sys-s3c64xx.h" #include "regs-syscon-power-s3c64xx.h" -static int s3c64xx_enter_idle(struct cpuidle_device *dev, - struct cpuidle_driver *drv, - int index) +static __cpuidle int s3c64xx_enter_idle(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { unsigned long tmp; --- a/arch/mips/kernel/idle.c +++ b/arch/mips/kernel/idle.c @@ -241,7 +241,7 @@ void __init check_wait(void) } } -void arch_cpu_idle(void) +__cpuidle void arch_cpu_idle(void) { if (cpu_wait) cpu_wait(); @@ -249,8 +249,8 @@ void arch_cpu_idle(void) #ifdef CONFIG_CPU_IDLE -int mips_cpuidle_wait_enter(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +__cpuidle int mips_cpuidle_wait_enter(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { arch_cpu_idle(); return index;