git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv310
/
include
/
mach
/
smp.h
diff --git
a/arch/arm/mach-s5pv310/include/mach/smp.h
b/arch/arm/mach-s5pv310/include/mach/smp.h
index
990f3ba
..
b7ec252
100644
(file)
--- a/
arch/arm/mach-s5pv310/include/mach/smp.h
+++ b/
arch/arm/mach-s5pv310/include/mach/smp.h
@@
-7,17
+7,10
@@
#define ASM_ARCH_SMP_H __FILE__
#include <asm/hardware/gic.h>
#define ASM_ARCH_SMP_H __FILE__
#include <asm/hardware/gic.h>
+#include <asm/smp_mpidr.h>
extern void __iomem *gic_cpu_base_addr;
extern void __iomem *gic_cpu_base_addr;
-#define hard_smp_processor_id() \
- ({ \
- unsigned int cpunum; \
- __asm__("mrc p15, 0, %0, c0, c0, 5" \
- : "=r" (cpunum)); \
- cpunum &= 0x03; \
- })
-
/*
* We use IRQ1 as the IPI
*/
/*
* We use IRQ1 as the IPI
*/