diff options
author | Laurentiu TUDOR <Laurentiu.Tudor@freescale.com> | 2011-07-07 16:44:30 +0300 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2011-07-08 00:21:33 -0500 |
commit | 2647aa19fb36326ae4d2642072e1e072d176a2fc (patch) | |
tree | f561019f3f68438740b254ccc31ba2d50c389880 /arch | |
parent | 3fce1c0ba2b35b68135d8d8a3438f8c8272a01d8 (diff) | |
download | linux-stable-2647aa19fb36326ae4d2642072e1e072d176a2fc.tar.gz linux-stable-2647aa19fb36326ae4d2642072e1e072d176a2fc.tar.bz2 linux-stable-2647aa19fb36326ae4d2642072e1e072d176a2fc.zip |
powerpc/85xx: Remove stale BUG_ON in mpc85xx_smp_init
Under the FSL Hypervisor we triggered a BUG_ON in mpc85xx_smp_init that
expected smp_ops.message_pass to be explicity set. However recent
changes allows smp_ops.message_pass to be NULL and handled by default
code. Thus the BUG_ON isn't relevant anymore.
Signed-off-by: Laurentiu TUDOR <Laurentiu.Tudor@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/85xx/smp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index f5aa6190bba2..5b9b901f6443 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -2,7 +2,7 @@ * Author: Andy Fleming <afleming@freescale.com> * Kumar Gala <galak@kernel.crashing.org> * - * Copyright 2006-2008 Freescale Semiconductor Inc. + * Copyright 2006-2008, 2011 Freescale Semiconductor Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -239,12 +239,13 @@ void __init mpc85xx_smp_init(void) } if (cpu_has_feature(CPU_FTR_DBELL)) { - /* .message_pass defaults to smp_muxed_ipi_message_pass */ + /* + * If left NULL, .message_pass defaults to + * smp_muxed_ipi_message_pass + */ smp_85xx_ops.cause_ipi = doorbell_cause_ipi; } - BUG_ON(!smp_85xx_ops.message_pass); - smp_ops = &smp_85xx_ops; #ifdef CONFIG_KEXEC |