ARM: trusted_foundations: fix compile error on non-SMP
authorAlexandre Courbot <acourbot@nvidia.com>
Fri, 23 May 2014 00:23:32 +0000 (09:23 +0900)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 19:28:11 +0000 (21:28 +0200)
The setup_max_cpus variable is only defined if CONFIG_SMP is set. Add
a preprocessor condition to avoid the following compilation error if
CONFIG_SMP is not set:

    arch/arm/include/asm/trusted_foundations.h: In function 'register_trusted_foundations':
    arch/arm/include/asm/trusted_foundations.h:57:2: error: 'setup_max_cpus' undeclared (first use in this function)

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/include/asm/trusted_foundations.h

index b5f7705abcb024bb21c41ce34c6f7e95ddfb9bb8..624e1d436c6ce8d387bef77963c1315bc702a938 100644 (file)
@@ -54,7 +54,9 @@ static inline void register_trusted_foundations(
         */
        pr_err("No support for Trusted Foundations, continuing in degraded mode.\n");
        pr_err("Secondary processors as well as CPU PM will be disabled.\n");
+#if IS_ENABLED(CONFIG_SMP)
        setup_max_cpus = 0;
+#endif
        cpu_idle_poll_ctrl(true);
 }