From: Ben Widawsky Date: Sat, 10 Nov 2012 18:56:04 +0000 (-0800) Subject: drm/i915: Allocate the proper size for contexts. X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13442^2~192^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f94982b0022f474d3c9285447d9a33b7a324e771;p=mirror_ubuntu-artful-kernel.git drm/i915: Allocate the proper size for contexts. Whoops. This was fixed previously, but not sure how it got lost. It's not needed for -fixes or stable because at the moment drm_i915_file_private is way bigger than i915_hw_context (by 120 bytes on my 64b build). Signed-off-by: Ben Widawsky Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 05ed42f203d7..0e510df80d73 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -146,7 +146,7 @@ create_hw_context(struct drm_device *dev, struct i915_hw_context *ctx; int ret, id; - ctx = kzalloc(sizeof(struct drm_i915_file_private), GFP_KERNEL); + ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); if (ctx == NULL) return ERR_PTR(-ENOMEM);