* [PATCH] powerpc: remove newly added extra definition of pmd_dirty
@ 2016-01-21 2:05 Stephen Rothwell
2016-01-21 3:57 ` Minchan Kim
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stephen Rothwell @ 2016-01-21 2:05 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt
Cc: linuxppc-dev, Minchan Kim, Andrew Morton
Commit d5d6a443b243 ("arch/powerpc/include/asm/pgtable-ppc64.h:
add pmd_[dirty|mkclean] for THP") added a new identical definition
of pdm_dirty. Remove it again.
Cc: Minchan Kim <minchan@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/include/asm/book3s/64/pgtable.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
index 8204b0c393aa..8d1c41d28318 100644
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -223,7 +223,6 @@ static inline pte_t *pmdp_ptep(pmd_t *pmd)
#define pmd_pfn(pmd) pte_pfn(pmd_pte(pmd))
#define pmd_dirty(pmd) pte_dirty(pmd_pte(pmd))
#define pmd_young(pmd) pte_young(pmd_pte(pmd))
-#define pmd_dirty(pmd) pte_dirty(pmd_pte(pmd))
#define pmd_mkold(pmd) pte_pmd(pte_mkold(pmd_pte(pmd)))
#define pmd_wrprotect(pmd) pte_pmd(pte_wrprotect(pmd_pte(pmd)))
#define pmd_mkdirty(pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd)))
--
2.7.0.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] powerpc: remove newly added extra definition of pmd_dirty
2016-01-21 2:05 [PATCH] powerpc: remove newly added extra definition of pmd_dirty Stephen Rothwell
@ 2016-01-21 3:57 ` Minchan Kim
2016-01-21 4:45 ` Michael Ellerman
2016-01-21 5:34 ` Michael Ellerman
2 siblings, 0 replies; 4+ messages in thread
From: Minchan Kim @ 2016-01-21 3:57 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev,
Andrew Morton
On Thu, Jan 21, 2016 at 01:05:20PM +1100, Stephen Rothwell wrote:
> Commit d5d6a443b243 ("arch/powerpc/include/asm/pgtable-ppc64.h:
> add pmd_[dirty|mkclean] for THP") added a new identical definition
> of pdm_dirty. Remove it again.
>
> Cc: Minchan Kim <minchan@kernel.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thanks for the fix!
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] powerpc: remove newly added extra definition of pmd_dirty
2016-01-21 2:05 [PATCH] powerpc: remove newly added extra definition of pmd_dirty Stephen Rothwell
2016-01-21 3:57 ` Minchan Kim
@ 2016-01-21 4:45 ` Michael Ellerman
2016-01-21 5:34 ` Michael Ellerman
2 siblings, 0 replies; 4+ messages in thread
From: Michael Ellerman @ 2016-01-21 4:45 UTC (permalink / raw)
To: Stephen Rothwell, Benjamin Herrenschmidt
Cc: linuxppc-dev, Minchan Kim, Andrew Morton
On Thu, 2016-01-21 at 13:05 +1100, Stephen Rothwell wrote:
> Commit d5d6a443b243 ("arch/powerpc/include/asm/pgtable-ppc64.h:
> add pmd_[dirty|mkclean] for THP") added a new identical definition
> of pdm_dirty. Remove it again.
>
> Cc: Minchan Kim <minchan@kernel.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thanks.
I have a couple of other things to send to Linus so I'll pick this up.
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: powerpc: remove newly added extra definition of pmd_dirty
2016-01-21 2:05 [PATCH] powerpc: remove newly added extra definition of pmd_dirty Stephen Rothwell
2016-01-21 3:57 ` Minchan Kim
2016-01-21 4:45 ` Michael Ellerman
@ 2016-01-21 5:34 ` Michael Ellerman
2 siblings, 0 replies; 4+ messages in thread
From: Michael Ellerman @ 2016-01-21 5:34 UTC (permalink / raw)
To: Stephen Rothwell, Benjamin Herrenschmidt
Cc: Minchan Kim, Andrew Morton, linuxppc-dev
On Thu, 2016-21-01 at 02:05:20 UTC, Stephen Rothwell wrote:
> Commit d5d6a443b243 ("arch/powerpc/include/asm/pgtable-ppc64.h:
> add pmd_[dirty|mkclean] for THP") added a new identical definition
> of pdm_dirty. Remove it again.
>
> Cc: Minchan Kim <minchan@kernel.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/0e2bce7411542fa336ef490414
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-21 5:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-21 2:05 [PATCH] powerpc: remove newly added extra definition of pmd_dirty Stephen Rothwell
2016-01-21 3:57 ` Minchan Kim
2016-01-21 4:45 ` Michael Ellerman
2016-01-21 5:34 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).