diff for duplicates of <4A5599D2.7080604@jp.fujitsu.com>

diff --git a/a/1.txt b/N1/1.txt
index b6c524b..db4e390 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
 Setting monarch_cpu = -1 to let slaves frozen might not work, because
 there might be slaves being late, not entered the rendezvous yet.
-Such slaves might be caught in while (monarch_cpu == -1) loop.
+Such slaves might be caught in while (monarch_cpu = -1) loop.
 
 Use kdump_in_progress instead of monarch_cpus to break INIT rendezvous
 and let all slaves enter DIE_INIT_SLAVE_LEAVE smoothly.
@@ -25,7 +25,7 @@ index 0995fdc..6631a9d 100644
  	 * If an INIT is asserted here:
  	 * - All receivers might be slaves, since some of cpus could already
  	 *   be frozen and INIT might be masked on monarch.  In this case,
--	 *   all slaves will park in while (monarch_cpu == -1) loop before
+-	 *   all slaves will park in while (monarch_cpu = -1) loop before
 -	 *   DIE_INIT_SLAVE_ENTER that for waiting monarch enters.
 -	 *	=> TBD: freeze all slaves
 +	 *   all slaves will be frozen soon since kdump_in_progress will let
@@ -60,9 +60,9 @@ index 0995fdc..6631a9d 100644
  	case DIE_MCA_MONARCH_LEAVE:
  		/* *(nd->data) indicate if MCA is recoverable */
  		if (kdump_on_fatal_mca && !(*(nd->data))) {
--			if (atomic_inc_return(&kdump_in_progress) == 1) {
+-			if (atomic_inc_return(&kdump_in_progress) = 1) {
 -				*(nd->monarch_cpu) = -1;
-+			if (atomic_inc_return(&kdump_in_progress) == 1)
++			if (atomic_inc_return(&kdump_in_progress) = 1)
  				machine_kdump_on_init();
 -			}
  			/* We got fatal MCA while kdump!? No way!! */
@@ -78,10 +78,10 @@ index 7b30d21..d2877a7 100644
  		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;
 +
 +#ifdef CONFIG_KEXEC
-+		while (monarch_cpu == -1 && !atomic_read(&kdump_in_progress))
++		while (monarch_cpu = -1 && !atomic_read(&kdump_in_progress))
 +			udelay(1000);
 +#else
- 		while (monarch_cpu == -1)
+ 		while (monarch_cpu = -1)
 -		       cpu_relax();	/* spin until monarch enters */
 +			cpu_relax();	/* spin until monarch enters */
 +#endif
@@ -102,10 +102,3 @@ index 7b30d21..d2877a7 100644
  
 -- 
 1.6.0
-
-
-
-_______________________________________________
-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 895ebfe..17bd9d2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,21 +2,21 @@
  "ref\04A5595F3.2050609@jp.fujitsu.com\0"
  "From\0Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>\0"
  "Subject\0[PATCH v2 7/7] ia64, kdump: Short path to freeze CPUs\0"
- "Date\0Thu, 09 Jul 2009 16:18:42 +0900\0"
+ "Date\0Thu, 09 Jul 2009 07:18:42 +0000\0"
  "To\0linux-ia64@vger.kernel.org"
  " linux-kernel@vger.kernel.org\0"
- "Cc\0Haren Myneni <hbabu@us.ibm.com>"
+ "Cc\0Vivek Goyal <vgoyal@redhat.com>"
+  Haren Myneni <hbabu@us.ibm.com>
+  kexec@lists.infradead.org
   Luck
   Tony <tony.luck@intel.com>
-  kexec@lists.infradead.org
-  Vivek Goyal <vgoyal@redhat.com>
   Yu
  " Fenghua <fenghua.yu@intel.com>\0"
  "\00:1\0"
  "b\0"
  "Setting monarch_cpu = -1 to let slaves frozen might not work, because\n"
  "there might be slaves being late, not entered the rendezvous yet.\n"
- "Such slaves might be caught in while (monarch_cpu == -1) loop.\n"
+ "Such slaves might be caught in while (monarch_cpu = -1) loop.\n"
  "\n"
  "Use kdump_in_progress instead of monarch_cpus to break INIT rendezvous\n"
  "and let all slaves enter DIE_INIT_SLAVE_LEAVE smoothly.\n"
@@ -41,7 +41,7 @@
  " \t * If an INIT is asserted here:\n"
  " \t * - All receivers might be slaves, since some of cpus could already\n"
  " \t *   be frozen and INIT might be masked on monarch.  In this case,\n"
- "-\t *   all slaves will park in while (monarch_cpu == -1) loop before\n"
+ "-\t *   all slaves will park in while (monarch_cpu = -1) loop before\n"
  "-\t *   DIE_INIT_SLAVE_ENTER that for waiting monarch enters.\n"
  "-\t *\t=> TBD: freeze all slaves\n"
  "+\t *   all slaves will be frozen soon since kdump_in_progress will let\n"
@@ -76,9 +76,9 @@
  " \tcase DIE_MCA_MONARCH_LEAVE:\n"
  " \t\t/* *(nd->data) indicate if MCA is recoverable */\n"
  " \t\tif (kdump_on_fatal_mca && !(*(nd->data))) {\n"
- "-\t\t\tif (atomic_inc_return(&kdump_in_progress) == 1) {\n"
+ "-\t\t\tif (atomic_inc_return(&kdump_in_progress) = 1) {\n"
  "-\t\t\t\t*(nd->monarch_cpu) = -1;\n"
- "+\t\t\tif (atomic_inc_return(&kdump_in_progress) == 1)\n"
+ "+\t\t\tif (atomic_inc_return(&kdump_in_progress) = 1)\n"
  " \t\t\t\tmachine_kdump_on_init();\n"
  "-\t\t\t}\n"
  " \t\t\t/* We got fatal MCA while kdump!? No way!! */\n"
@@ -94,10 +94,10 @@
  " \t\tia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;\n"
  "+\n"
  "+#ifdef CONFIG_KEXEC\n"
- "+\t\twhile (monarch_cpu == -1 && !atomic_read(&kdump_in_progress))\n"
+ "+\t\twhile (monarch_cpu = -1 && !atomic_read(&kdump_in_progress))\n"
  "+\t\t\tudelay(1000);\n"
  "+#else\n"
- " \t\twhile (monarch_cpu == -1)\n"
+ " \t\twhile (monarch_cpu = -1)\n"
  "-\t\t       cpu_relax();\t/* spin until monarch enters */\n"
  "+\t\t\tcpu_relax();\t/* spin until monarch enters */\n"
  "+#endif\n"
@@ -117,13 +117,6 @@
  " \t\tNOTIFY_INIT(DIE_INIT_SLAVE_LEAVE, regs, (long)&nd, 1);\n"
  " \n"
  "-- \n"
- "1.6.0\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ 1.6.0
 
-f3a4b0c861d9dfe962e2c814639ebb711ae6285545a56af295815e1f552b9fc6
+2ea474d63acf0e202a161a98ee2be6cf8b9fa0afccdfeda38f9fd9e74e836d15
