diff for duplicates of <20120627135155.GA3464@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 786c756..3301206 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,11 +14,13 @@ index 17bbacb..87b251a 100644 +++ b/drivers/misc/sgi-xp/xpc_uv.c @@ -452,9 +452,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part, - if (msg->activate_gru_mq_desc_gpa ! part_uv->activate_gru_mq_desc_gpa) { + if (msg->activate_gru_mq_desc_gpa != + part_uv->activate_gru_mq_desc_gpa) { - spin_lock_irqsave(&part_uv->flags_lock, irq_flags); + spin_lock(&part_uv->flags_lock); part_uv->flags &= ~XPC_P_CACHED_ACTIVATE_GRU_MQ_DESC_UV; - spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags); + spin_unlock(&part_uv->flags_lock); - part_uv->activate_gru_mq_desc_gpa msg->activate_gru_mq_desc_gpa; + part_uv->activate_gru_mq_desc_gpa = + msg->activate_gru_mq_desc_gpa; } diff --git a/a/content_digest b/N1/content_digest index 96bab91..5613914 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020111215064805.GA2776@elgon.mountain\0" "From\0Robin Holt <holt@sgi.com>\0" "Subject\0[patch] sgi-xp: nested calls to spin_lock_irqsave()\0" - "Date\0Wed, 27 Jun 2012 13:51:55 +0000\0" + "Date\0Wed, 27 Jun 2012 08:51:55 -0500\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Robin Holt <holt@sgi.com>" Dan Carpenter <dan.carpenter@oracle.com> @@ -26,13 +25,15 @@ "+++ b/drivers/misc/sgi-xp/xpc_uv.c\n" "@@ -452,9 +452,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,\n" " \n" - " \t\tif (msg->activate_gru_mq_desc_gpa ! \t\t part_uv->activate_gru_mq_desc_gpa) {\n" + " \t\tif (msg->activate_gru_mq_desc_gpa !=\n" + " \t\t part_uv->activate_gru_mq_desc_gpa) {\n" "-\t\t\tspin_lock_irqsave(&part_uv->flags_lock, irq_flags);\n" "+\t\t\tspin_lock(&part_uv->flags_lock);\n" " \t\t\tpart_uv->flags &= ~XPC_P_CACHED_ACTIVATE_GRU_MQ_DESC_UV;\n" "-\t\t\tspin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);\n" "+\t\t\tspin_unlock(&part_uv->flags_lock);\n" - " \t\t\tpart_uv->activate_gru_mq_desc_gpa \t\t\t msg->activate_gru_mq_desc_gpa;\n" + " \t\t\tpart_uv->activate_gru_mq_desc_gpa =\n" + " \t\t\t msg->activate_gru_mq_desc_gpa;\n" " \t\t}" -37d873a179684bd0d706f4b7e6e8b356b233e9339a867a9d4317020909033f18 +b4c48634672cc07ba6eafc3ba75ce0829b7702fa16d16e45bd2bc579b1c3bdc1
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.