diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-12 22:28:40 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-12 22:28:40 -0500 |
| commit | 64c911a3f7c9864a4bbddbb77b722d5553ddcd32 (patch) | |
| tree | 66439e7291710ce45c36c49eeb4a8ffeb068cc16 /include/asm-powerpc | |
| parent | 6e800af233e0bdf108efb7bd23c11ea6fa34cdeb (diff) | |
| parent | 725fb29fd4bcda958b32f4479ad9934117c22019 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/tlbflush.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/tlbflush.h b/include/asm-powerpc/tlbflush.h index e7b4c0d298..5c91081476 100644 --- a/include/asm-powerpc/tlbflush.h +++ b/include/asm-powerpc/tlbflush.h | |||
| @@ -44,13 +44,13 @@ static inline void flush_tlb_mm(struct mm_struct *mm) | |||
| 44 | static inline void flush_tlb_page(struct vm_area_struct *vma, | 44 | static inline void flush_tlb_page(struct vm_area_struct *vma, |
| 45 | unsigned long vmaddr) | 45 | unsigned long vmaddr) |
| 46 | { | 46 | { |
| 47 | _tlbie(vmaddr, vma->vm_mm->context.id); | 47 | _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0); |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | static inline void flush_tlb_page_nohash(struct vm_area_struct *vma, | 50 | static inline void flush_tlb_page_nohash(struct vm_area_struct *vma, |
| 51 | unsigned long vmaddr) | 51 | unsigned long vmaddr) |
| 52 | { | 52 | { |
| 53 | _tlbie(vmaddr, vma->vm_mm->context.id); | 53 | _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | static inline void flush_tlb_range(struct vm_area_struct *vma, | 56 | static inline void flush_tlb_range(struct vm_area_struct *vma, |