summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Kuehling <fxkuehl@gmx.de>2004-02-24 14:24:07 +0000
committerFelix Kuehling <fxkuehl@gmx.de>2004-02-24 14:24:07 +0000
commitce21dca4aaecac73490f26491b8f06a74d0ee0f5 (patch)
tree5bdb90ace22637f7bff519a6e07256834041fbbe
parent3dea36d8437726fd57cc006e351ed8982b091d76 (diff)
Use DO_MUNMAP_4_ARGS macro defined in Makefile.linux (Steve Holland).
Silence a warning about a format-argument mismatch in printk.
-rw-r--r--linux-core/savage_drv.c4
-rw-r--r--linux/savage_drv.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/savage_drv.c b/linux-core/savage_drv.c
index 8013c520..8062aebd 100644
--- a/linux-core/savage_drv.c
+++ b/linux-core/savage_drv.c
@@ -80,7 +80,7 @@ int savage_alloc_continuous_mem(struct inode *inode, struct file *filp,
return -EINVAL;
size = cont_mem.type * cont_mem.size;
- printk("[drm]JTLIsize = %d\n",size);
+ printk("[drm]JTLIsize = %lu\n",size);
ret = (void *)__get_free_pages(GFP_KERNEL, get_order(size));
if (ret == NULL)
@@ -218,7 +218,7 @@ int savage_free_cont_mem(struct inode *inode, struct file *filp,
DRM(free)(list, sizeof(*list), DRM_MEM_MAPS);
/*unmap the user space */
-#if 0 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,18))
+#ifdef DO_MUNMAP_4_ARGS
if ( do_munmap(current->mm,cont_mem.linear,size,1)!=0)
#else
if ( do_munmap(current->mm,cont_mem.linear,size)!=0)
diff --git a/linux/savage_drv.c b/linux/savage_drv.c
index 8013c520..8062aebd 100644
--- a/linux/savage_drv.c
+++ b/linux/savage_drv.c
@@ -80,7 +80,7 @@ int savage_alloc_continuous_mem(struct inode *inode, struct file *filp,
return -EINVAL;
size = cont_mem.type * cont_mem.size;
- printk("[drm]JTLIsize = %d\n",size);
+ printk("[drm]JTLIsize = %lu\n",size);
ret = (void *)__get_free_pages(GFP_KERNEL, get_order(size));
if (ret == NULL)
@@ -218,7 +218,7 @@ int savage_free_cont_mem(struct inode *inode, struct file *filp,
DRM(free)(list, sizeof(*list), DRM_MEM_MAPS);
/*unmap the user space */
-#if 0 && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,18))
+#ifdef DO_MUNMAP_4_ARGS
if ( do_munmap(current->mm,cont_mem.linear,size,1)!=0)
#else
if ( do_munmap(current->mm,cont_mem.linear,size)!=0)