Fix bad_pte warning caused by pte_mkdevmap() not setting PTE_SPECIAL.

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE5RElWfyWxS+3PLO2a9axLQDIXvEFAl1Nk9sACgkQa9axLQDI
 XvE2AQ//Stv9vYR6qQ+Xk+Olu5MxunH6JzucwfXxBz2IGuyFeO+17bNmGmkfEOFS
 renb4HXcpcICswRrxPb53wWoy8UTFCkoCPIjE17oi9qTRAuLLIPrKWipvbyadLRW
 53yHr654bMW9mYMF9bgU9yL4BO8gMQcJH/8yUwa8fYypATGMCAvGtOuo6cf96zL4
 yLUqQeiF7dLBCC5yCM4T9lTVdarjkyNXWiXzMpvw3NkuW7q5Q2UHDjWt4Y7IPYEQ
 7qwqiyh87z7MHzLq6p74Cr9nlEBHzUq+a2tR2/zsLiEnTgN7hIJzMhl3aBC9/Ulw
 Hn49PO/75vt28ilpyVMww8vOY7LLFJPRpMkk90sUDJInSh1JpMwV9kyL9U+ywE0V
 VU4FT73DqNhCy4GO7n9iHDFH2/i/IbR7hNMZtSkQtqCYutsGJpEFVawEH7BktLi2
 UM9psZsJnvVj2qUmZvMWISdkOsS3fTbQCy/ZGUN3KnMfjFLuHiS324VKrwc3Fiif
 oEov8hyd8CrIrnAesJezZMPLMTB+K5T2TCPihuCPE85LBE8e9xHLX9M0c1OsKwuh
 rqaAlazrdJq9BXR8VKvHiiSutH57sWHUS9tHbVmWOFllTUzhKMDavTQrexPZnJKL
 kAb3SnLHZwEDlrfhCdSbtPXIdgXg40vuw2k6TJ82QPXl5dBRe2o=
 =rPgA
 -----END PGP SIGNATURE-----

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fix from Catalin Marinas:
 "Fix bad_pte warning caused by pte_mkdevmap() not setting PTE_SPECIAL"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: add missing PTE_SPECIAL in pte_mkdevmap on arm64

arch/arm64/include/asm/pgtable.h

@@ -209,7 +209,7 @@ static inline pmd_t pmd_mkcont(pmd_t pmd)
 
 static inline pte_t pte_mkdevmap(pte_t pte)
 {
-	return set_pte_bit(pte, __pgprot(PTE_DEVMAP));
+	return set_pte_bit(pte, __pgprot(PTE_DEVMAP | PTE_SPECIAL));
 }
 
 static inline void set_pte(pte_t *ptep, pte_t pte)
@@ -396,7 +396,10 @@ static inline int pmd_protnone(pmd_t pmd)
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 #define pmd_devmap(pmd)		pte_devmap(pmd_pte(pmd))
 #endif
-#define pmd_mkdevmap(pmd)	pte_pmd(pte_mkdevmap(pmd_pte(pmd)))
+static inline pmd_t pmd_mkdevmap(pmd_t pmd)
+{
+	return pte_pmd(set_pte_bit(pmd_pte(pmd), __pgprot(PTE_DEVMAP)));
+}
 
 #define __pmd_to_phys(pmd)	__pte_to_phys(pmd_pte(pmd))
 #define __phys_to_pmd_val(phys)	__phys_to_pte_val(phys)