git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2412
/
pm.c
diff --git
a/arch/arm/mach-s3c2412/pm.c
b/arch/arm/mach-s3c2412/pm.c
index
752b13a
..
f4077ef
100644
(file)
--- a/
arch/arm/mach-s3c2412/pm.c
+++ b/
arch/arm/mach-s3c2412/pm.c
@@
-37,12
+37,10
@@
extern void s3c2412_sleep_enter(void);
extern void s3c2412_sleep_enter(void);
-static
void s3c2412_cpu_suspend(void
)
+static
int s3c2412_cpu_suspend(unsigned long arg
)
{
unsigned long tmp;
{
unsigned long tmp;
- flush_cache_all();
-
/* set our standby method to sleep */
tmp = __raw_readl(S3C2412_PWRCFG);
/* set our standby method to sleep */
tmp = __raw_readl(S3C2412_PWRCFG);
@@
-50,6
+48,8
@@
static void s3c2412_cpu_suspend(void)
__raw_writel(tmp, S3C2412_PWRCFG);
s3c2412_sleep_enter();
__raw_writel(tmp, S3C2412_PWRCFG);
s3c2412_sleep_enter();
+
+ panic("sleep resumed to originator?");
}
static void s3c2412_pm_prepare(void)
}
static void s3c2412_pm_prepare(void)