diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-04 02:27:12 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-04 02:27:12 +0200 |
| commit | f29135ee4e0d4e01911ed569f731bfdb841cea6d (patch) | |
| tree | e72d49a2f677dd069c3a673522cf785548148f71 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | Merge tag 'drm-misc-next-2018-06-27' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-f29135ee4e0d4e01911ed569f731bfdb841cea6d.tar.xz linux-f29135ee4e0d4e01911ed569f731bfdb841cea6d.zip | |
Merge v4.18-rc3 into drm-next
Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 735f695cb889..f4751b383858 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2261,9 +2261,6 @@ static inline struct scatterlist *____sg_next(struct scatterlist *sg) **/ static inline struct scatterlist *__sg_next(struct scatterlist *sg) { -#ifdef CONFIG_DEBUG_SG - BUG_ON(sg->sg_magic != SG_MAGIC); -#endif return sg_is_last(sg) ? NULL : ____sg_next(sg); } |