diff for duplicates of <1472021685.4578.0.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index a450243..f3cb5dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,17 +17,17 @@ On ti, 2016-08-23 at 22:22 +0200, Daniel Vetter wrote: > Cc: linux-mm@kvack.org > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- -> include/linux/io-mapping.h | 6 ++++++ -> 1 file changed, 6 insertions(+) +> A include/linux/io-mapping.h | 6 ++++++ +> A 1 file changed, 6 insertions(+) > > diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h > index a87dd7fffc0a..f4e33756c09c 100644 > --- a/include/linux/io-mapping.h > +++ b/include/linux/io-mapping.h > @@ -123,7 +123,13 @@ io_mapping_init_wc(struct io_mapping *iomap, -> iomap->base = base; -> iomap->size = size; -> iomap->iomem = ioremap_wc(base, size); +> A iomap->base = base; +> A iomap->size = size; +> A iomap->iomem = ioremap_wc(base, size); > +#ifdef pgprot_noncached_wc /* archs can't agree on a name ... */ > + iomap->prot = pgprot_noncached_wc(PAGE_KERNEL); > +#elif pgprot_writecombine @@ -36,13 +36,13 @@ Maybe you meant #elif defined pgprot_writecombine? Regards, Joonas -> iomap->prot = pgprot_writecombine(PAGE_KERNEL); +> A iomap->prot = pgprot_writecombine(PAGE_KERNEL); > +#else > + iomap->prot = pgprot_noncached(PAGE_KERNEL); > +#endif -> -> return iomap; -> } +> A +> A return iomap; +> A } -- Joonas Lahtinen Open Source Technology Center diff --git a/a/content_digest b/N1/content_digest index 8713526..f76e1eb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -28,17 +28,17 @@ "> Cc: linux-mm@kvack.org\n" "> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>\n" "> ---\n" - "> \302\240include/linux/io-mapping.h | 6 ++++++\n" - "> \302\2401 file changed, 6 insertions(+)\n" + "> A include/linux/io-mapping.h | 6 ++++++\n" + "> A 1 file changed, 6 insertions(+)\n" "> \n" "> diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h\n" "> index a87dd7fffc0a..f4e33756c09c 100644\n" "> --- a/include/linux/io-mapping.h\n" "> +++ b/include/linux/io-mapping.h\n" "> @@ -123,7 +123,13 @@ io_mapping_init_wc(struct io_mapping *iomap,\n" - "> \302\240\tiomap->base = base;\n" - "> \302\240\tiomap->size = size;\n" - "> \302\240\tiomap->iomem = ioremap_wc(base, size);\n" + "> A \tiomap->base = base;\n" + "> A \tiomap->size = size;\n" + "> A \tiomap->iomem = ioremap_wc(base, size);\n" "> +#ifdef pgprot_noncached_wc /* archs can't agree on a name ... */\n" "> +\tiomap->prot = pgprot_noncached_wc(PAGE_KERNEL);\n" "> +#elif pgprot_writecombine\n" @@ -47,13 +47,13 @@ "\n" "Regards, Joonas\n" "\n" - "> \302\240\tiomap->prot = pgprot_writecombine(PAGE_KERNEL);\n" + "> A \tiomap->prot = pgprot_writecombine(PAGE_KERNEL);\n" "> +#else\n" "> +\tiomap->prot = pgprot_noncached(PAGE_KERNEL);\n" "> +#endif\n" - "> \302\240\n" - "> \302\240\treturn iomap;\n" - "> \302\240}\n" + "> A \n" + "> A \treturn iomap;\n" + "> A }\n" "-- \n" "Joonas Lahtinen\n" "Open Source Technology Center\n" @@ -65,4 +65,4 @@ "see: http://www.linux-mm.org/ .\n" "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -3ae15181aa87207a4232cbc1fbc6d6ab367c13706926340a0240f04a9bf31af2 +4f671eb378951fe593036a822eae5bff6477cae2f0cb205cf3501ddecc95b7dd
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.