diff for duplicates of <1234643202.6609.25.camel@localhost.localdomain> diff --git a/a/content_digest b/N1/content_digest index 297c506..d9bd24b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,12 +4,12 @@ "Subject\0[PATCH] mtd: sh: maple: Support the Dreamcast visual memory unit as a flash mapping\0" "Date\0Sat, 14 Feb 2009 20:26:42 +0000\0" "To\0dwmw2 <dwmw2@infradead.org>\0" - "Cc\0Paul Mundt <lethal@users.sourceforge.net>" - Dmitry Torokhov <dmitry.torokhov@gmail.com> - linux-input <linux-input@vger.kernel.org> + "Cc\0Dmitry Torokhov <dmitry.torokhov@gmail.com>" linux-sh <linux-sh@vger.kernel.org> + Paul Mundt <lethal@users.sourceforge.net> LKML <linux-kernel@vger.kernel.org> - " MTD <linux-mtd@lists.infradead.org>\0" + MTD <linux-mtd@lists.infradead.org> + " linux-input <linux-input@vger.kernel.org>\0" "\00:1\0" "b\0" "This patch adds support for the Sega Dreamcast visual memory unit as a\n" @@ -893,4 +893,4 @@ "+MODULE_AUTHOR(\"Adrian McMenamin\");\n" "+MODULE_DESCRIPTION(\"Flash mapping for Sega Dreamcast visual memory\");" -7e47c05b6d9af16e045790ae768d3ac27991f5dddd8531bb188b7e772da4e9bb +546ba8032daa096743da185cb5743ce9d0c914aa388d01e978acaa4958d238ac
diff --git a/a/1.txt b/N2/1.txt index aa82d8c..2eabdf2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -193,10 +193,10 @@ index 0000000..1f73297 + for (x = 0; x < card->readcnt; x++) { + sendbuf = cpu_to_be32(partition << 24 | x << 16 | num); + -+ if (atomic_read(&mdev->busy) == 1) { ++ if (atomic_read(&mdev->busy) = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ atomic_read(&mdev->busy) == 0, HZ); -+ if (atomic_read(&mdev->busy) == 1) { ++ atomic_read(&mdev->busy) = 0, HZ); ++ if (atomic_read(&mdev->busy) = 1) { + dev_notice(&mdev->dev, "VMU at (%d, %d)" + " is busy\n", mdev->port, mdev->unit); + error = -EAGAIN; @@ -219,28 +219,28 @@ index 0000000..1f73297 + MAPLE_COMMAND_BREAD, 2, &sendbuf); + /* Very long timeouts seem to be needed when box is stressed */ + wait = wait_event_interruptible_timeout(mdev->maple_wait, -+ (atomic_read(&mdev->busy) == 0 || -+ atomic_read(&mdev->busy) == 2), HZ * 3); ++ (atomic_read(&mdev->busy) = 0 || ++ atomic_read(&mdev->busy) = 2), HZ * 3); + /* + * 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 || atomic_read(&mdev->busy) == 2) { -+ if (atomic_read(&mdev->busy) == 2) ++ if (error || atomic_read(&mdev->busy) = 2) { ++ if (atomic_read(&mdev->busy) = 2) + error = -ENXIO; + atomic_set(&mdev->busy, 0); + card->blockread = NULL; + goto outA; + } -+ if (wait == 0 || wait == -ERESTARTSYS) { ++ if (wait = 0 || wait = -ERESTARTSYS) { + card->blockread = NULL; + atomic_set(&mdev->busy, 0); + error = -EIO; + list_del_init(&(mdev->mq->list)); + kfree(mdev->mq->sendbuf); + mdev->mq->sendbuf = NULL; -+ 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); @@ -298,10 +298,10 @@ index 0000000..1f73297 + 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 (atomic_read(&mdev->busy) == 1) { ++ if (atomic_read(&mdev->busy) = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ atomic_read(&mdev->busy) == 0, HZ); -+ if (atomic_read(&mdev->busy) == 1) { ++ atomic_read(&mdev->busy) = 0, HZ); ++ if (atomic_read(&mdev->busy) = 1) { + error = -EBUSY; + dev_notice(&mdev->dev, "VMU write at (%d, %d)" + "failed - device is busy\n", @@ -314,15 +314,15 @@ index 0000000..1f73297 + locking = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD, + MAPLE_COMMAND_BWRITE, phaselen / 4 + 2, sendbuf); + wait = wait_event_interruptible_timeout(mdev->maple_wait, -+ atomic_read(&mdev->busy) == 0, HZ/10); ++ atomic_read(&mdev->busy) = 0, HZ/10); + if (locking) { + error = -EIO; + atomic_set(&mdev->busy, 0); + goto fail_nolock; + } -+ if (atomic_read(&mdev->busy) == 2) { ++ if (atomic_read(&mdev->busy) = 2) { + atomic_set(&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" @@ -418,7 +418,7 @@ index 0000000..1f73297 + 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; @@ -429,7 +429,7 @@ index 0000000..1f73297 + /* 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) { @@ -489,7 +489,7 @@ index 0000000..1f73297 + 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; + } @@ -710,10 +710,10 @@ index 0000000..1f73297 + MAPLE_FUNC_MEMCARD); + + /* Make sure we are clear to go */ -+ if (atomic_read(&mdev->busy) == 1) { ++ if (atomic_read(&mdev->busy) = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ atomic_read(&mdev->busy) == 0, HZ); -+ if (atomic_read(&mdev->busy) == 1) { ++ atomic_read(&mdev->busy) = 0, HZ); ++ if (atomic_read(&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 297c506..53903f3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01234641948.6609.13.camel@localhost.localdomain\0" "ref\01234642605.6609.17.camel@localhost.localdomain\0" "From\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" - "Subject\0[PATCH] mtd: sh: maple: Support the Dreamcast visual memory unit as a flash mapping\0" + "Subject\0[PATCH] mtd: sh: maple: Support the Dreamcast visual memory unit\0" "Date\0Sat, 14 Feb 2009 20:26:42 +0000\0" "To\0dwmw2 <dwmw2@infradead.org>\0" "Cc\0Paul Mundt <lethal@users.sourceforge.net>" @@ -207,10 +207,10 @@ "+\tfor (x = 0; x < card->readcnt; x++) {\n" "+\t\tsendbuf = cpu_to_be32(partition << 24 | x << 16 | num);\n" "+\n" - "+\t\tif (atomic_read(&mdev->busy) == 1) {\n" + "+\t\tif (atomic_read(&mdev->busy) = 1) {\n" "+\t\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t\tatomic_read(&mdev->busy) == 0, HZ);\n" - "+\t\t\tif (atomic_read(&mdev->busy) == 1) {\n" + "+\t\t\t\tatomic_read(&mdev->busy) = 0, HZ);\n" + "+\t\t\tif (atomic_read(&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" @@ -233,28 +233,28 @@ "+\t\t\t\tMAPLE_COMMAND_BREAD, 2, &sendbuf);\n" "+\t\t/* Very long timeouts seem to be needed when box is stressed */\n" "+\t\twait = wait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t(atomic_read(&mdev->busy) == 0 ||\n" - "+\t\t\tatomic_read(&mdev->busy) == 2), HZ * 3);\n" + "+\t\t\t(atomic_read(&mdev->busy) = 0 ||\n" + "+\t\t\tatomic_read(&mdev->busy) = 2), HZ * 3);\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 || atomic_read(&mdev->busy) == 2) {\n" - "+\t\t\tif (atomic_read(&mdev->busy) == 2)\n" + "+\t\tif (error || atomic_read(&mdev->busy) = 2) {\n" + "+\t\t\tif (atomic_read(&mdev->busy) = 2)\n" "+\t\t\t\terror = -ENXIO;\n" "+\t\t\tatomic_set(&mdev->busy, 0);\n" "+\t\t\tcard->blockread = NULL;\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\tcard->blockread = NULL;\n" "+\t\t\tatomic_set(&mdev->busy, 0);\n" "+\t\t\terror = -EIO;\n" "+\t\t\tlist_del_init(&(mdev->mq->list));\n" "+\t\t\tkfree(mdev->mq->sendbuf);\n" "+\t\t\tmdev->mq->sendbuf = NULL;\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" @@ -312,10 +312,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 (atomic_read(&mdev->busy) == 1) {\n" + "+\t\tif (atomic_read(&mdev->busy) = 1) {\n" "+\t\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t\tatomic_read(&mdev->busy) == 0, HZ);\n" - "+\t\t\tif (atomic_read(&mdev->busy) == 1) {\n" + "+\t\t\t\tatomic_read(&mdev->busy) = 0, HZ);\n" + "+\t\t\tif (atomic_read(&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" @@ -328,15 +328,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\tatomic_read(&mdev->busy) == 0, HZ/10);\n" + "+\t\t\tatomic_read(&mdev->busy) = 0, HZ/10);\n" "+\t\tif (locking) {\n" "+\t\t\terror = -EIO;\n" "+\t\t\tatomic_set(&mdev->busy, 0);\n" "+\t\t\tgoto fail_nolock;\n" "+\t\t}\n" - "+\t\tif (atomic_read(&mdev->busy) == 2) {\n" + "+\t\tif (atomic_read(&mdev->busy) = 2) {\n" "+\t\t\tatomic_set(&mdev->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" @@ -432,7 +432,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" @@ -443,7 +443,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" @@ -503,7 +503,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" @@ -724,10 +724,10 @@ "+\t\tMAPLE_FUNC_MEMCARD);\n" "+\n" "+\t/* Make sure we are clear to go */\n" - "+\tif (atomic_read(&mdev->busy) == 1) {\n" + "+\tif (atomic_read(&mdev->busy) = 1) {\n" "+\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\tatomic_read(&mdev->busy) == 0, HZ);\n" - "+\t\tif (atomic_read(&mdev->busy) == 1) {\n" + "+\t\t\tatomic_read(&mdev->busy) = 0, HZ);\n" + "+\t\tif (atomic_read(&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" @@ -893,4 +893,4 @@ "+MODULE_AUTHOR(\"Adrian McMenamin\");\n" "+MODULE_DESCRIPTION(\"Flash mapping for Sega Dreamcast visual memory\");" -7e47c05b6d9af16e045790ae768d3ac27991f5dddd8531bb188b7e772da4e9bb +e20fb280351f6f8a757eeb6a58695bffd018b553d6de9f2cd377e60e96977bca
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.