From: Andrew Morton git-drm went and changed lots of stuff. I hope those git-drm changes will be going into 2.6.24? Cc: Pavel Emelyanov Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/char/drm/drm_drv.c | 2 +- drivers/char/drm/drm_fops.c | 5 +++-- drivers/char/drm/drm_lock.c | 6 +++--- drivers/char/drm/i810_dma.c | 2 +- drivers/char/drm/i830_dma.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff -puN drivers/char/drm/drm_drv.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix drivers/char/drm/drm_drv.c --- a/drivers/char/drm/drm_drv.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix +++ a/drivers/char/drm/drm_drv.c @@ -463,7 +463,7 @@ int drm_ioctl(struct inode *inode, struc ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", - current->pid, cmd, nr, + task_pid_nr(current), cmd, nr, (long)old_encode_dev(file_priv->head->device), file_priv->authenticated); diff -puN drivers/char/drm/drm_fops.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix drivers/char/drm/drm_fops.c --- a/drivers/char/drm/drm_fops.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix +++ a/drivers/char/drm/drm_fops.c @@ -244,7 +244,7 @@ static int drm_open_helper(struct inode filp->private_data = priv; priv->filp = filp; priv->uid = current->euid; - priv->pid = current->pid; + priv->pid = task_pid_nr(current); priv->minor = minor; priv->head = drm_heads[minor]; priv->ioctl_count = 0; @@ -339,7 +339,8 @@ int drm_release(struct inode *inode, str */ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", - current->pid, (long)old_encode_dev(file_priv->head->device), + task_pid_nr(current), + (long)old_encode_dev(file_priv->head->device), dev->open_count); if (dev->driver->reclaim_buffers_locked && dev->lock.hw_lock) { diff -puN drivers/char/drm/drm_lock.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix drivers/char/drm/drm_lock.c --- a/drivers/char/drm/drm_lock.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix +++ a/drivers/char/drm/drm_lock.c @@ -58,12 +58,12 @@ int drm_lock(struct drm_device *dev, voi if (lock->context == DRM_KERNEL_CONTEXT) { DRM_ERROR("Process %d using kernel context %d\n", - current->pid, lock->context); + task_pid_nr(current), lock->context); return -EINVAL; } DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n", - lock->context, current->pid, + lock->context, task_pid_nr(current), dev->lock.hw_lock->lock, lock->flags); if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE)) @@ -153,7 +153,7 @@ int drm_unlock(struct drm_device *dev, v if (lock->context == DRM_KERNEL_CONTEXT) { DRM_ERROR("Process %d using kernel context %d\n", - current->pid, lock->context); + task_pid_nr(current), lock->context); return -EINVAL; } diff -puN drivers/char/drm/i810_dma.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix drivers/char/drm/i810_dma.c --- a/drivers/char/drm/i810_dma.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix +++ a/drivers/char/drm/i810_dma.c @@ -1024,7 +1024,7 @@ static int i810_getbuf(struct drm_device retcode = i810_dma_get_buffer(dev, d, file_priv); DRM_DEBUG("i810_dma: %d returning %d, granted = %d\n", - current->pid, retcode, d->granted); + task_pid_nr(current), retcode, d->granted); sarea_priv->last_dispatch = (int)hw_status[5]; diff -puN drivers/char/drm/i830_dma.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix drivers/char/drm/i830_dma.c --- a/drivers/char/drm/i830_dma.c~use-helpers-to-obtain-task-pid-in-printks-drm-fix +++ a/drivers/char/drm/i830_dma.c @@ -1409,7 +1409,7 @@ static int i830_getbuf(struct drm_device retcode = i830_dma_get_buffer(dev, d, file_priv); DRM_DEBUG("i830_dma: %d returning %d, granted = %d\n", - current->pid, retcode, d->granted); + task_pid_nr(current), retcode, d->granted); sarea_priv->last_dispatch = (int)hw_status[5]; _