All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <AANLkTimUg=y49H6THn5s7f7v418W68fhAsMLZGnDqabF@mail.gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index 3dbe9c2..5c0544d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,23 +7,23 @@ On Wed, Jan 26, 2011 at 4:10 PM, Sven Neumann <s.neumann@raumfeld.com> wrote:
 >> --- a/arch/arm/mach-pxa/pm.c
 >> +++ b/arch/arm/mach-pxa/pm.c
 >> @@ -33,7 +33,7 @@ int pxa_pm_enter(suspend_state_t state)
->>  #endif
+>> ?#endif
 >>
->>       /* skip registers saving for standby */
->> -     if (state != PM_SUSPEND_STANDBY) {
->> +     if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->save) {
->>               pxa_cpu_pm_fns->save(sleep_save);
->>               /* before sleeping, calculate and save a checksum */
->>               for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
+>> ? ? ? /* skip registers saving for standby */
+>> - ? ? if (state != PM_SUSPEND_STANDBY) {
+>> + ? ? if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->save) {
+>> ? ? ? ? ? ? ? pxa_cpu_pm_fns->save(sleep_save);
+>> ? ? ? ? ? ? ? /* before sleeping, calculate and save a checksum */
+>> ? ? ? ? ? ? ? for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
 >> @@ -44,7 +44,7 @@ int pxa_pm_enter(suspend_state_t state)
->>       pxa_cpu_pm_fns->enter(state);
->>       cpu_init();
+>> ? ? ? pxa_cpu_pm_fns->enter(state);
+>> ? ? ? cpu_init();
 >>
->> -     if (state != PM_SUSPEND_STANDBY) {
->> +     if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->restore) {
->>               /* after sleeping, validate the checksum */
->>               for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
->>                       checksum += sleep_save[i];
+>> - ? ? if (state != PM_SUSPEND_STANDBY) {
+>> + ? ? if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->restore) {
+>> ? ? ? ? ? ? ? /* after sleeping, validate the checksum */
+>> ? ? ? ? ? ? ? for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
+>> ? ? ? ? ? ? ? ? ? ? ? checksum += sleep_save[i];
 >>
 >
 > Not sure if that will work as well. With this change the code is
diff --git a/a/content_digest b/N1/content_digest
index 60df894..a0f65b4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,22 +11,16 @@
   "ref\0001296029447.2013.8.camel\@sven\0"
 ]
 [
-  "From\0Eric Miao <eric.y.miao\@gmail.com>\0"
+  "From\0eric.y.miao\@gmail.com (Eric Miao)\0"
 ]
 [
-  "Subject\0Re: [PATCH] ARM: pxa: fix suspend on PXA3XX\0"
+  "Subject\0[PATCH] ARM: pxa: fix suspend on PXA3XX\0"
 ]
 [
   "Date\0Thu, 27 Jan 2011 22:46:54 +0800\0"
 ]
 [
-  "To\0Sven Neumann <s.neumann\@raumfeld.com>\0"
-]
-[
-  "Cc\0Russell King - ARM Linux <linux\@arm.linux.org.uk>",
-  " linux-arm-kernel\@lists.infradead.org",
-  " linux-kernel\@vger.kernel.org",
-  " Daniel Mack <daniel\@caiaq.de>\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -44,23 +38,23 @@
   ">> --- a/arch/arm/mach-pxa/pm.c\n",
   ">> +++ b/arch/arm/mach-pxa/pm.c\n",
   ">> \@\@ -33,7 +33,7 \@\@ int pxa_pm_enter(suspend_state_t state)\n",
-  ">> \302\240#endif\n",
+  ">> ?#endif\n",
   ">>\n",
-  ">> \302\240 \302\240 \302\240 /* skip registers saving for standby */\n",
-  ">> - \302\240 \302\240 if (state != PM_SUSPEND_STANDBY) {\n",
-  ">> + \302\240 \302\240 if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->save) {\n",
-  ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 pxa_cpu_pm_fns->save(sleep_save);\n",
-  ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 /* before sleeping, calculate and save a checksum */\n",
-  ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)\n",
+  ">> ? ? ? /* skip registers saving for standby */\n",
+  ">> - ? ? if (state != PM_SUSPEND_STANDBY) {\n",
+  ">> + ? ? if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->save) {\n",
+  ">> ? ? ? ? ? ? ? pxa_cpu_pm_fns->save(sleep_save);\n",
+  ">> ? ? ? ? ? ? ? /* before sleeping, calculate and save a checksum */\n",
+  ">> ? ? ? ? ? ? ? for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)\n",
   ">> \@\@ -44,7 +44,7 \@\@ int pxa_pm_enter(suspend_state_t state)\n",
-  ">> \302\240 \302\240 \302\240 pxa_cpu_pm_fns->enter(state);\n",
-  ">> \302\240 \302\240 \302\240 cpu_init();\n",
+  ">> ? ? ? pxa_cpu_pm_fns->enter(state);\n",
+  ">> ? ? ? cpu_init();\n",
   ">>\n",
-  ">> - \302\240 \302\240 if (state != PM_SUSPEND_STANDBY) {\n",
-  ">> + \302\240 \302\240 if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->restore) {\n",
-  ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 /* after sleeping, validate the checksum */\n",
-  ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)\n",
-  ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 checksum += sleep_save[i];\n",
+  ">> - ? ? if (state != PM_SUSPEND_STANDBY) {\n",
+  ">> + ? ? if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->restore) {\n",
+  ">> ? ? ? ? ? ? ? /* after sleeping, validate the checksum */\n",
+  ">> ? ? ? ? ? ? ? for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)\n",
+  ">> ? ? ? ? ? ? ? ? ? ? ? checksum += sleep_save[i];\n",
   ">>\n",
   ">\n",
   "> Not sure if that will work as well. With this change the code is\n",
@@ -80,4 +74,4 @@
   ">"
 ]
 
-c9b854d9197a7aef345f86ed50caac557ca85d520250556e47845edb82837d23
+dbb0ed53845feea1ca4cc4ff2368efa1fa447d27933641e0b65ea289e7d8fa9a
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.