diff options
author | Michal Simek <monstr@monstr.eu> | 2011-01-16 07:56:53 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2011-01-16 08:29:41 -0500 |
commit | 658b368da198a1436c7d6a0f1f4029d3c6e30b20 (patch) | |
tree | 91451f814f2d9337b43d577d59cba0c7db96b43f /arch | |
parent | 1947fc1d51fa7c21e9c253d37d076ef6f4d73130 (diff) |
microblaze: Fix asm/pgtable.h
Function ptep_test_and_clear_young have had wrong the first argument.
It is also necessary to add __HAVE macros for ptep_test_and_clear_young and
ptep_get_and_clear functions.
Error log:
In file included from linux/arch/microblaze/include/asm/pgtable.h:570,
from arch/microblaze/mm/pgtable.c:35:
include/asm-generic/pgtable.h:23: error: conflicting types for 'ptep_test_and_clear_young'
linux/arch/microblaze/include/asm/pgtable.h:449: error:
previous definition of 'ptep_test_and_clear_young' was here
include/asm-generic/pgtable.h:73: error: redefinition of 'ptep_get_and_clear'
linux/arch/microblaze/include/asm/pgtable.h:462: error:
previous definition of 'ptep_get_and_clear' was here
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/pgtable.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index cae268c22ba2..b23f68075879 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h | |||
@@ -444,8 +444,9 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, | |||
444 | *ptep = pte; | 444 | *ptep = pte; |
445 | } | 445 | } |
446 | 446 | ||
447 | static inline int ptep_test_and_clear_young(struct mm_struct *mm, | 447 | #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG |
448 | unsigned long addr, pte_t *ptep) | 448 | static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, |
449 | unsigned long address, pte_t *ptep) | ||
449 | { | 450 | { |
450 | return (pte_update(ptep, _PAGE_ACCESSED, 0) & _PAGE_ACCESSED) != 0; | 451 | return (pte_update(ptep, _PAGE_ACCESSED, 0) & _PAGE_ACCESSED) != 0; |
451 | } | 452 | } |
@@ -457,6 +458,7 @@ static inline int ptep_test_and_clear_dirty(struct mm_struct *mm, | |||
457 | (_PAGE_DIRTY | _PAGE_HWWRITE), 0) & _PAGE_DIRTY) != 0; | 458 | (_PAGE_DIRTY | _PAGE_HWWRITE), 0) & _PAGE_DIRTY) != 0; |
458 | } | 459 | } |
459 | 460 | ||
461 | #define __HAVE_ARCH_PTEP_GET_AND_CLEAR | ||
460 | static inline pte_t ptep_get_and_clear(struct mm_struct *mm, | 462 | static inline pte_t ptep_get_and_clear(struct mm_struct *mm, |
461 | unsigned long addr, pte_t *ptep) | 463 | unsigned long addr, pte_t *ptep) |
462 | { | 464 | { |