diff options
| author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-06-16 16:07:57 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:36 -0600 |
| commit | 04b843355bbc2cc399e12965097dd3d9d382df25 (patch) | |
| tree | cfed33a4f1f49f05015cca87d118b52b9845e882 /arch/arm/mach-ux500/include/mach | |
| parent | e15be2e10938992aca59a137d7620d364d480971 (diff) | |
use mainline version of mach/smp.h
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: Icd146ae0e0dde8f9b43e85c55af31147aad4beb9
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2417
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/include/mach')
| -rwxr-xr-x | arch/arm/mach-ux500/include/mach/smp.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/arch/arm/mach-ux500/include/mach/smp.h b/arch/arm/mach-ux500/include/mach/smp.h index 66bea66f309..b59f7bc9725 100755 --- a/arch/arm/mach-ux500/include/mach/smp.h +++ b/arch/arm/mach-ux500/include/mach/smp.h @@ -1,18 +1,20 @@ /* - * Copyright (C) 2009 ST-Ericsson SA + * This file is based ARM realview platform. + * Copyright (C) ARM Limited. * - * 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 Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. */ #ifndef ASMARM_ARCH_SMP_H #define ASMARM_ARCH_SMP_H - #include <asm/hardware/gic.h> -#define hard_smp_processor_id() \ +/* This is required to wakeup the secondary core */ +extern void u8500_secondary_startup(void); + +#define hard_smp_processor_id() \ ({ \ unsigned int cpunum; \ __asm__("mrc p15, 0, %0, c0, c0, 5" \ @@ -27,12 +29,4 @@ static inline void smp_cross_call(const struct cpumask *mask) { gic_raise_softirq(mask, 1); } - -/* - * Do nothing on MPcore. - */ -static inline void smp_cross_call_done(const struct cpumask *mask) -{ -} - #endif |