[Hackndev-commit] SF.net SVN: hackndev: [1265] linux4palm/linux/trunk/arch/arm/mach-pxa

[<mar...@us...>]

Revision: 1265
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1265&view=rev
Author:   marex_z71
Date:     2007-08-24 15:49:55 -0700 (Fri, 24 Aug 2007)

Log Message:
-----------
HnD: kernel cleanup - time hack removal (thanks kEdAR)

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c
    linux4palm/linux/trunk/arch/arm/mach-pxa/time.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c	2007-08-23 22:32:31 UTC (rev 1264)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/pm.c	2007-08-24 22:49:55 UTC (rev 1265)
@@ -80,6 +80,7 @@
 {
 	unsigned long sleep_save[SLEEP_SAVE_SIZE];
 	unsigned long checksum = 0;
+	struct timespec delta, rtc;
 	int i;
 	extern void pxa_cpu_pm_enter(suspend_state_t state);
 	extern void pxa_cpu_resume(void);
@@ -90,6 +91,11 @@
 		iwmmxt_task_disable(NULL);
 #endif
 
+	/* preserve current time */
+	rtc.tv_sec = RCNR;
+	rtc.tv_nsec = 0;
+	save_time_delta(&delta, &rtc);
+
 	SAVE(GPLR0); SAVE(GPLR1); SAVE(GPLR2);
 	SAVE(GPDR0); SAVE(GPDR1); SAVE(GPDR2);
 	SAVE(GRER0); SAVE(GRER1); SAVE(GRER2);
@@ -193,6 +199,10 @@
 
 	RESTORE(PSTR);
 
+	/* restore current time */
+	rtc.tv_sec = RCNR;
+	restore_time_delta(&delta, &rtc);
+
 #ifdef DEBUG
 	printk(KERN_DEBUG "*** made it back from resume\n");
 #endif

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/time.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/time.c	2007-08-23 22:32:31 UTC (rev 1264)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/time.c	2007-08-24 22:49:55 UTC (rev 1265)
@@ -29,6 +29,7 @@
 #include <asm/mach/time.h>
 #include <asm/arch/pxa-regs.h>
 
+
 static inline unsigned long pxa_get_rtc_time(void)
 {
 	return RCNR;
@@ -180,7 +181,6 @@
 
 #ifdef CONFIG_PM
 static unsigned long osmr[4], oier;
-static struct timespec delta, rtc;
 
 static void pxa_timer_suspend(void)
 {
@@ -189,19 +189,10 @@
 	osmr[2] = OSMR2;
 	osmr[3] = OSMR3;
 	oier = OIER;
-
-	/* preserve current time */
-	rtc.tv_sec = RCNR;
-	rtc.tv_nsec = 0;
-	save_time_delta(&delta, &rtc);
 }
 
 static void pxa_timer_resume(void)
 {
-	/* restore current time */
-	rtc.tv_sec = RCNR;
-	restore_time_delta(&delta, &rtc);
-
 	OSMR0 = osmr[0];
 	OSMR1 = osmr[1];
 	OSMR2 = osmr[2];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.