Commit 8328bd49 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 59635f61 5348e731
...@@ -73,7 +73,7 @@ static inline void tlb_flush_mmu(struct mmu_gather *mp) ...@@ -73,7 +73,7 @@ static inline void tlb_flush_mmu(struct mmu_gather *mp)
extern void smp_flush_tlb_mm(struct mm_struct *mm); extern void smp_flush_tlb_mm(struct mm_struct *mm);
#define do_flush_tlb_mm(mm) smp_flush_tlb_mm(mm) #define do_flush_tlb_mm(mm) smp_flush_tlb_mm(mm)
#else #else
#define do_flush_tlb_mm(mm) __flush_tlb_mm(CTX_HWBITS(mm), SECONDARY_CONTEXT) #define do_flush_tlb_mm(mm) __flush_tlb_mm(CTX_HWBITS(mm->context), SECONDARY_CONTEXT)
#endif #endif
static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, unsigned long end) static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, unsigned long end)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment