diff for duplicates of <20190611073648.GA21522@lst.de> diff --git a/a/1.txt b/N1/1.txt index 8b19640..369878c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,9 +6,9 @@ On Tue, Jun 11, 2019 at 04:04:39PM +1000, Greg Ungerer wrote: >> * fix up the flags for the older format, there were all kinds >> * of endian hacks, this only works for the simple cases >> */ ->> - if (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags)) +>> - if (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags)) >> + if (IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM) && ->> + rev == OLD_FLAT_VERSION) +>> + rev = OLD_FLAT_VERSION) > > The flags are from the binary file header here, so this is going to lose > that check for most platforms (except h8300 where it would always have @@ -16,12 +16,12 @@ On Tue, Jun 11, 2019 at 04:04:39PM +1000, Greg Ungerer wrote: Indeed. The old code is: - if (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags)) + if (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags)) flags = FLAT_FLAG_RAM; which for !h8300 evaluates to: - if (rev == OLD_FLAT_VERSION && flags) + if (rev = OLD_FLAT_VERSION && flags) flags = FLAT_FLAG_RAM; so basically if any flag was set it was turned into FLAT_FLAG_RAM. @@ -30,11 +30,6 @@ point in changing this historic behavior now. So I guess what we could do it something like: - if (rev == OLD_FLAT_VERSION && + if (rev = OLD_FLAT_VERSION && (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM))) flags = FLAT_FLAG_RAM; - -_______________________________________________ -linux-riscv mailing list -linux-riscv@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-riscv diff --git a/a/content_digest b/N1/content_digest index 84ca225..3de4d25 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0b1ce6fc6-343c-7686-b4f4-35a305dc2adb@linux-m68k.org\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH 04/15] binfmt_flat: remove flat_old_ram_flag\0" - "Date\0Tue, 11 Jun 2019 09:36:48 +0200\0" + "Date\0Tue, 11 Jun 2019 07:36:48 +0000\0" "To\0Greg Ungerer <gerg@linux-m68k.org>\0" "Cc\0uclinux-h8-devel@lists.sourceforge.jp" linux-xtensa@linux-xtensa.org @@ -25,9 +25,9 @@ ">> \t * fix up the flags for the older format, there were all kinds\n" ">> \t * of endian hacks, this only works for the simple cases\n" ">> \t */\n" - ">> -\tif (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n" + ">> -\tif (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n" ">> +\tif (IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM) &&\n" - ">> +\t rev == OLD_FLAT_VERSION)\n" + ">> +\t rev = OLD_FLAT_VERSION)\n" ">\n" "> The flags are from the binary file header here, so this is going to lose\n" "> that check for most platforms (except h8300 where it would always have\n" @@ -35,12 +35,12 @@ "\n" "Indeed. The old code is:\n" "\n" - "\tif (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n" + "\tif (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n" "\t\tflags = FLAT_FLAG_RAM;\n" "\n" "which for !h8300 evaluates to:\n" "\n" - "\tif (rev == OLD_FLAT_VERSION && flags)\n" + "\tif (rev = OLD_FLAT_VERSION && flags)\n" "\t\tflags = FLAT_FLAG_RAM;\n" "\n" "so basically if any flag was set it was turned into FLAT_FLAG_RAM.\n" @@ -49,13 +49,8 @@ "\n" "So I guess what we could do it something like:\n" "\n" - "\tif (rev == OLD_FLAT_VERSION &&\n" + "\tif (rev = OLD_FLAT_VERSION &&\n" "\t (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))\n" - "\t\tflags = FLAT_FLAG_RAM;\n" - "\n" - "_______________________________________________\n" - "linux-riscv mailing list\n" - "linux-riscv@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-riscv + "\t\tflags = FLAT_FLAG_RAM;" -207d4caac0ec8cc4e00a012fa8d594cf55feaf4ef0bc9a5041e2f0ff61498d0a +5ef398d3997ea987715112cb6ce1001cb26e1da3448163523d79e11c4923957b
diff --git a/a/1.txt b/N2/1.txt index 8b19640..d410ca6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -35,6 +35,6 @@ So I guess what we could do it something like: flags = FLAT_FLAG_RAM; _______________________________________________ -linux-riscv mailing list -linux-riscv@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-riscv +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 84ca225..4679989 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -54,8 +54,8 @@ "\t\tflags = FLAT_FLAG_RAM;\n" "\n" "_______________________________________________\n" - "linux-riscv mailing list\n" - "linux-riscv@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-riscv + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -207d4caac0ec8cc4e00a012fa8d594cf55feaf4ef0bc9a5041e2f0ff61498d0a +32d8bffa174423782d32df2a9cf0b18208467642f76aed78d9d4386830c14c38
diff --git a/a/1.txt b/N3/1.txt index 8b19640..a3c3279 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -33,8 +33,3 @@ So I guess what we could do it something like: if (rev == OLD_FLAT_VERSION && (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM))) flags = FLAT_FLAG_RAM; - -_______________________________________________ -linux-riscv mailing list -linux-riscv@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-riscv diff --git a/a/content_digest b/N3/content_digest index 84ca225..3a8c31e 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -5,16 +5,16 @@ "Subject\0Re: [PATCH 04/15] binfmt_flat: remove flat_old_ram_flag\0" "Date\0Tue, 11 Jun 2019 09:36:48 +0200\0" "To\0Greg Ungerer <gerg@linux-m68k.org>\0" - "Cc\0uclinux-h8-devel@lists.sourceforge.jp" - linux-xtensa@linux-xtensa.org + "Cc\0Christoph Hellwig <hch@lst.de>" Michal Simek <monstr@monstr.eu> + linux-arm-kernel@lists.infradead.org linux-c6x-dev@linux-c6x.org - linux-sh@vger.kernel.org - linux-kernel@vger.kernel.org + uclinux-h8-devel@lists.sourceforge.jp linux-m68k@lists.linux-m68k.org linux-riscv@lists.infradead.org - Christoph Hellwig <hch@lst.de> - " linux-arm-kernel@lists.infradead.org\0" + linux-sh@vger.kernel.org + linux-xtensa@linux-xtensa.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, Jun 11, 2019 at 04:04:39PM +1000, Greg Ungerer wrote:\n" @@ -51,11 +51,6 @@ "\n" "\tif (rev == OLD_FLAT_VERSION &&\n" "\t (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))\n" - "\t\tflags = FLAT_FLAG_RAM;\n" - "\n" - "_______________________________________________\n" - "linux-riscv mailing list\n" - "linux-riscv@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-riscv + "\t\tflags = FLAT_FLAG_RAM;" -207d4caac0ec8cc4e00a012fa8d594cf55feaf4ef0bc9a5041e2f0ff61498d0a +ed9b3a953115d89b9c837f66e4e83119e4952cb5ebd07f9174a72c8fc7696c99
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.