diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:50:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:50:35 -0400 |
| commit | 88c8199b9d2f5ec0a8468a0495ba4c9656846500 (patch) | |
| tree | 666dc82c5a1ec041a7312f4ef3306bb1806620eb /arch | |
| parent | 0439208a8a399f0c4307c561d97e3f5523f5d085 (diff) | |
| parent | 50aa485e1abb7566ce68418c7bbc6a6b454f9039 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[BBC_I2C]: kmalloc + memset conversion to kzalloc
[BBC_ENVCTRL]: kmalloc + memset conversion to kzalloc
[SPARC]: Fix exec failures on sun4c.
[SPARC] Videopix Frame Grabber: Fix unreleased lock in vfc_debug()
[SPARC64]: Add missing dma_get_cache_alignment().
[SUNLANCE]: Fix sparc32 crashes by using of_*() interfaces.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/mm/sun4c.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index a57a366e33..79d60d86f6 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
| @@ -1999,6 +1999,9 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p | |||
| 1999 | unsigned long flags; | 1999 | unsigned long flags; |
| 2000 | int pseg; | 2000 | int pseg; |
| 2001 | 2001 | ||
| 2002 | if (vma->vm_mm->context == NO_CONTEXT) | ||
| 2003 | return; | ||
| 2004 | |||
| 2002 | local_irq_save(flags); | 2005 | local_irq_save(flags); |
| 2003 | address &= PAGE_MASK; | 2006 | address &= PAGE_MASK; |
| 2004 | if ((pseg = sun4c_get_segmap(address)) == invalid_segment) { | 2007 | if ((pseg = sun4c_get_segmap(address)) == invalid_segment) { |