Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A couple of fixes for pmd_mknotpresent()/pmd_present() for LPAE
systems"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8579/1: mm: Fix definition of pmd_mknotpresent
ARM: 8578/1: mm: ensure pmd_present only checks the valid bit
+4
-3
+1
arch/arm/include/asm/pgtable-2level.h
+1
arch/arm/include/asm/pgtable-2level.h
+3
-2
arch/arm/include/asm/pgtable-3level.h
+3
-2
arch/arm/include/asm/pgtable-3level.h
···
211
211
: !!(pmd_val(pmd) & (val)))
212
212
#define pmd_isclear(pmd, val) (!(pmd_val(pmd) & (val)))
213
213
214
+
#define pmd_present(pmd) (pmd_isset((pmd), L_PMD_SECT_VALID))
214
215
#define pmd_young(pmd) (pmd_isset((pmd), PMD_SECT_AF))
215
216
#define pte_special(pte) (pte_isset((pte), L_PTE_SPECIAL))
216
217
static inline pte_t pte_mkspecial(pte_t pte)
···
250
249
#define pfn_pmd(pfn,prot) (__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))
251
250
#define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot)
252
251
253
-
/* represent a notpresent pmd by zero, this is used by pmdp_invalidate */
252
+
/* represent a notpresent pmd by faulting entry, this is used by pmdp_invalidate */
254
253
static inline pmd_t pmd_mknotpresent(pmd_t pmd)
255
254
{
256
-
return __pmd(0);
255
+
return __pmd(pmd_val(pmd) & ~L_PMD_SECT_VALID);
257
256
}
258
257
259
258
static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)