From: robherring2@gmail•com (Rob Herring)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 1/7] ARM: versatile: Add missing ENDPROC to headsmp.S
Date: Thu, 12 Jan 2012 11:31:10 -0600 [thread overview]
Message-ID: <1326389476-11569-2-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1326389476-11569-1-git-send-email-robherring2@gmail.com>
From: Pawel Moll <pawel.moll@arm•com>
Once the ENDPROC is in place, BSYM() in not longer necessary
to get correct pointer to versatile_secondary_startup().
Tested-by: Jon Medhurst <tixy@linaro•org>
Signed-off-by: Pawel Moll <pawel.moll@arm•com>
---
arch/arm/mach-realview/platsmp.c | 3 +--
arch/arm/mach-vexpress/platsmp.c | 4 +---
arch/arm/plat-versatile/headsmp.S | 1 +
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index e83c654..17c878d 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -17,7 +17,6 @@
#include <asm/hardware/gic.h>
#include <asm/mach-types.h>
#include <asm/smp_scu.h>
-#include <asm/unified.h>
#include <mach/board-eb.h>
#include <mach/board-pb11mp.h>
@@ -75,6 +74,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
* until it receives a soft interrupt, and then the
* secondary CPU branches to this address.
*/
- __raw_writel(BSYM(virt_to_phys(versatile_secondary_startup)),
+ __raw_writel(virt_to_phys(versatile_secondary_startup),
__io_address(REALVIEW_SYS_FLAGSSET));
}
diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-vexpress/platsmp.c
index 2b5f7ac..124ffb1 100644
--- a/arch/arm/mach-vexpress/platsmp.c
+++ b/arch/arm/mach-vexpress/platsmp.c
@@ -13,8 +13,6 @@
#include <linux/smp.h>
#include <linux/io.h>
-#include <asm/unified.h>
-
#include <mach/motherboard.h>
#define V2M_PA_CS7 0x10000000
@@ -46,6 +44,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
* secondary CPU branches to this address.
*/
writel(~0, MMIO_P2V(V2M_SYS_FLAGSCLR));
- writel(BSYM(virt_to_phys(versatile_secondary_startup)),
+ writel(virt_to_phys(versatile_secondary_startup),
MMIO_P2V(V2M_SYS_FLAGSSET));
}
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S
index d397a1f..dd703ef 100644
--- a/arch/arm/plat-versatile/headsmp.S
+++ b/arch/arm/plat-versatile/headsmp.S
@@ -38,3 +38,4 @@ pen: ldr r7, [r6]
.align
1: .long .
.long pen_release
+ENDPROC(versatile_secondary_startup)
--
1.7.5.4
next prev parent reply other threads:[~2012-01-12 17:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-12 17:31 [PATCH v2 0/7] BSYM macro removal and secondary startup fixes Rob Herring
2012-01-12 17:31 ` Rob Herring [this message]
2012-01-13 14:09 ` [PATCH v2 1/7] ARM: versatile: Add missing ENDPROC to headsmp.S Dave Martin
2012-01-12 17:31 ` [PATCH v2 2/7] ARM: msm: " Rob Herring
2012-01-12 17:31 ` [PATCH v2 3/7] ARM: ux500: add " Rob Herring
2012-01-13 14:24 ` Dave Martin
2012-01-13 14:46 ` Rob Herring
2012-01-12 17:31 ` [PATCH v2 4/7] ARM: exynos: remove incorrect BSYM usage Rob Herring
2012-01-13 14:24 ` Dave Martin
2012-01-12 17:31 ` [PATCH v2 5/7] ARM: imx: " Rob Herring
2012-01-13 14:27 ` Dave Martin
2012-01-12 17:31 ` [PATCH v2 6/7] ARM: highbank: " Rob Herring
2012-01-13 14:29 ` Dave Martin
2012-01-12 17:31 ` [PATCH v2 7/7] ARM: make BSYM macro assembly only Rob Herring
2012-01-13 14:10 ` Dave Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1326389476-11569-2-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox