From: Mark Rutland <mark.rutland@arm.com>
Date: Thu, 24 Oct 2013 19:30:14 +0000 (+0100)
Subject: arm64: unify smp_psci.c and psci.c
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~54^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ef54bb97389bfe8894272f48496f4191aae946;p=pandora-kernel.git

arm64: unify smp_psci.c and psci.c

The functions in psci.c are only used from smp_psci.c, and smp_psci
cannot function without psci.c. Additionally psci.c is built when !SMP,
where it's expected that cpu_suspend may be useful.

This patch unifies the two files, removing pointless duplication and
paving the way for PSCI support in UP systems.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

Reading git-diff-tree failed