diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2006-06-18 16:21:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-18 16:21:51 +0100 |
| commit | 4833acb2e19f669ce87c439a7d91ead600d8a7c9 (patch) | |
| tree | 696cd2a5efa20f6780cb3c724ffad57f22c79a72 /arch/arm/mach-s3c2410 | |
| parent | e2e5810f41646a400a9c6f941000db88d2ca10eb (diff) | |
| download | linux-4833acb2e19f669ce87c439a7d91ead600d8a7c9.tar.gz linux-4833acb2e19f669ce87c439a7d91ead600d8a7c9.tar.bz2 linux-4833acb2e19f669ce87c439a7d91ead600d8a7c9.zip | |
[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: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/pm.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/sleep.S | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index fe57d966a34d..43e9a550a203 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c @@ -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: " diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S index 73de2eaca22a..5f6761ed96b2 100644 --- a/arch/arm/mach-s3c2410/sleep.S +++ b/arch/arm/mach-s3c2410/sleep.S @@ -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 |