summaryrefslogtreecommitdiffstats
path: root/kernel/kfifo.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-10-19 01:48:34 +0200
committerDave Airlie <airlied@redhat.com>2010-10-19 01:48:34 +0200
commitb7ae5056c94a8191c1fd0b5697707377516c0c5d (patch)
tree394f68003ea0bc2a0c24e510a7c5b13f479ce743 /kernel/kfifo.c
parentdrm/radeon/kms: make sure blit addr masks are 64 bit (diff)
parentdrm/radeon/kms: avivo cursor workaround applies to evergreen as well (diff)
downloadlinux-b7ae5056c94a8191c1fd0b5697707377516c0c5d.tar.xz
linux-b7ae5056c94a8191c1fd0b5697707377516c0c5d.zip
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
Conflicts: drivers/gpu/drm/i915/intel_fb.c drivers/gpu/drm/radeon/r600_blit_kms.c drivers/gpu/drm/ttm/ttm_bo.c
Diffstat (limited to 'kernel/kfifo.c')
-rw-r--r--kernel/kfifo.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/kfifo.c b/kernel/kfifo.c
index 6b5580c57644..01a0700e873f 100644
--- a/kernel/kfifo.c
+++ b/kernel/kfifo.c
@@ -365,8 +365,6 @@ static unsigned int setup_sgl(struct __kfifo *fifo, struct scatterlist *sgl,
n = setup_sgl_buf(sgl, fifo->data + off, nents, l);
n += setup_sgl_buf(sgl + n, fifo->data, nents - n, len - l);
- if (n)
- sg_mark_end(sgl + n - 1);
return n;
}