diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 07:56:31 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 07:56:31 +0100 |
| commit | 81cfb8864c73230eb1c37753aba517db15cf4d8f (patch) | |
| tree | 649ff25543834cf9983ea41b93126bea97d75475 /arch/m68k/sun3x/dvma.c | |
| parent | [libata] remove ata_chk_err(), ->check_err() hook. (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| download | linux-81cfb8864c73230eb1c37753aba517db15cf4d8f.tar.xz linux-81cfb8864c73230eb1c37753aba517db15cf4d8f.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/m68k/sun3x/dvma.c')
| -rw-r--r-- | arch/m68k/sun3x/dvma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c index 32e55adfeb8e..117481e86305 100644 --- 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; } |