Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a25cecce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix asm/pgtable.h
  microblaze: Fix missing pagemap.h
parents b7c15e4a 658b368d

arch/microblaze/include/asm/pgtable.h

+4 −2
Original line number Diff line number Diff line
@@ -444,8 +444,9 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, 
	*ptep = pte;

}



static inline int ptep_test_and_clear_young(struct mm_struct *mm,

		unsigned long addr, pte_t *ptep)

#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,

		unsigned long address, pte_t *ptep)

{

	return (pte_update(ptep, _PAGE_ACCESSED, 0) & _PAGE_ACCESSED) != 0;

}
@@ -457,6 +458,7 @@ static inline int ptep_test_and_clear_dirty(struct mm_struct *mm, 
		(_PAGE_DIRTY | _PAGE_HWWRITE), 0) & _PAGE_DIRTY) != 0;

}



#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

static inline pte_t ptep_get_and_clear(struct mm_struct *mm,

		unsigned long addr, pte_t *ptep)

{

arch/microblaze/include/asm/tlb.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#define tlb_flush(tlb)	flush_tlb_mm((tlb)->mm)



#include <linux/pagemap.h>

#include <asm-generic/tlb.h>



#ifdef CONFIG_MMU