diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-frv/pgtable.h | |
parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-frv/pgtable.h')
-rw-r--r-- | include/asm-frv/pgtable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h index 3c6d42a22dfe..d0a9c2f9c13e 100644 --- a/include/asm-frv/pgtable.h +++ b/include/asm-frv/pgtable.h | |||
@@ -349,9 +349,9 @@ static inline pmd_t *pmd_offset(pud_t *dir, unsigned long address) | |||
349 | 349 | ||
350 | /* | 350 | /* |
351 | * Define this to warn about kernel memory accesses that are | 351 | * Define this to warn about kernel memory accesses that are |
352 | * done without a 'verify_area(VERIFY_WRITE,..)' | 352 | * done without a 'access_ok(VERIFY_WRITE,..)' |
353 | */ | 353 | */ |
354 | #undef TEST_VERIFY_AREA | 354 | #undef TEST_ACCESS_OK |
355 | 355 | ||
356 | #define pte_present(x) (pte_val(x) & _PAGE_PRESENT) | 356 | #define pte_present(x) (pte_val(x) & _PAGE_PRESENT) |
357 | #define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0) | 357 | #define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0) |