From e5b463ea02709d736f53bb0939c15a8e718469ac Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 30 Nov 2010 18:24:57 +0000 Subject: [PATCH] --- yaml --- r: 225887 b: refs/heads/master c: 86e62b93368cffca9111996e3ed9e5b7bf6f0af3 h: refs/heads/master i: 225885: 641ae11893bbf37ba9bb1219b8dcf63ba58767ee 225883: 09ceec7932a57e8042bc712e45610336c8425059 225879: a48bf8f5f62d25c0df562398b39d5ffd79146c2a 225871: 7c88fc4650e0a0c5f263fb0878cc9e8d49709fbd 225855: 79e4c244f086136fe3dd2bd21975206ce502c679 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/smp_mpidr.h | 17 ----------------- trunk/arch/arm/mach-realview/include/mach/smp.h | 1 - trunk/arch/arm/mach-s5pv310/include/mach/smp.h | 1 - trunk/arch/arm/mach-tegra/include/mach/smp.h | 1 - trunk/arch/arm/mach-ux500/include/mach/smp.h | 1 - trunk/arch/arm/mach-vexpress/include/mach/smp.h | 1 - trunk/arch/arm/plat-omap/include/plat/smp.h | 1 - 8 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 trunk/arch/arm/include/asm/smp_mpidr.h diff --git a/[refs] b/[refs] index 8260d2625738..9867bc637a31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f36d340122ae8744e64af0a92a6f77b97542c0a4 +refs/heads/master: 86e62b93368cffca9111996e3ed9e5b7bf6f0af3 diff --git a/trunk/arch/arm/include/asm/smp_mpidr.h b/trunk/arch/arm/include/asm/smp_mpidr.h deleted file mode 100644 index 6a9307d64900..000000000000 --- a/trunk/arch/arm/include/asm/smp_mpidr.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef ASMARM_SMP_MIDR_H -#define ASMARM_SMP_MIDR_H - -#define hard_smp_processor_id() \ - ({ \ - unsigned int cpunum; \ - __asm__("\n" \ - "1: mrc p15, 0, %0, c0, c0, 5\n" \ - " .pushsection \".alt.smp.init\", \"a\"\n"\ - " .long 1b\n" \ - " mov %0, #0\n" \ - " .popsection" \ - : "=r" (cpunum)); \ - cpunum &= 0x0F; \ - }) - -#endif diff --git a/trunk/arch/arm/mach-realview/include/mach/smp.h b/trunk/arch/arm/mach-realview/include/mach/smp.h index d1aa70415a4e..c8221b38ee7c 100644 --- a/trunk/arch/arm/mach-realview/include/mach/smp.h +++ b/trunk/arch/arm/mach-realview/include/mach/smp.h @@ -2,7 +2,6 @@ #define ASMARM_ARCH_SMP_H #include -#include /* * We use IRQ1 as the IPI diff --git a/trunk/arch/arm/mach-s5pv310/include/mach/smp.h b/trunk/arch/arm/mach-s5pv310/include/mach/smp.h index 2897747bcb07..77e5a841f741 100644 --- a/trunk/arch/arm/mach-s5pv310/include/mach/smp.h +++ b/trunk/arch/arm/mach-s5pv310/include/mach/smp.h @@ -7,7 +7,6 @@ #define ASM_ARCH_SMP_H __FILE__ #include -#include extern void __iomem *gic_cpu_base_addr; diff --git a/trunk/arch/arm/mach-tegra/include/mach/smp.h b/trunk/arch/arm/mach-tegra/include/mach/smp.h index d1aa70415a4e..c8221b38ee7c 100644 --- a/trunk/arch/arm/mach-tegra/include/mach/smp.h +++ b/trunk/arch/arm/mach-tegra/include/mach/smp.h @@ -2,7 +2,6 @@ #define ASMARM_ARCH_SMP_H #include -#include /* * We use IRQ1 as the IPI diff --git a/trunk/arch/arm/mach-ux500/include/mach/smp.h b/trunk/arch/arm/mach-ux500/include/mach/smp.h index bd57c50a5b86..ca2b15b1b3b1 100644 --- a/trunk/arch/arm/mach-ux500/include/mach/smp.h +++ b/trunk/arch/arm/mach-ux500/include/mach/smp.h @@ -10,7 +10,6 @@ #define ASMARM_ARCH_SMP_H #include -#include /* This is required to wakeup the secondary core */ extern void u8500_secondary_startup(void); diff --git a/trunk/arch/arm/mach-vexpress/include/mach/smp.h b/trunk/arch/arm/mach-vexpress/include/mach/smp.h index 721be0f0311d..4c05e4a9713a 100644 --- a/trunk/arch/arm/mach-vexpress/include/mach/smp.h +++ b/trunk/arch/arm/mach-vexpress/include/mach/smp.h @@ -2,7 +2,6 @@ #define __MACH_SMP_H #include -#include /* * We use IRQ1 as the IPI diff --git a/trunk/arch/arm/plat-omap/include/plat/smp.h b/trunk/arch/arm/plat-omap/include/plat/smp.h index e5541e5388be..7a10257909ef 100644 --- a/trunk/arch/arm/plat-omap/include/plat/smp.h +++ b/trunk/arch/arm/plat-omap/include/plat/smp.h @@ -18,7 +18,6 @@ #define OMAP_ARCH_SMP_H #include -#include /* Needed for secondary core boot */ extern void omap_secondary_startup(void);