[V3,2/6] ARM: s5p: remove useless churn in sleep.S

Message ID 1321954532-18724-3-git-send-email-amit.kachhap@linaro.org
State New
Headers show

Commit Message

Amit Daniel Kachhap Nov. 22, 2011, 9:35 a.m.
This patch cleans up sleep code in preparation for L2 resume code
and hotplug functions

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
---
 arch/arm/plat-s5p/sleep.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

Russell King - ARM Linux Nov. 22, 2011, 9:48 a.m. | #1
On Tue, Nov 22, 2011 at 03:05:28PM +0530, Amit Daniel Kachhap wrote:
> This patch cleans up sleep code in preparation for L2 resume code
> and hotplug functions

I wonder whether anyone read the comments in this file before they
changed the section for the code.
        /*
         * sleep magic, to allow the bootloader to check for an valid
         * image to resume to. Must be the first word before the
         * s3c_cpu_resume entry.
         */
amit kachhap Nov. 23, 2011, 8:48 a.m. | #2
On Tue, Nov 22, 2011 at 3:18 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Tue, Nov 22, 2011 at 03:05:28PM +0530, Amit Daniel Kachhap wrote:
>> This patch cleans up sleep code in preparation for L2 resume code
>> and hotplug functions
>
> I wonder whether anyone read the comments in this file before they
> changed the section for the code.
>        /*
>         * sleep magic, to allow the bootloader to check for an valid
>         * image to resume to. Must be the first word before the
>         * s3c_cpu_resume entry.
>         */

Ok,This looks like an error. Thanks for pointing this out. Will put
the entire section into data.

> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Patch

diff --git a/arch/arm/plat-s5p/sleep.S b/arch/arm/plat-s5p/sleep.S
index 0fd591b..c371ba2 100644
--- a/arch/arm/plat-s5p/sleep.S
+++ b/arch/arm/plat-s5p/sleep.S
@@ -23,7 +23,6 @@ 
 */
 
 #include <linux/linkage.h>
-#include <asm/assembler.h>
 
 	.text
 
@@ -44,6 +43,9 @@ 
 	 * other way of restoring the stack pointer after sleep, and we
 	 * must not write to the code segment (code is read-only)
 	 */
+	.align
+	.data
 
 ENTRY(s3c_cpu_resume)
 	b	cpu_resume
+ENDPROC(s3c_cpu_resume)