Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4833acb2 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_WRITETHROUGH 



Patch from Ben Dooks

If CONFIG_CPU_DCACHE_WRITETHOUGH is set, then the
S3C24XX PM code fails to compile, as there is no
need to flush the D-cache, the flush function
arm920_flush_kern_cache_all() is not compiled.

Fix the code to not use this if the config is set.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e2e5810f

arch/arm/mach-s3c2410/pm.c

+4 −0
Original line number Diff line number Diff line
@@ -58,7 +58,11 @@ unsigned long s3c_pm_flags; 


/* cache functions from arch/arm/mm/proc-arm920.S */



#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH

extern void arm920_flush_kern_cache_all(void);

#else

static void arm920_flush_kern_cache_all(void) { }

#endif



#define PFX "s3c24xx-pm: "

arch/arm/mach-s3c2410/sleep.S

+2 −0
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ ENTRY(s3c2410_cpu_suspend) 
	@@ flush the caches to ensure everything is back out to

	@@ SDRAM before the core powers down



#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH

	bl	arm920_flush_kern_cache_all

#endif



	@@ prepare cpu to sleep