diff for duplicates of <20101129174705.GA25168@lixom.net>

diff --git a/a/1.txt b/N1/1.txt
index 52fb4d1..ae6eb59 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,21 +1,21 @@
 On Mon, Nov 29, 2010 at 01:46:26PM +0100, Per Fransson wrote:
-> >>  void machine_crash_shutdown(struct pt_regs *regs)
-> >>  {
-> >> +     unsigned long msecs;
+> >> ?void machine_crash_shutdown(struct pt_regs *regs)
+> >> ?{
+> >> + ? ? unsigned long msecs;
 > >
 > > Int should be enough here? Not that it makes a difference on ARM, but
 > > anyway. :)
 > >
 > >> +
-> >>       local_irq_disable();
+> >> ? ? ? local_irq_disable();
 > >> +
-> >> +     atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
-> >> +     smp_call_function(machine_crash_nonpanic_core, NULL, false);
-> >> +     msecs = 1000; /* Wait at most a second for the other cpus to stop */
-> >> +     while ((atomic_read(&waiting_for_crash_ipi) > 0) && msecs) {
-> >> +             mdelay(1);
-> >> +             msecs--;
-> >> +     }
+> >> + ? ? atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
+> >> + ? ? smp_call_function(machine_crash_nonpanic_core, NULL, false);
+> >> + ? ? msecs = 1000; /* Wait at most a second for the other cpus to stop */
+> >> + ? ? while ((atomic_read(&waiting_for_crash_ipi) > 0) && msecs) {
+> >> + ? ? ? ? ? ? mdelay(1);
+> >> + ? ? ? ? ? ? msecs--;
+> >> + ? ? }
 > 
 > The choice of type comes from the corresponding x86 code in
 > 
@@ -28,8 +28,3 @@ Leave it if you prefer.
 
 
 -Olof
-
-_______________________________________________
-kexec mailing list
-kexec@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/kexec
diff --git a/a/content_digest b/N1/content_digest
index 77c3e61..4ef57ae 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,32 +1,30 @@
  "ref\01290587308-22038-1-git-send-email-per.xx.fransson@stericsson.com\0"
  "ref\020101126040612.GA6598@lixom.net\0"
  "ref\0AANLkTinF0Ndb9-3z1ZeMBjPRH5jXWNA+BL6QpS+--0A4@mail.gmail.com\0"
- "From\0Olof Johansson <olof@lixom.net>\0"
- "Subject\0Re: [PATCH v2] Add call to non-crashing cores through IPI\0"
+ "From\0olof@lixom.net (Olof Johansson)\0"
+ "Subject\0[PATCH v2] Add call to non-crashing cores through IPI\0"
  "Date\0Mon, 29 Nov 2010 11:47:05 -0600\0"
- "To\0Per Fransson <per.fransson.ml@gmail.com>\0"
- "Cc\0kexec@lists.infradead.org"
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, Nov 29, 2010 at 01:46:26PM +0100, Per Fransson wrote:\n"
- "> >> \302\240void machine_crash_shutdown(struct pt_regs *regs)\n"
- "> >> \302\240{\n"
- "> >> + \302\240 \302\240 unsigned long msecs;\n"
+ "> >> ?void machine_crash_shutdown(struct pt_regs *regs)\n"
+ "> >> ?{\n"
+ "> >> + ? ? unsigned long msecs;\n"
  "> >\n"
  "> > Int should be enough here? Not that it makes a difference on ARM, but\n"
  "> > anyway. :)\n"
  "> >\n"
  "> >> +\n"
- "> >> \302\240 \302\240 \302\240 local_irq_disable();\n"
+ "> >> ? ? ? local_irq_disable();\n"
  "> >> +\n"
- "> >> + \302\240 \302\240 atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);\n"
- "> >> + \302\240 \302\240 smp_call_function(machine_crash_nonpanic_core, NULL, false);\n"
- "> >> + \302\240 \302\240 msecs = 1000; /* Wait at most a second for the other cpus to stop */\n"
- "> >> + \302\240 \302\240 while ((atomic_read(&waiting_for_crash_ipi) > 0) && msecs) {\n"
- "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 mdelay(1);\n"
- "> >> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 msecs--;\n"
- "> >> + \302\240 \302\240 }\n"
+ "> >> + ? ? atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);\n"
+ "> >> + ? ? smp_call_function(machine_crash_nonpanic_core, NULL, false);\n"
+ "> >> + ? ? msecs = 1000; /* Wait at most a second for the other cpus to stop */\n"
+ "> >> + ? ? while ((atomic_read(&waiting_for_crash_ipi) > 0) && msecs) {\n"
+ "> >> + ? ? ? ? ? ? mdelay(1);\n"
+ "> >> + ? ? ? ? ? ? msecs--;\n"
+ "> >> + ? ? }\n"
  "> \n"
  "> The choice of type comes from the corresponding x86 code in\n"
  "> \n"
@@ -38,11 +36,6 @@
  "Leave it if you prefer.\n"
  "\n"
  "\n"
- "-Olof\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ -Olof
 
-3bd3499e9d629a709a801c4b54d9a6e50972badf9c650a86a862ad681178f621
+46878435307a3c4e12345e68ac13d5646f231049c3b4d2b6856629cf28e523f3
