diff for duplicates of <1523957852.3250.9.camel@HansenPartnership.com> diff --git a/a/1.txt b/N1/1.txt index fa41dca..131a493 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,8 +28,8 @@ James > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > --- -> arch/parisc/include/asm/io.h | 23 +++++++++++++++++++---- -> 1 file changed, 19 insertions(+), 4 deletions(-) +> ?arch/parisc/include/asm/io.h | 23 +++++++++++++++++++---- +> ?1 file changed, 19 insertions(+), 4 deletions(-) > > diff --git a/arch/parisc/include/asm/io.h > b/arch/parisc/include/asm/io.h @@ -38,44 +38,44 @@ James > +++ b/arch/parisc/include/asm/io.h > @@ -179,19 +179,34 @@ static inline void __raw_writeq(unsigned long > long b, volatile void __iomem *add -> -> static inline unsigned char readb(const volatile void __iomem *addr) -> { +> ? +> ?static inline unsigned char readb(const volatile void __iomem *addr) +> ?{ > - return __raw_readb(addr); > + unsigned char ret; > + > + ret = __raw_readb(addr); > + barrier(); > + return ret; -> } -> static inline unsigned short readw(const volatile void __iomem +> ?} +> ?static inline unsigned short readw(const volatile void __iomem > *addr) -> { +> ?{ > - return le16_to_cpu((__le16 __force) __raw_readw(addr)); > + unsigned short ret; > + > + ret = le16_to_cpu((__le16 __force) __raw_readw(addr)); > + barrier(); > + return ret; -> } -> static inline unsigned int readl(const volatile void __iomem *addr) -> { +> ?} +> ?static inline unsigned int readl(const volatile void __iomem *addr) +> ?{ > - return le32_to_cpu((__le32 __force) __raw_readl(addr)); > + unsigned int ret; > + ret = le32_to_cpu((__le32 __force) __raw_readl(addr)); > + barrier(); > + return ret; -> } -> static inline unsigned long long readq(const volatile void __iomem +> ?} +> ?static inline unsigned long long readq(const volatile void __iomem > *addr) -> { +> ?{ > - return le64_to_cpu((__le64 __force) __raw_readq(addr)); > + unsigned long long ret; > + > + ret = le64_to_cpu((__le64 __force) __raw_readq(addr)); > + barrier(); > + return ret; -> } -> -> static inline void writeb(unsigned char b, volatile void __iomem +> ?} +> ? +> ?static inline void writeb(unsigned char b, volatile void __iomem > *addr) diff --git a/a/content_digest b/N1/content_digest index 54bb50e..af6900f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,9 @@ "ref\01523938133-3224-1-git-send-email-okaya@codeaurora.org\0" "ref\01523938133-3224-2-git-send-email-okaya@codeaurora.org\0" - "From\0James Bottomley <James.Bottomley@hansenpartnership.com>\0" - "Subject\0Re: [PATCH v2 2/2] parisc: define stronger ordering for the default readX()\0" + "From\0James.Bottomley@hansenpartnership.com (James Bottomley)\0" + "Subject\0[PATCH v2 2/2] parisc: define stronger ordering for the default readX()\0" "Date\0Tue, 17 Apr 2018 10:37:32 +0100\0" - "To\0Sinan Kaya <okaya@codeaurora.org>" - linux-parisc@vger.kernel.org - arnd@arndb.de - timur@codeaurora.org - " sulrich@codeaurora.org\0" - "Cc\0linux-arm-msm@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - Helge Deller <deller@gmx.de> - Philippe Ombredanne <pombredanne@nexb.com> - Kate Stewart <kstewart@linuxfoundation.org> - Thomas Gleixner <tglx@linutronix.de> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2018-04-17 at 00:08 -0400, Sinan Kaya wrote:\n" @@ -48,8 +36,8 @@ "\n" "> Signed-off-by: Sinan Kaya <okaya@codeaurora.org>\n" "> ---\n" - "> \302\240arch/parisc/include/asm/io.h | 23 +++++++++++++++++++----\n" - "> \302\2401 file changed, 19 insertions(+), 4 deletions(-)\n" + "> ?arch/parisc/include/asm/io.h | 23 +++++++++++++++++++----\n" + "> ?1 file changed, 19 insertions(+), 4 deletions(-)\n" "> \n" "> diff --git a/arch/parisc/include/asm/io.h\n" "> b/arch/parisc/include/asm/io.h\n" @@ -58,46 +46,46 @@ "> +++ b/arch/parisc/include/asm/io.h\n" "> @@ -179,19 +179,34 @@ static inline void __raw_writeq(unsigned long\n" "> long b, volatile void __iomem *add\n" - "> \302\240\n" - "> \302\240static inline unsigned char readb(const volatile void __iomem *addr)\n" - "> \302\240{\n" + "> ?\n" + "> ?static inline unsigned char readb(const volatile void __iomem *addr)\n" + "> ?{\n" "> -\treturn __raw_readb(addr);\n" "> +\tunsigned char ret;\n" "> +\n" "> +\tret = __raw_readb(addr);\n" "> +\tbarrier();\n" "> +\treturn ret;\n" - "> \302\240}\n" - "> \302\240static inline unsigned short readw(const volatile void __iomem\n" + "> ?}\n" + "> ?static inline unsigned short readw(const volatile void __iomem\n" "> *addr)\n" - "> \302\240{\n" + "> ?{\n" "> -\treturn le16_to_cpu((__le16 __force) __raw_readw(addr));\n" "> +\tunsigned short ret;\n" "> +\n" "> +\tret = le16_to_cpu((__le16 __force) __raw_readw(addr));\n" "> +\tbarrier();\n" "> +\treturn ret;\n" - "> \302\240}\n" - "> \302\240static inline unsigned int readl(const volatile void __iomem *addr)\n" - "> \302\240{\n" + "> ?}\n" + "> ?static inline unsigned int readl(const volatile void __iomem *addr)\n" + "> ?{\n" "> -\treturn le32_to_cpu((__le32 __force) __raw_readl(addr));\n" "> +\tunsigned int ret;\n" "> +\tret = le32_to_cpu((__le32 __force) __raw_readl(addr));\n" "> +\tbarrier();\n" "> +\treturn ret;\n" - "> \302\240}\n" - "> \302\240static inline unsigned long long readq(const volatile void __iomem\n" + "> ?}\n" + "> ?static inline unsigned long long readq(const volatile void __iomem\n" "> *addr)\n" - "> \302\240{\n" + "> ?{\n" "> -\treturn le64_to_cpu((__le64 __force) __raw_readq(addr));\n" "> +\tunsigned long long ret;\n" "> +\n" "> +\tret = le64_to_cpu((__le64 __force) __raw_readq(addr));\n" "> +\tbarrier();\n" "> +\treturn ret;\n" - "> \302\240}\n" - "> \302\240\n" - "> \302\240static inline void writeb(unsigned char b, volatile void __iomem\n" + "> ?}\n" + "> ?\n" + "> ?static inline void writeb(unsigned char b, volatile void __iomem\n" > *addr) -10ffdc81ac658a1bcaafc7f19775fea78abe5181486cdaf3f712c8f51e30ff8a +d8959960cf5a0c8b994e3fdeca1d5aa7b268f6fcbe6ff3fccc311ec36b75517b
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.