From 3ef832b543a3daede0e8a7d51ca45e5fd6b00db0 Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Tue, 7 Feb 2006 10:58:21 +1100 Subject: [PATCH] --- yaml --- r: 20079 b: refs/heads/master c: 4dc43256931db60d02d76bacf3cf03b5d79aa33a h: refs/heads/master i: 20077: 6fc60dbedb30193188adb9fdb4fb749c61b1fbe9 20075: 75ebd5343862a280f87ba1c6621e8d6df0d69b8e 20071: 4f835faf1b3b1669079a1ad83aa3b4f62086f862 20063: 7a88737e3476648af068501a082c104715c5fc78 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 93f1307e0767..9638f66d72e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d4b95ae8e946e5754122220644c865ec3735428 +refs/heads/master: 4dc43256931db60d02d76bacf3cf03b5d79aa33a diff --git a/trunk/arch/powerpc/platforms/pseries/setup.c b/trunk/arch/powerpc/platforms/pseries/setup.c index da6cebaf72cd..9edeca83f434 100644 --- a/trunk/arch/powerpc/platforms/pseries/setup.c +++ b/trunk/arch/powerpc/platforms/pseries/setup.c @@ -585,7 +585,7 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus) static void pseries_kexec_cpu_down(int crash_shutdown, int secondary) { /* Don't risk a hypervisor call if we're crashing */ - if (!crash_shutdown) { + if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) { unsigned long vpa = __pa(get_lppaca()); if (unregister_vpa(hard_smp_processor_id(), vpa)) {