diff for duplicates of <20050323194550.GA21418@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 5756bb1..e028cf5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,8 @@ Signed-off-by: Dean Nelson <dcn@sgi.com> Index: linux-2.6/arch/ia64/Kconfig -=================================--- linux-2.6.orig/arch/ia64/Kconfig 2005-03-22 08:41:53.128253658 -0600 +=================================================================== +--- linux-2.6.orig/arch/ia64/Kconfig 2005-03-22 08:41:53.128253658 -0600 +++ linux-2.6/arch/ia64/Kconfig 2005-03-22 08:56:39.219766090 -0600 @@ -226,6 +226,16 @@ Fetchops are atomic memory operations that are implemented in the @@ -25,7 +26,8 @@ Index: linux-2.6/arch/ia64/Kconfig int default "18" Index: linux-2.6/arch/ia64/sn/kernel/xp_main.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6/arch/ia64/sn/kernel/xp_main.c 2005-03-23 06:17:25.539741042 -0600 @@ -0,0 +1,289 @@ +/* @@ -160,9 +162,9 @@ Index: linux-2.6/arch/ia64/sn/kernel/xp_main.c + + + DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS); -+ DBUG_ON(payload_size = 0 || nentries = 0); -+ DBUG_ON(func = NULL); -+ DBUG_ON(assigned_limit = 0 || idle_limit > assigned_limit); ++ DBUG_ON(payload_size == 0 || nentries == 0); ++ DBUG_ON(func == NULL); ++ DBUG_ON(assigned_limit == 0 || idle_limit > assigned_limit); + + registration = &xpc_registrations[ch_number]; + @@ -223,7 +225,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xp_main.c + down(®istration->sema); + + /* if !XPC_CHANNEL_REGISTERED(ch_number) */ -+ if (registration->func = NULL) { ++ if (registration->func == NULL) { + up(®istration->sema); + return; + } @@ -318,7 +320,8 @@ Index: linux-2.6/arch/ia64/sn/kernel/xp_main.c +EXPORT_SYMBOL(xpc_disconnect); + Index: linux-2.6/arch/ia64/sn/kernel/xp_nofault.S -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6/arch/ia64/sn/kernel/xp_nofault.S 2005-03-22 08:56:39.222695744 -0600 @@ -0,0 +1,31 @@ +/* @@ -353,7 +356,8 @@ Index: linux-2.6/arch/ia64/sn/kernel/xp_nofault.S + br.ret.sptk.many b0;; // Return failure + Index: linux-2.6/include/asm-ia64/sn/xp.h -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6/include/asm-ia64/sn/xp.h 2005-03-23 06:18:04.685793855 -0600 @@ -0,0 +1,436 @@ +/* @@ -610,7 +614,8 @@ Index: linux-2.6/include/asm-ia64/sn/xp.h + * + * + * Reason Code | Cause | Optional Data -+ * ===========+================+==========+ * xpcConnected | connection has been established| max #of entries ++ * =====================+================================+===================== ++ * xpcConnected | connection has been established| max #of entries + * | to the specified partition on | allowed in message + * | the specified channel | queue + * ---------------------+--------------------------------+--------------------- @@ -626,7 +631,8 @@ Index: linux-2.6/include/asm-ia64/sn/xp.h + * | recipient and that they have | + * | acknowledged its receipt by | + * | calling xpc_received() | -+ * ===========+================+==========+ * xpcUnequalMsgSizes | can't connect to the specified | NULL ++ * =====================+================================+===================== ++ * xpcUnequalMsgSizes | can't connect to the specified | NULL + * | partition on the specified | + * | channel because of mismatched | + * | message sizes | @@ -679,7 +685,8 @@ Index: linux-2.6/include/asm-ia64/sn/xp.h + * xpcUnknownReason | the specified channel to the | NULL or NA + * | specified partition was | + * | unavailable for unknown reasons| -+ * ===========+================+==========+ */ ++ * =====================+================================+===================== ++ */ + +typedef void (*xpc_channel_func)(enum xpc_retval reason, partid_t partid, + int ch_number, void *data, void *key); @@ -790,7 +797,8 @@ Index: linux-2.6/include/asm-ia64/sn/xp.h +#endif /* _ASM_IA64_SN_XP_H */ + Index: linux-2.6/arch/ia64/sn/kernel/Makefile -=================================--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile 2005-03-22 08:41:53.129230210 -0600 +=================================================================== +--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile 2005-03-22 08:41:53.129230210 -0600 +++ linux-2.6/arch/ia64/sn/kernel/Makefile 2005-03-23 06:17:46.758257105 -0600 @@ -4,9 +4,11 @@ # License. See the file "COPYING" in the main directory of this archive diff --git a/a/content_digest b/N1/content_digest index d2ae6aa..c2c36fb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\04241C391.mailxHNA15A8V0@aqua.americas.sgi.com\0" "From\0Dean Nelson <dcn@sgi.com>\0" "Subject\0[PATCH 1/3] SGI Altix cross partition functionality (2nd revision)\0" - "Date\0Wed, 23 Mar 2005 19:45:50 +0000\0" + "Date\0Wed, 23 Mar 2005 13:45:50 -0600\0" "To\0tony.luck@intel.com\0" "Cc\0netdev@oss.sgi.com" " linux-ia64@vger.kernel.org\0" @@ -14,7 +14,8 @@ "\n" "\n" "Index: linux-2.6/arch/ia64/Kconfig\n" - "=================================--- linux-2.6.orig/arch/ia64/Kconfig\t2005-03-22 08:41:53.128253658 -0600\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/Kconfig\t2005-03-22 08:41:53.128253658 -0600\n" "+++ linux-2.6/arch/ia64/Kconfig\t2005-03-22 08:56:39.219766090 -0600\n" "@@ -226,6 +226,16 @@\n" " \t Fetchops are atomic memory operations that are implemented in the\n" @@ -34,7 +35,8 @@ " \tint\n" " \tdefault \"18\"\n" "Index: linux-2.6/arch/ia64/sn/kernel/xp_main.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6/arch/ia64/sn/kernel/xp_main.c\t2005-03-23 06:17:25.539741042 -0600\n" "@@ -0,0 +1,289 @@\n" "+/*\n" @@ -169,9 +171,9 @@ "+\n" "+\n" "+\tDBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);\n" - "+\tDBUG_ON(payload_size = 0 || nentries = 0);\n" - "+\tDBUG_ON(func = NULL);\n" - "+\tDBUG_ON(assigned_limit = 0 || idle_limit > assigned_limit);\n" + "+\tDBUG_ON(payload_size == 0 || nentries == 0);\n" + "+\tDBUG_ON(func == NULL);\n" + "+\tDBUG_ON(assigned_limit == 0 || idle_limit > assigned_limit);\n" "+\n" "+\tregistration = &xpc_registrations[ch_number];\n" "+\n" @@ -232,7 +234,7 @@ "+\tdown(®istration->sema);\n" "+\n" "+\t/* if !XPC_CHANNEL_REGISTERED(ch_number) */\n" - "+\tif (registration->func = NULL) {\n" + "+\tif (registration->func == NULL) {\n" "+\t\tup(®istration->sema);\n" "+\t\treturn;\n" "+\t}\n" @@ -327,7 +329,8 @@ "+EXPORT_SYMBOL(xpc_disconnect);\n" "+\n" "Index: linux-2.6/arch/ia64/sn/kernel/xp_nofault.S\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6/arch/ia64/sn/kernel/xp_nofault.S\t2005-03-22 08:56:39.222695744 -0600\n" "@@ -0,0 +1,31 @@\n" "+/*\n" @@ -362,7 +365,8 @@ "+\tbr.ret.sptk.many b0;;\t\t// Return failure\n" "+\n" "Index: linux-2.6/include/asm-ia64/sn/xp.h\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6/include/asm-ia64/sn/xp.h\t2005-03-23 06:18:04.685793855 -0600\n" "@@ -0,0 +1,436 @@\n" "+/*\n" @@ -619,7 +623,8 @@ "+ *\n" "+ *\n" "+ * Reason Code | Cause | Optional Data\n" - "+ * ===========+================+==========+ * xpcConnected | connection has been established| max #of entries\n" + "+ * =====================+================================+=====================\n" + "+ * xpcConnected | connection has been established| max #of entries\n" "+ * | to the specified partition on | allowed in message\n" "+ * | the specified channel | queue \n" "+ * ---------------------+--------------------------------+---------------------\n" @@ -635,7 +640,8 @@ "+ * | recipient and that they have |\n" "+ * | acknowledged its receipt by |\n" "+ * | calling xpc_received() |\n" - "+ * ===========+================+==========+ * xpcUnequalMsgSizes | can't connect to the specified | NULL\n" + "+ * =====================+================================+=====================\n" + "+ * xpcUnequalMsgSizes | can't connect to the specified | NULL\n" "+ * | partition on the specified |\n" "+ * | channel because of mismatched |\n" "+ * | message sizes |\n" @@ -688,7 +694,8 @@ "+ * xpcUnknownReason | the specified channel to the | NULL or NA\n" "+ * | specified partition was |\n" "+ * | unavailable for unknown reasons|\n" - "+ * ===========+================+==========+ */\n" + "+ * =====================+================================+=====================\n" + "+ */\n" "+\n" "+typedef void (*xpc_channel_func)(enum xpc_retval reason, partid_t partid,\n" "+\t\tint ch_number, void *data, void *key);\n" @@ -799,7 +806,8 @@ "+#endif /* _ASM_IA64_SN_XP_H */\n" "+\n" "Index: linux-2.6/arch/ia64/sn/kernel/Makefile\n" - "=================================--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile\t2005-03-22 08:41:53.129230210 -0600\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile\t2005-03-22 08:41:53.129230210 -0600\n" "+++ linux-2.6/arch/ia64/sn/kernel/Makefile\t2005-03-23 06:17:46.758257105 -0600\n" "@@ -4,9 +4,11 @@\n" " # License. See the file \"COPYING\" in the main directory of this archive\n" @@ -815,4 +823,4 @@ "+obj-$(CONFIG_IA64_SGI_SN_XP)\t+= xp.o\n" "+xp-y\t\t\t\t:= xp_main.o xp_nofault.o" -2e10c468b41072b9ca86527166951479aaecd6ab10efd738e360b0a0137c6f55 +4402f67df940bc73363a80f586a3f9c3907910e76ba4e25244fc8d23c9780941
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.