linux-next: manual merge of the akpm-current tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2125 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  include/asm-generic/pgtable.h

between commits:

  42e4089c7890 ("x86/speculation/l1tf: Disallow non privileged high MMIO PROT_NONE mappings")
  6c26fcd2abfe ("x86/speculation/l1tf: Unbreak !__HAVE_ARCH_PFN_MODIFY_ALLOWED architectures")

from Linus' tree and commit:

  c235da45bb89 ("mm: provide a fallback for PAGE_KERNEL_RO for architectures")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/asm-generic/pgtable.h
index a75cb371cd19,81371468ed5a..000000000000
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@@ -1083,18 -1083,24 +1083,36 @@@ int phys_mem_access_prot_allowed(struc
  static inline void init_espfix_bsp(void) { }
  #endif
  
 +#ifndef __HAVE_ARCH_PFN_MODIFY_ALLOWED
 +static inline bool pfn_modify_allowed(unsigned long pfn, pgprot_t prot)
 +{
 +	return true;
 +}
 +
 +static inline bool arch_has_pfn_modify_check(void)
 +{
 +	return false;
 +}
 +#endif /* !_HAVE_ARCH_PFN_MODIFY_ALLOWED */
 +
+ /*
+  * Architecture PAGE_KERNEL_* fallbacks
+  *
+  * Some architectures don't define certain PAGE_KERNEL_* flags. This is either
+  * because they really don't support them, or the port needs to be updated to
+  * reflect the required functionality. Below are a set of relatively safe
+  * fallbacks, as best effort, which we can count on in lieu of the architectures
+  * not defining them on their own yet.
+  */
+ 
+ #ifndef PAGE_KERNEL_RO
+ # define PAGE_KERNEL_RO PAGE_KERNEL
+ #endif
+ 
+ #ifndef PAGE_KERNEL_EXEC
+ # define PAGE_KERNEL_EXEC PAGE_KERNEL
+ #endif
+ 
  #endif /* !__ASSEMBLY__ */
  
  #ifndef io_remap_pfn_range

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]