Skip to content

Commit

Permalink
[ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_W…
Browse files Browse the repository at this point in the history
…RITETHROUGH

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: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ben Dooks authored and Russell King committed Jun 18, 2006
1 parent e2e5810 commit 4833acb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions arch/arm/mach-s3c2410/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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: "

Expand Down
2 changes: 2 additions & 0 deletions arch/arm/mach-s3c2410/sleep.S
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4833acb

Please sign in to comment.