From patchwork Sat Jul 25 15:01:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 6865161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C5E35C05AC for ; Sat, 25 Jul 2015 15:05:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C20D720660 for ; Sat, 25 Jul 2015 15:05:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A7E052063B for ; Sat, 25 Jul 2015 15:05:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZJ0yS-0005TL-18; Sat, 25 Jul 2015 15:02:52 +0000 Received: from pandora.arm.linux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZJ0y5-0005HJ-VZ for linux-arm-kernel@lists.infradead.org; Sat, 25 Jul 2015 15:02:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=pandora-2014; h=Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=60U8g5v4R3muPFJq7wzn65BfU7X4eJwWt6sr+ku3DYk=; b=bhzHBy+6K5xnOGJXIVzU6IaDPz6S2Q+urBINvvsXRRDRoyUIIE2DZmVuQsV67XPd82qNMxdqOMu7d4PeWHo+khY3N//SI0ZuUysIZORSxswLbxCjhaTQ0oHKc/H8nvI+UTvvayqoTHmLQ4mHbCQULyCqkjjHOxZWj7fXdLa6MCY=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:49442) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1ZJ0xR-00076E-Ra; Sat, 25 Jul 2015 16:01:50 +0100 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1ZJ0xO-0000SF-OK; Sat, 25 Jul 2015 16:01:46 +0100 Date: Sat, 25 Jul 2015 16:01:46 +0100 From: Russell King - ARM Linux To: Stephen Boyd Subject: Re: [PATCH v5] ARM: smp: Only expose /sys/.../cpuX/online if hotpluggable Message-ID: <20150725150146.GA7557@n2100.arm.linux.org.uk> References: <1428705191-15670-1-git-send-email-sboyd@codeaurora.org> <20150413134246.GS12732@n2100.arm.linux.org.uk> <557739AC.8000903@codeaurora.org> <20150610225744.GT7557@n2100.arm.linux.org.uk> <5578C427.1070100@codeaurora.org> <55A971C1.8090308@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <55A971C1.8090308@codeaurora.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150725_080231_124956_3404A57F X-CRM114-Status: GOOD ( 18.82 ) X-Spam-Score: -3.2 (---) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Nicolas Pitre , Tyler Baker , linux-sh@vger.kernel.org, Magnus Damm , linux-kernel@vger.kernel.org, Simon Horman , Geert Uytterhoeven , Dave Martin , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 On Fri, Jul 17, 2015 at 02:21:05PM -0700, Stephen Boyd wrote: > On 06/10/2015 04:11 PM, Stephen Boyd wrote: > >On 06/10/2015 03:57 PM, Russell King - ARM Linux wrote: > >>diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h > >>index 476092b86c6e..f2c4bf437ea7 100644 > >>--- a/arch/arm/mach-shmobile/common.h > >>+++ b/arch/arm/mach-shmobile/common.h > >>@@ -13,7 +13,8 @@ extern void shmobile_smp_boot(void); > >> extern void shmobile_smp_sleep(void); > >> extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, > >> unsigned long arg); > >>-extern int shmobile_smp_cpu_disable(unsigned int cpu); > >>+extern bool shmobile_smp_cpu_can_disable(unsigned int cpu); > >>+extern void shmobile_invalidate_start(void); > >> > >>which your original patch did not include. The tree I'm applying to > >>(-rc1) contains: > >> > >>extern int shmobile_smp_cpu_disable(unsigned int cpu); > >>extern void shmobile_invalidate_start(void); > >> > >>there. Hence git quite rightfully declines to apply the patch. > >> > >Thanks. Fixed. > > > > Sorry I just noticed that you applied 8392/1 instead of 8392/2 from the > patch tracker. So shmobile_invalidate_start() came back. Stephen, 8392/2 does _not_ apply: $ pdb gitapply 8392/2 Patching 8392/2... git apply --whitespace=fix -p1 --index --check > /tmp/pdb.521 2>&1 exited with non-zero status: 256 error: patch failed: arch/arm/mach-shmobile/common.h:13 error: arch/arm/mach-shmobile/common.h: patch does not apply However, 8392/1 does: $ pdb gitapply 8392/1 Patching 8392/1... Checking in... [misc e28678d7b83a] ARM: 8392/1: smp: Only expose /sys/.../cpuX/online if hotpluggable Author: Stephen Boyd 10 files changed, 36 insertions(+), 16 deletions(-) This is because your patch 8392/2 has this hunk: which states that shmobile_invalidate_start() must exist in the original code. In v4.2-rc1 and later kernels, there is no such line - here is v4.2-rc1 and later contains from line 13 onwards: extern void shmobile_smp_sleep(void); extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, unsigned long arg); extern int shmobile_smp_cpu_disable(unsigned int cpu); extern void shmobile_boot_scu(void); extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus); extern void shmobile_smp_scu_cpu_die(unsigned int cpu); The difference between your two patches is relatively minor: 8392/1 _adds_ shmobile_invalidate_start() 8392/2 _requires_ that shmobile_invalidate_start() exist If you wish me to apply a patch which _neither_ requires _nor_ adds the shmobile_invalidate_start() prototype, maybe you should send me a patch to that effect? > I thought it would automatically supersede the previous patch but it > looks like it just sticks around? It doesn't, because the /n thing was supposed to be for related patches rather than automatic superseding of previous patches. diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h index afc60bad6fd6..f2c4bf437ea7 100644 --- a/arch/arm/mach-shmobile/common.h +++ b/arch/arm/mach-shmobile/common.h @@ -13,7 +13,7 @@ extern void shmobile_smp_boot(void); extern void shmobile_smp_sleep(void); extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, unsigned long arg); -extern int shmobile_smp_cpu_disable(unsigned int cpu); +extern bool shmobile_smp_cpu_can_disable(unsigned int cpu); extern void shmobile_invalidate_start(void); extern void shmobile_boot_scu(void); extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus);