lkml.org 
[lkml]   [2005]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.12-rc3-mm2: ppc pte_offset_map()
On Sun, 1 May 2005, Andrew Morton wrote:

> Jesper Juhl <juhl-lkml@dif.dk> wrote:
> >
> > On Sun, 1 May 2005, Sean Neakums wrote:
> >
> > > On my Mackertosh (PowerBook5.4), build fails with the following:
> > >
> > > fs/proc/task_mmu.c: In function `smaps_pte_range':
> > > fs/proc/task_mmu.c:177: warning: implicit declaration of function `kmap_atomic'
> > > fs/proc/task_mmu.c:177: error: `KM_PTE0' undeclared (first use in this function)
> > > fs/proc/task_mmu.c:177: error: (Each undeclared identifier is reported only once
> > > fs/proc/task_mmu.c:177: error: for each function it appears in.)
> > > fs/proc/task_mmu.c:207: warning: implicit declaration of function `kunmap_atomic'
> > >
> > > With the naive patch below, it builds with this warning and everything works.
> > >
> > > fs/proc/task_mmu.c: In function `smaps_pte_range':
> > > fs/proc/task_mmu.c:208: warning: passing arg 1 of `kunmap_atomic' makes pointer from integer without a cast
> > >
> >
> > Try this patch :
> >
> > Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
> >
> > --- linux-2.6.12-rc3-mm2-orig/fs/proc/task_mmu.c 2005-05-01 04:04:25.000000000 +0200
> > +++ linux-2.6.12-rc3-mm2/fs/proc/task_mmu.c 2005-05-01 17:49:14.000000000 +0200
> > @@ -2,6 +2,7 @@
> > #include <linux/hugetlb.h>
> > #include <linux/mount.h>
> > #include <linux/seq_file.h>
> > +#include <linux/highmem.h>
> >
> > #include <asm/elf.h>
> > #include <asm/uaccess.h>
> > @@ -204,7 +205,7 @@ static void smaps_pte_range(pmd_t *pmd,
> > }
> > }
> > } while (address < end);
> > - pte_unmap(pte);
> > + pte_unmap((void *)pte);
> > }
>
> Should be
>
> pte_unmap(ptep);
>
Of course, stupid me. I should have seen the
[...]
ptep = pte_offset_map(pmd, address);
[...]
pte = *ptep;
address += PAGE_SIZE;
ptep++;
[...]
bit a few lines above. Guess I should have spend more than 2min creating
the patch.

Thanks.

Here's an updated patch.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>

--- linux-2.6.12-rc3-mm2-orig/fs/proc/task_mmu.c 2005-05-01 04:04:25.000000000 +0200
+++ linux-2.6.12-rc3-mm2/fs/proc/task_mmu.c 2005-05-02 00:59:11.000000000 +0200
@@ -2,6 +2,7 @@
#include <linux/hugetlb.h>
#include <linux/mount.h>
#include <linux/seq_file.h>
+#include <linux/highmem.h>

#include <asm/elf.h>
#include <asm/uaccess.h>
@@ -204,7 +205,7 @@ static void smaps_pte_range(pmd_t *pmd,
}
}
} while (address < end);
- pte_unmap(pte);
+ pte_unmap(ptep);
}

static void smaps_pmd_range(pud_t *pud,

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-05-02 01:02    [W:0.086 / U:3.356 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site