From b80a0a1b2c5fba05f0a2177bc5521d155ac4cd38 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Mon, 20 Dec 2010 11:04:50 +0000
Subject: [PATCH] --- yaml --- r: 227218 b: refs/heads/master c:
 6155f77d09b968f591876f368d4843168910449e h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-shmobile/headsmp.S | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4f42f7a85495..ec102d86b78a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72f4d57923d2aa651db060a71a6f6211654c119e
+refs/heads/master: 6155f77d09b968f591876f368d4843168910449e
diff --git a/trunk/arch/arm/mach-shmobile/headsmp.S b/trunk/arch/arm/mach-shmobile/headsmp.S
index a5c5af1e6bce..d4cec6b4c7d9 100644
--- a/trunk/arch/arm/mach-shmobile/headsmp.S
+++ b/trunk/arch/arm/mach-shmobile/headsmp.S
@@ -12,6 +12,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/memory.h>
 
 	__INIT
 
@@ -23,4 +24,4 @@
 	.align  12
 ENTRY(shmobile_secondary_vector)
 	ldr     pc, 1f
-1:	.long   secondary_startup - CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START
+1:	.long   secondary_startup - PAGE_OFFSET + PHYS_OFFSET