From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
<linuxppc-dev@lists.ozlabs.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: linux-next: manual merge of the akpm-current tree with the powerpc tree
Date: Tue, 15 Dec 2015 16:53:42 +1100 [thread overview]
Message-ID: <20151215165342.15bb4526@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in:
arch/powerpc/include/asm/nohash/64/pgtable.h
arch/powerpc/mm/pgtable_64.c
between various commits from the powerpc tree and commits:
e56ebae0dd4c ("powerpc, thp: remove infrastructure for handling splitting PMDs")
from the akpm-current tree.
I used the powerpc tree version of the first and the akpm-current tree
version of the second and then I applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Dec 2015 16:50:42 +1100
Subject: [PATCH] merge fix for "powerpc, thp: remove infrastructure for
handling splitting PMDs"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/include/asm/book3s/64/hash-64k.h | 12 ------------
arch/powerpc/include/asm/book3s/64/hash.h | 10 ++--------
arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ----
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h
index 9f9942998587..f2072a4ca9e3 100644
--- a/arch/powerpc/include/asm/book3s/64/hash-64k.h
+++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h
@@ -256,13 +256,6 @@ static inline int pmd_trans_huge(pmd_t pmd)
(_PAGE_PTE | _PAGE_THP_HUGE));
}
-static inline int pmd_trans_splitting(pmd_t pmd)
-{
- if (pmd_trans_huge(pmd))
- return pmd_val(pmd) & _PAGE_SPLITTING;
- return 0;
-}
-
static inline int pmd_large(pmd_t pmd)
{
return !!(pmd_val(pmd) & _PAGE_PTE);
@@ -273,11 +266,6 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd)
return __pmd(pmd_val(pmd) & ~_PAGE_PRESENT);
}
-static inline pmd_t pmd_mksplitting(pmd_t pmd)
-{
- return __pmd(pmd_val(pmd) | _PAGE_SPLITTING);
-}
-
#define __HAVE_ARCH_PMD_SAME
static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)
{
diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h
index 8b929e531758..4e69d9a273ed 100644
--- a/arch/powerpc/include/asm/book3s/64/hash.h
+++ b/arch/powerpc/include/asm/book3s/64/hash.h
@@ -35,11 +35,6 @@
#define _PAGE_SPECIAL 0x10000 /* software: special page */
/*
- * THP pages can't be special. So use the _PAGE_SPECIAL
- */
-#define _PAGE_SPLITTING _PAGE_SPECIAL
-
-/*
* We need to differentiate between explicit huge page and THP huge
* page, since THP huge page also need to track real subpage details
*/
@@ -48,9 +43,8 @@
/*
* set of bits not changed in pmd_modify.
*/
-#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \
- _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \
- _PAGE_THP_HUGE | _PAGE_PTE)
+#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY |
+ _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE)
#ifdef CONFIG_PPC_64K_PAGES
#include <asm/book3s/64/hash-64k.h>
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
index a2d4e0e37067..6306d6565ee0 100644
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -232,10 +232,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
extern pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
unsigned long addr, pmd_t *pmdp);
-#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
-extern void pmdp_splitting_flush(struct vm_area_struct *vma,
- unsigned long address, pmd_t *pmdp);
-
extern pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,
unsigned long address, pmd_t *pmdp);
#define pmdp_collapse_flush pmdp_collapse_flush
--
2.6.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-12-15 5:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-15 5:53 Stephen Rothwell [this message]
2015-12-15 6:44 ` linux-next: manual merge of the akpm-current tree with the powerpc tree Stephen Rothwell
2015-12-15 9:37 ` Aneesh Kumar K.V
2015-12-18 5:33 Stephen Rothwell
2016-01-07 9:15 ` Stephen Rothwell
2016-01-07 17:15 ` Aneesh Kumar K.V
2016-01-07 20:03 ` Stephen Rothwell
2016-03-04 7:49 Stephen Rothwell
2018-12-06 6:44 Stephen Rothwell
2018-12-07 1:40 ` Joel Fernandes
2019-02-25 6:16 Stephen Rothwell
2019-02-25 6:42 Stephen Rothwell
2019-02-25 6:44 ` Stephen Rothwell
2019-04-23 8:57 Stephen Rothwell
2019-07-08 11:43 Stephen Rothwell
2020-06-03 8:50 Stephen Rothwell
2020-09-17 8:57 Stephen Rothwell
2020-12-08 9:40 Stephen Rothwell
2020-12-17 0:48 ` Stephen Rothwell
2021-04-15 9:44 Stephen Rothwell
2021-04-15 9:58 ` Stephen Rothwell
2021-04-15 10:07 ` Christophe Leroy
2021-04-15 10:08 ` Christophe Leroy
2021-04-15 10:15 ` Christophe Leroy
2021-05-05 1:39 Stephen Rothwell
2021-05-05 4:57 ` Michael Ellerman
2021-05-05 5:46 ` Stephen Rothwell
2021-05-05 23:43 ` Stephen Rothwell
2021-06-18 9:44 Stephen Rothwell
2021-06-19 2:54 ` Nicholas Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151215165342.15bb4526@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).