projects
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[linux-2.6.git]
/
arch
/
m32r
/
mm
/
fault-nommu.c
diff --git
a/arch/m32r/mm/fault-nommu.c
b/arch/m32r/mm/fault-nommu.c
index
8846917
..
888aab1
100644
(file)
--- a/
arch/m32r/mm/fault-nommu.c
+++ b/
arch/m32r/mm/fault-nommu.c
@@
-95,7
+95,7
@@
asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
* update_mmu_cache()
*======================================================================*/
void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr,
- pte_t pte)
+ pte_t *ptep)
{
BUG();
}