History

Merge tag 'highbank-fixes-for-3.8' of git://sources.calxeda.com/kernel/linux into fixes

From Rob Herring: highbank fixes for 3.8 -Compile fix for !SMP -More cpu cluster id related fixes * tag 'highbank-fixes-for-3.8' of git://sources.calxeda.com/kernel/linux: ARM: highbank: mask cluster id from cpu_logical_map ARM: scu: mask cluster id from cpu_logical_map ARM: scu: add empty scu_enable for !CONFIG_SMP

Olof Johansson committed 13 years ago

Commit 893db072 parents 836dc9e 63fc1374 files · +12 −5Browse files

Showing the changes to arch/arm/include (1 of 4 files). Show all

Unified · Split

arch/arm/include/asm/smp_scu.h+7−1
@@ -7,8 +7,14 @@ · 6 unmodified lines
77
88 #ifndef __ASSEMBLER__
99 unsigned int scu_get_core_count(void __iomem *);
10−void scu_enable(void __iomem *);
1110 int scu_power_mode(void __iomem *, unsigned int);
11+
12+#ifdef CONFIG_SMP
13+void scu_enable(void __iomem *scu_base);
14+#else
15+static inline void scu_enable(void __iomem *scu_base) {}
16+#endif
17+
1218 #endif
1319
1420 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t