From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Scott Wood <scottwood@freescale•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
LEROY Christophe <christophe.leroy@c-s•fr>,
"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>
Subject: linux-next: manual merge of the akpm-current tree with the fsl tree
Date: Mon, 2 Feb 2015 19:02:09 +1100 [thread overview]
Message-ID: <20150202190209.122113bb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/powerpc/include/asm/pgtable-ppc32.h between commit ce67f5d0a00c
("powerpc32: Use kmem_cache memory for PGDIR") from the fsl tree and
commit f8b48f1a9895 ("powerpc: drop _PAGE_FILE and pte_file()-related
helpers") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/powerpc/include/asm/pgtable-ppc32.h
index 26ce0ab0a9e4,cc3e621aa830..000000000000
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@@ -342,14 -341,6 +342,9 @@@ static inline void __ptep_set_access_fl
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) >> 3 })
#define __swp_entry_to_pte(x) ((pte_t) { (x).val << 3 })
- /* Encode and decode a nonlinear file mapping entry */
- #define PTE_FILE_MAX_BITS 29
- #define pte_to_pgoff(pte) (pte_val(pte) >> 3)
- #define pgoff_to_pte(off) ((pte_t) { ((off) << 3) | _PAGE_FILE })
-
+#ifndef CONFIG_PPC_4K_PAGES
+void pgtable_cache_init(void);
+#else
/*
* No page table caches to initialise
*/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-02-02 8:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150202190209.122113bb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=christophe.leroy@c-s$(echo .)fr \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=scottwood@freescale$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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