summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2012-07-09 17:23:50 -0700
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-07-19 07:20:16 -0700
commit989cd8dbb21d7d7916d7460b291961b3d5312bf3 (patch)
tree2ec4e919290c7d0b19d80b727f46dcd7caae5f28 /arch
parent42ed69a64a39d7cc84256bd3cb386f8dc8f09b84 (diff)
ARM: tegra: Fix build issue for no-SMP
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-enterprise-power.c2
-rw-r--r--arch/arm/mach-tegra/timer-t3.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c
index ca39bae3d08d..eb9f1d53dea4 100644
--- a/arch/arm/mach-tegra/board-enterprise-power.c
+++ b/arch/arm/mach-tegra/board-enterprise-power.c
@@ -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));
diff --git a/arch/arm/mach-tegra/timer-t3.c b/arch/arm/mach-tegra/timer-t3.c
index f23873b214b2..b58fc9bbc4c0 100644
--- a/arch/arm/mach-tegra/timer-t3.c
+++ b/arch/arm/mach-tegra/timer-t3.c
@@ -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))