summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-11-13 14:28:40 +1100
committerPaul Mackerras <paulus@samba.org>2007-11-13 14:28:40 +1100
commit64c911a3f7c9864a4bbddbb77b722d5553ddcd32 (patch)
tree66439e7291710ce45c36c49eeb4a8ffeb068cc16 /include/asm-powerpc
parent6e800af233e0bdf108efb7bd23c11ea6fa34cdeb (diff)
parent725fb29fd4bcda958b32f4479ad9934117c22019 (diff)
downloadblackbird-op-linux-64c911a3f7c9864a4bbddbb77b722d5553ddcd32.tar.gz
blackbird-op-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/asm-powerpc')
-rw-r--r--include/asm-powerpc/tlbflush.h4
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,
OpenPOWER on IntegriCloud