diff for duplicates of <1233680663.20790.7.camel@localhost.localdomain> diff --git a/a/content_digest b/N1/content_digest index 89795cf..57996e1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,11 +4,11 @@ "Date\0Tue, 03 Feb 2009 17:04:23 +0000\0" "To\0greg KH <greg@kroah.com>" " dwmw2 <dwmw2@infradead.org>\0" - "Cc\0Paul Mundt <lethal@linux-sh.org>" + "Cc\0linux-sh <linux-sh@vger.kernel.org>" Dmitry Torokhov <dmitry.torokhov@gmail.com> LKML <linux-kernel@vger.kernel.org> + Paul Mundt <lethal@linux-sh.org> MTD <linux-mtd@lists.infradead.org> - linux-sh <linux-sh@vger.kernel.org> " linux-input <linux-input@vger.kernel.org>\0" "\00:1\0" "b\0" @@ -882,4 +882,4 @@ "+MODULE_AUTHOR(\"Adrian McMenamin\");\n" "+MODULE_DESCRIPTION(\"Flash mapping for Sega Dreamcast visual memory\");" -8216fd7d07330a4bee5462c8a2290a0a39293a7e5aa25f098476be60530959b2 +cc8136a4fc78691d87aa982fcc8cf82ab489b77d78192317e9adcbfd8fcde275
diff --git a/a/1.txt b/N2/1.txt index eb754ef..b3e8f38 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -189,10 +189,10 @@ index 0000000..e7138c2 + for (x = 0; x < card->readcnt; x++) { + sendbuf = cpu_to_be32(partition << 24 | x << 16 | num); + -+ if (mdev->busy == 1) { ++ if (mdev->busy = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ); -+ if (mdev->busy == 1) { ++ (mdev->busy = 0), HZ); ++ if (mdev->busy = 1) { + dev_notice(&mdev->dev, "VMU at (%d, %d)" + " is busy\n", mdev->port, mdev->unit); + error = -EAGAIN; @@ -214,24 +214,24 @@ index 0000000..e7138c2 + error = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD, + MAPLE_COMMAND_BREAD, 2, &sendbuf); + wait = wait_event_interruptible_timeout(mdev->maple_wait, -+ ((mdev->busy == 0) || (mdev->busy == 2)), HZ/2); ++ ((mdev->busy = 0) || (mdev->busy = 2)), HZ/2); + /* + * MTD layer does not handle hotplugging well + * so have to return errors when VMU is unplugged -+ * in the middle of a read (busy == 2) ++ * in the middle of a read (busy = 2) + */ -+ if (error || (mdev->busy == 2)) { -+ if (mdev->busy == 2) ++ if (error || (mdev->busy = 2)) { ++ if (mdev->busy = 2) + error = -ENXIO; + mdev->busy = 0; + goto outA; + } -+ if ((wait == 0) || (wait == -ERESTARTSYS)) { ++ if ((wait = 0) || (wait = -ERESTARTSYS)) { + kfree(mdev->mq->sendbuf); + list_del_init(&(mdev->mq->list)); + mdev->busy = 0; + error = -EIO; -+ if (wait == -ERESTARTSYS) ++ if (wait = -ERESTARTSYS) + dev_warn(&mdev->dev, "VMU read on (%d, %d)" + " interrupted on block 0x%X\n", + mdev->port, mdev->unit, num); @@ -285,10 +285,10 @@ index 0000000..e7138c2 + memcpy(&sendbuf[1], buf + phaselen * x, phaselen); + /* wait until the device is not busy doing something else + * or 1 second - which ever is longer */ -+ if (mdev->busy == 1) { ++ if (mdev->busy = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ); -+ if (mdev->busy == 1) { ++ (mdev->busy = 0), HZ); ++ if (mdev->busy = 1) { + error = -EBUSY; + dev_notice(&mdev->dev, "VMU write at (%d, %d)" + "failed - device is busy\n", @@ -301,15 +301,15 @@ index 0000000..e7138c2 + locking = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD, + MAPLE_COMMAND_BWRITE, phaselen / 4 + 2, sendbuf); + wait = wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ/10); ++ (mdev->busy = 0), HZ/10); + if (locking) { + error = -EIO; + mdev->busy = 0; + goto fail_nolock; + } -+ if (mdev->busy == 2) { ++ if (mdev->busy = 2) { + mdev->busy = 0; -+ } else if ((wait == 0) || (wait == -ERESTARTSYS)) { ++ } else if ((wait = 0) || (wait = -ERESTARTSYS)) { + error = -EIO; + dev_warn(&mdev->dev, "Write at (%d, %d) of block" + " 0x%X at phase %d failed: could not" @@ -404,7 +404,7 @@ index 0000000..e7138c2 + numblocks = card->parts[partition].numblocks; + if (from + len > numblocks * card->blocklen) + len = numblocks * card->blocklen - from; -+ if (len == 0) ++ if (len = 0) + return -EIO; + /* Have we cached this bit already? */ + pcache = card->parts[partition].pcache; @@ -415,7 +415,7 @@ index 0000000..e7138c2 + /* Have we cached this and is the cache valid and timely? */ + if (pcache->valid && + time_before(jiffies, pcache->jiffies_atc + HZ) && -+ (pcache->block == vblock->num)) { ++ (pcache->block = vblock->num)) { + /* we have cached it, so do necessary copying */ + leftover = card->blocklen - vblock->ofs; + if (vblock->ofs + len - index < card->blocklen) { @@ -475,7 +475,7 @@ index 0000000..e7138c2 + numblocks = card->parts[partition].numblocks; + if (to + len > numblocks * card->blocklen) + len = numblocks * card->blocklen - to; -+ if (len == 0) { ++ if (len = 0) { + error = -EIO; + goto failed; + } @@ -699,10 +699,10 @@ index 0000000..e7138c2 + MAPLE_FUNC_MEMCARD); + + /* Make sure we are clear to go */ -+ if (mdev->busy == 1) { ++ if (mdev->busy = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ); -+ if (mdev->busy == 1) { ++ (mdev->busy = 0), HZ); ++ if (mdev->busy = 1) { + dev_notice(&mdev->dev, "VMU at (%d, %d) is busy\n", + mdev->port, mdev->unit); + error = -EAGAIN; diff --git a/a/content_digest b/N2/content_digest index 89795cf..db614f3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -203,10 +203,10 @@ "+\tfor (x = 0; x < card->readcnt; x++) {\n" "+\t\tsendbuf = cpu_to_be32(partition << 24 | x << 16 | num);\n" "+\n" - "+\t\tif (mdev->busy == 1) {\n" + "+\t\tif (mdev->busy = 1) {\n" "+\t\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t\t(mdev->busy == 0), HZ);\n" - "+\t\t\tif (mdev->busy == 1) {\n" + "+\t\t\t\t(mdev->busy = 0), HZ);\n" + "+\t\t\tif (mdev->busy = 1) {\n" "+\t\t\t\tdev_notice(&mdev->dev, \"VMU at (%d, %d)\"\n" "+\t\t\t\t\t\" is busy\\n\", mdev->port, mdev->unit);\n" "+\t\t\t\terror = -EAGAIN;\n" @@ -228,24 +228,24 @@ "+\t\terror = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD,\n" "+\t\t\t\tMAPLE_COMMAND_BREAD, 2, &sendbuf);\n" "+\t\twait = wait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t((mdev->busy == 0) || (mdev->busy == 2)), HZ/2);\n" + "+\t\t\t((mdev->busy = 0) || (mdev->busy = 2)), HZ/2);\n" "+\t\t/*\n" "+\t\t* MTD layer does not handle hotplugging well\n" "+\t\t* so have to return errors when VMU is unplugged\n" - "+\t\t* in the middle of a read (busy == 2)\n" + "+\t\t* in the middle of a read (busy = 2)\n" "+\t\t*/\n" - "+\t\tif (error || (mdev->busy == 2)) {\n" - "+\t\t\tif (mdev->busy == 2)\n" + "+\t\tif (error || (mdev->busy = 2)) {\n" + "+\t\t\tif (mdev->busy = 2)\n" "+\t\t\t\terror = -ENXIO;\n" "+\t\t\tmdev->busy = 0;\n" "+\t\t\tgoto outA;\n" "+\t\t}\n" - "+\t\tif ((wait == 0) || (wait == -ERESTARTSYS)) {\n" + "+\t\tif ((wait = 0) || (wait = -ERESTARTSYS)) {\n" "+\t\t\tkfree(mdev->mq->sendbuf);\n" "+\t\t\tlist_del_init(&(mdev->mq->list));\n" "+\t\t\tmdev->busy = 0;\n" "+\t\t\terror = -EIO;\n" - "+\t\t\tif (wait == -ERESTARTSYS)\n" + "+\t\t\tif (wait = -ERESTARTSYS)\n" "+\t\t\t\tdev_warn(&mdev->dev, \"VMU read on (%d, %d)\"\n" "+\t\t\t\t\t\" interrupted on block 0x%X\\n\",\n" "+\t\t\t\t\tmdev->port, mdev->unit, num);\n" @@ -299,10 +299,10 @@ "+\t\tmemcpy(&sendbuf[1], buf + phaselen * x, phaselen);\n" "+\t\t/* wait until the device is not busy doing something else\n" "+\t\t* or 1 second - which ever is longer */\n" - "+\t\tif (mdev->busy == 1) {\n" + "+\t\tif (mdev->busy = 1) {\n" "+\t\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t\t(mdev->busy == 0), HZ);\n" - "+\t\t\tif (mdev->busy == 1) {\n" + "+\t\t\t\t(mdev->busy = 0), HZ);\n" + "+\t\t\tif (mdev->busy = 1) {\n" "+\t\t\t\terror = -EBUSY;\n" "+\t\t\t\tdev_notice(&mdev->dev, \"VMU write at (%d, %d)\"\n" "+\t\t\t\t\t\"failed - device is busy\\n\",\n" @@ -315,15 +315,15 @@ "+\t\tlocking = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD,\n" "+\t\t\tMAPLE_COMMAND_BWRITE, phaselen / 4 + 2, sendbuf);\n" "+\t\twait = wait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t(mdev->busy == 0), HZ/10);\n" + "+\t\t\t(mdev->busy = 0), HZ/10);\n" "+\t\tif (locking) {\n" "+\t\t\terror = -EIO;\n" "+\t\t\tmdev->busy = 0;\n" "+\t\t\tgoto fail_nolock;\n" "+\t\t}\n" - "+\t\tif (mdev->busy == 2) {\n" + "+\t\tif (mdev->busy = 2) {\n" "+\t\t\tmdev->busy = 0;\n" - "+\t\t} else if ((wait == 0) || (wait == -ERESTARTSYS)) {\n" + "+\t\t} else if ((wait = 0) || (wait = -ERESTARTSYS)) {\n" "+\t\t\terror = -EIO;\n" "+\t\t\tdev_warn(&mdev->dev, \"Write at (%d, %d) of block\"\n" "+\t\t\t\t\" 0x%X at phase %d failed: could not\"\n" @@ -418,7 +418,7 @@ "+\tnumblocks = card->parts[partition].numblocks;\n" "+\tif (from + len > numblocks * card->blocklen)\n" "+\t\tlen = numblocks * card->blocklen - from;\n" - "+\tif (len == 0)\n" + "+\tif (len = 0)\n" "+\t\treturn -EIO;\n" "+\t/* Have we cached this bit already? */\n" "+\tpcache = card->parts[partition].pcache;\n" @@ -429,7 +429,7 @@ "+\t\t/* Have we cached this and is the cache valid and timely? */\n" "+\t\tif (pcache->valid &&\n" "+\t\t\ttime_before(jiffies, pcache->jiffies_atc + HZ) &&\n" - "+\t\t\t(pcache->block == vblock->num)) {\n" + "+\t\t\t(pcache->block = vblock->num)) {\n" "+\t\t\t/* we have cached it, so do necessary copying */\n" "+\t\t\tleftover = card->blocklen - vblock->ofs;\n" "+\t\t\tif (vblock->ofs + len - index < card->blocklen) {\n" @@ -489,7 +489,7 @@ "+\tnumblocks = card->parts[partition].numblocks;\n" "+\tif (to + len > numblocks * card->blocklen)\n" "+\t\tlen = numblocks * card->blocklen - to;\n" - "+\tif (len == 0) {\n" + "+\tif (len = 0) {\n" "+\t\terror = -EIO;\n" "+\t\tgoto failed;\n" "+\t}\n" @@ -713,10 +713,10 @@ "+\t\tMAPLE_FUNC_MEMCARD);\n" "+\n" "+\t/* Make sure we are clear to go */\n" - "+\tif (mdev->busy == 1) {\n" + "+\tif (mdev->busy = 1) {\n" "+\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t(mdev->busy == 0), HZ);\n" - "+\t\tif (mdev->busy == 1) {\n" + "+\t\t\t(mdev->busy = 0), HZ);\n" + "+\t\tif (mdev->busy = 1) {\n" "+\t\t\tdev_notice(&mdev->dev, \"VMU at (%d, %d) is busy\\n\",\n" "+\t\t\t\tmdev->port, mdev->unit);\n" "+\t\t\terror = -EAGAIN;\n" @@ -882,4 +882,4 @@ "+MODULE_AUTHOR(\"Adrian McMenamin\");\n" "+MODULE_DESCRIPTION(\"Flash mapping for Sega Dreamcast visual memory\");" -8216fd7d07330a4bee5462c8a2290a0a39293a7e5aa25f098476be60530959b2 +cac2cf5c0e6c31427ec7f0869731391cafe0d5fd1ce478c2a33511ea612a334d
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.