Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / arch / m68k / sun3x / dvma.c

diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c
index 32e55adfeb8ebea0f2ecafd45b10772fefaa3ca1..117481e86305798610f894e8f0e7b896315dc573 100644 (file)
--- a/arch/m68k/sun3x/dvma.c
+++ b/arch/m68k/sun3x/dvma.c
@@ -116,7 +116,7 @@ inline int dvma_map_cpu(unsigned long kaddr,
                        pte_t *pte;
                        unsigned long end3;
 
-                       if((pte = pte_alloc_kernel(&init_mm, pmd, vaddr)) == NULL) {
+                       if((pte = pte_alloc_kernel(pmd, vaddr)) == NULL) {
                                ret = -ENOMEM;
                                goto out;
                        }