ARM: tegra: Fix build issue for no-SMP
Alex Waterman [Tue, 10 Jul 2012 00:23:50 +0000 (17:23 -0700)]
Fix issues causing the kernel build to fail with CONFIG_SMP not set.

Change-Id: I8c7a49970e55354e38ce41d2d1e0dab00ba78f24
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/114317
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>

arch/arm/mach-tegra/board-enterprise-power.c
arch/arm/mach-tegra/timer-t3.c

index ca39bae..eb9f1d5 100644 (file)
@@ -846,9 +846,9 @@ static struct platform_device enterprise_bpc_mgmt_device = {
 
 void __init enterprise_bpc_mgmt_init(void)
 {
+#ifdef CONFIG_SMP
        int int_gpio = TEGRA_GPIO_TO_IRQ(TEGRA_BPC_TRIGGER);
 
-#ifdef CONFIG_SMP
        cpumask_setall(&(bpc_mgmt_platform_data.affinity_mask));
        irq_set_affinity_hint(int_gpio,
                                &(bpc_mgmt_platform_data.affinity_mask));
index f23873b..b58fc9b 100644 (file)
@@ -72,10 +72,8 @@ static void __iomem *timer_reg_base = IO_ADDRESS(TEGRA_TMR1_BASE);
 
 #if defined(CONFIG_PM_SLEEP)
 static cpumask_t wake_timer_canceled;
-#if defined(CONFIG_HOTPLUG_CPU)
 static cpumask_t wake_timer_ready;
 #endif
-#endif
 
 #define timer_writel(value, reg) \
        __raw_writel(value, (u32)timer_reg_base + (reg))