diff options
Diffstat (limited to 'usr/src/uts/sun4u/os/mach_mp_startup.c')
| -rw-r--r-- | usr/src/uts/sun4u/os/mach_mp_startup.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr/src/uts/sun4u/os/mach_mp_startup.c b/usr/src/uts/sun4u/os/mach_mp_startup.c index ad0b76e1c6..243e56a3ac 100644 --- a/usr/src/uts/sun4u/os/mach_mp_startup.c +++ b/usr/src/uts/sun4u/os/mach_mp_startup.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -154,7 +153,7 @@ int mp_cpu_configure(int cpuid) { extern void fill_cpu_ddi(dev_info_t *); - extern void setup_cpu_common(int); + extern int setup_cpu_common(int); struct mp_find_cpu_arg target; ASSERT(MUTEX_HELD(&cpu_lock)); @@ -172,7 +171,11 @@ mp_cpu_configure(int cpuid) */ fill_cpu_ddi(target.dip); - setup_cpu_common(cpuid); + /* + * sun4v cpu setup may fail. sun4u assumes cpu setup to + * be always successful, so the return value is ignored. + */ + (void) setup_cpu_common(cpuid); return (0); } |