Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

[linux-2.6-omap-h63xx.git] / arch / powerpc / oprofile / cell / pr_util.h

diff --git a/arch/powerpc/oprofile/cell/pr_util.h b/arch/powerpc/oprofile/cell/pr_util.h
index a048b0b72be366b2bae384dbb44d89a63b1d83c3..964b93974d893003a0054109acfddb10c7a4a49b 100644 (file)
--- a/arch/powerpc/oprofile/cell/pr_util.h
+++ b/arch/powerpc/oprofile/cell/pr_util.h
@@ -83,7 +83,7 @@ struct spu_buffer {
  * the vma-to-fileoffset map.
  */
 struct vma_to_fileoffset_map *create_vma_map(const struct spu *spu,
-                                            u64 objectid);
+                                            unsigned long objectid);
 unsigned int vma_map_lookup(struct vma_to_fileoffset_map *map,
                            unsigned int vma, const struct spu *aSpu,
                            int *grd_val);