diff options
| author | David Brown <davidb@codeaurora.org> | 2012-09-13 01:01:40 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 09:16:25 +0200 |
| commit | be2109e13fc6f017040c57615acfe1065723687b (patch) | |
| tree | b1a02e90548981af9c85b635b106c20632d01552 /arch/arm | |
| parent | Merge branch 'multiplatform/smp_ops' into next/multiplatform (diff) | |
| download | linux-be2109e13fc6f017040c57615acfe1065723687b.tar.xz linux-be2109e13fc6f017040c57615acfe1065723687b.zip | |
ARM: msm: Move core.h contents into common.h
No real need to have a separate core.h from the common.h file. Fold
these two prototypes into the common header file.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-msm/board-dt-8660.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/board-dt-8960.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/common.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-msm/hotplug.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-msm/platsmp.c | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c index e5643f629dcd..b5b4de2cdf9e 100644 --- a/arch/arm/mach-msm/board-dt-8660.c +++ b/arch/arm/mach-msm/board-dt-8660.c @@ -20,7 +20,6 @@ #include <mach/board.h> #include "common.h" -#include "core.h" static const struct of_device_id msm_dt_gic_match[] __initconst = { { .compatible = "qcom,msm-8660-qgic", .data = gic_of_init }, diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c index 139d61bbc8e7..4490edb71c17 100644 --- a/arch/arm/mach-msm/board-dt-8960.c +++ b/arch/arm/mach-msm/board-dt-8960.c @@ -18,7 +18,6 @@ #include <asm/mach/arch.h> #include "common.h" -#include "core.h" static const struct of_device_id msm_dt_gic_match[] __initconst = { { .compatible = "qcom,msm-qgic2", .data = gic_of_init }, diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h index d68e5d7854f5..633a7159d5ff 100644 --- a/arch/arm/mach-msm/common.h +++ b/arch/arm/mach-msm/common.h @@ -26,5 +26,7 @@ extern void msm_map_qsd8x50_io(void); extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, unsigned int mtype, void *caller); +extern struct smp_operations msm_smp_ops; +extern void msm_cpu_die(unsigned int cpu); #endif diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c index 002ac1e47235..750446feb444 100644 --- a/arch/arm/mach-msm/hotplug.c +++ b/arch/arm/mach-msm/hotplug.c @@ -13,7 +13,7 @@ #include <asm/cacheflush.h> #include <asm/smp_plat.h> -#include "core.h" +#include "common.h" static inline void cpu_enter_lowpower(void) { diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c index 637021c0d8af..7ed69b69c87c 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c @@ -23,7 +23,7 @@ #include <asm/smp_plat.h> #include "scm-boot.h" -#include "core.h" +#include "common.h" #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0 #define SCSS_CPU1CORE_RESET 0xD80 |