diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-13 04:28:40 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-13 04:28:40 +0100 |
| commit | 64c911a3f7c9864a4bbddbb77b722d5553ddcd32 (patch) | |
| tree | 66439e7291710ce45c36c49eeb4a8ffeb068cc16 /include | |
| parent | ACPI: add documentation for deprecated /proc/acpi/battery in ACPI_PROCFS (diff) | |
| parent | [POWERPC] Fix oops related to 4xx flush_tlb_page modification (diff) | |
| download | linux-64c911a3f7c9864a4bbddbb77b722d5553ddcd32.tar.xz linux-64c911a3f7c9864a4bbddbb77b722d5553ddcd32.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'include')
| -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 e7b4c0d298ae..5c9108147644 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) static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr) { - _tlbie(vmaddr, vma->vm_mm->context.id); + _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0); } static inline void flush_tlb_page_nohash(struct vm_area_struct *vma, unsigned long vmaddr) { - _tlbie(vmaddr, vma->vm_mm->context.id); + _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0); } static inline void flush_tlb_range(struct vm_area_struct *vma, |