diff mbox

[12/62] ARM: hisi: fix building without CONFIG_HOTPLUG_CPU

Message ID 1395257399-359545-13-git-send-email-arnd@arndb.de (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann March 19, 2014, 7:29 p.m. UTC
The hisi SMP code always uses the hi3xxx_set_cpu() function
defined in the hotplug.c file, so we cannot build without
this when CONFIG_SMP is enabled. This patch slightly restructures
the code so we always build the parts of hotplug.c that we need
but just leave out the CPU disable logic if CONFIG_HOTPLUG_CPU
is turned off.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
---
 arch/arm/mach-hisi/Makefile  | 3 +--
 arch/arm/mach-hisi/hotplug.c | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Haojian Zhuang March 20, 2014, 1:49 a.m. UTC | #1
On Thu, Mar 20, 2014 at 3:29 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> The hisi SMP code always uses the hi3xxx_set_cpu() function
> defined in the hotplug.c file, so we cannot build without
> this when CONFIG_SMP is enabled. This patch slightly restructures
> the code so we always build the parts of hotplug.c that we need
> but just leave out the CPU disable logic if CONFIG_HOTPLUG_CPU
> is turned off.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> ---
>  arch/arm/mach-hisi/Makefile  | 3 +--
>  arch/arm/mach-hisi/hotplug.c | 2 ++
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-hisi/Makefile b/arch/arm/mach-hisi/Makefile
> index 6870058..2ae1b59 100644
> --- a/arch/arm/mach-hisi/Makefile
> +++ b/arch/arm/mach-hisi/Makefile
> @@ -3,5 +3,4 @@
>  #
>
>  obj-y  += hisilicon.o
> -obj-$(CONFIG_SMP)              += platsmp.o
> -obj-$(CONFIG_HOTPLUG_CPU)      += hotplug.o
> +obj-$(CONFIG_SMP)              += platsmp.o hotplug.o
> diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
> index b909854..abd441b 100644
> --- a/arch/arm/mach-hisi/hotplug.c
> +++ b/arch/arm/mach-hisi/hotplug.c
> @@ -178,6 +178,7 @@ static inline void cpu_enter_lowpower(void)
>           : "cc");
>  }
>
> +#ifdef CONFIG_HOTPLUG_CPU
>  void hi3xxx_cpu_die(unsigned int cpu)
>  {
>         cpu_enter_lowpower();
> @@ -198,3 +199,4 @@ int hi3xxx_cpu_kill(unsigned int cpu)
>         hi3xxx_set_cpu(cpu, false);
>         return 1;
>  }
> +#endif
> --
> 1.8.3.2
>

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
diff mbox

Patch

diff --git a/arch/arm/mach-hisi/Makefile b/arch/arm/mach-hisi/Makefile
index 6870058..2ae1b59 100644
--- a/arch/arm/mach-hisi/Makefile
+++ b/arch/arm/mach-hisi/Makefile
@@ -3,5 +3,4 @@ 
 #
 
 obj-y	+= hisilicon.o
-obj-$(CONFIG_SMP)		+= platsmp.o
-obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
+obj-$(CONFIG_SMP)		+= platsmp.o hotplug.o
diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
index b909854..abd441b 100644
--- a/arch/arm/mach-hisi/hotplug.c
+++ b/arch/arm/mach-hisi/hotplug.c
@@ -178,6 +178,7 @@  static inline void cpu_enter_lowpower(void)
 	  : "cc");
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 void hi3xxx_cpu_die(unsigned int cpu)
 {
 	cpu_enter_lowpower();
@@ -198,3 +199,4 @@  int hi3xxx_cpu_kill(unsigned int cpu)
 	hi3xxx_set_cpu(cpu, false);
 	return 1;
 }
+#endif