From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Fri, 19 Jun 2015 14:50:57 +0100 Subject: [PATCH v2 1/3] arm64: kernel: rename __cpu_suspend to keep it aligned with arm In-Reply-To: <5582DEFD.8070106@arm.com> References: <1434462640-19613-1-git-send-email-sudeep.holla@arm.com> <1434638494-514-1-git-send-email-sudeep.holla@arm.com> <1434638494-514-2-git-send-email-sudeep.holla@arm.com> <20150618145505.GE31480@e104818-lin.cambridge.arm.com> <5582DEFD.8070106@arm.com> Message-ID: <20150619135057.GA20798@e104818-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Jun 18, 2015 at 04:08:45PM +0100, Sudeep Holla wrote: > On 18/06/15 15:55, Catalin Marinas wrote: > >On Thu, Jun 18, 2015 at 03:41:32PM +0100, Sudeep Holla wrote: > >>This patch renames __cpu_suspend to cpu_suspend so that it's aligned > >>with ARM32. It also removes the redundant wrapper created. > >> > >>This is in preparation to implement generic PSCI system suspend using > >>the cpu_{suspend,resume} which now has the same interface on both ARM > >>and ARM64. > >> > >>Cc: Mark Rutland > >>Reviewed-by: Lorenzo Pieralisi > >>Signed-off-by: Sudeep Holla > >>--- > >> arch/arm64/include/asm/cpuidle.h | 8 ++------ > >> arch/arm64/include/asm/suspend.h | 2 +- > >> arch/arm64/kernel/cpuidle.c | 4 ++-- > >> arch/arm64/kernel/psci.c | 2 +- > >> arch/arm64/kernel/suspend.c | 6 +++--- > >> 5 files changed, 9 insertions(+), 13 deletions(-) > > > >Acked-by: Catalin Marinas > > > >Does this patch depend on the other patches from Mark and Lorenzo or it > >can be merged earlier? > > Though it's independent patch, I think it will conflict with Mark's > changes. But since all the ARM64 related changes in that series are > already in ARM64 for-next/core, it applies cleanly on it and I even gave > it a quick testing. So it can be merged earlier if you are fine with that. I queued it for 4.2 (it was something already discussed with Lorenzo previously). Thanks. -- Catalin