Skip to content

Commit

Permalink
powerpc/85xx: Remove stale BUG_ON in mpc85xx_smp_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurentiu TUDOR authored and Kumar Gala committed Jul 8, 2011
1 parent 3fce1c0 commit 2647aa1
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/powerpc/platforms/85xx/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2647aa1

Please sign in to comment.