Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 253722
b: refs/heads/master
c: cafe8d8
h: refs/heads/master
v: v3
  • Loading branch information
Christian Dietrich authored and Dave Airlie committed Jun 16, 2011
1 parent 825e9cc commit 3afea3c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4a9a8b71e12d41abb71c4e741bff524f016cfef4
refs/heads/master: cafe8d8413399119c3f4cd575e0eb27e2654b9d5
9 changes: 5 additions & 4 deletions trunk/drivers/gpu/drm/drm_ioc32.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* IN THE SOFTWARE.
*/
#include <linux/compat.h>
#include <linux/ratelimit.h>

#include "drmP.h"
#include "drm_core.h"
Expand Down Expand Up @@ -253,10 +254,10 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd,
return -EFAULT;

m32.handle = (unsigned long)handle;
if (m32.handle != (unsigned long)handle && printk_ratelimit())
printk(KERN_ERR "compat_drm_addmap truncated handle"
" %p for type %d offset %x\n",
handle, m32.type, m32.offset);
if (m32.handle != (unsigned long)handle)
printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle"
" %p for type %d offset %x\n",
handle, m32.type, m32.offset);

if (copy_to_user(argp, &m32, sizeof(m32)))
return -EFAULT;
Expand Down

0 comments on commit 3afea3c

Please sign in to comment.