From patchwork Fri Dec 13 22:23:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22367 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 866D423FF5 for ; Fri, 13 Dec 2013 22:26:08 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id ht17sf4400216vcb.6 for ; Fri, 13 Dec 2013 14:26:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=qjNgy2onmL6CpVsonhLkRQIXsXGhSTRG3BieYlcp034=; b=jl5CQAjex+ix1rc74mY8qCoU7omlzTDd7RWDNXgL1QSVS4PI7ZQQuQVus75aebWsa3 MylD/9WGEm3ul6/2w6YU2FsfjqmjJinnVD0m0l2qLqw4L2Ju6NBcUJlUWxb/QuWaTXmc VI2ukKIWX4WWUt41ZYvH2tWnCyNasdOEW4+Urm4BrwFanhYnwsYz9091I8zI9blbbzNT yegokjmU858hXtkMJ+2Z2GENjtwrech3Oc1GafrppGHYgkCOpLY8JrfCaEwkTMRQk+lT 5vVHySFmdHH+mzM2pIQu9hfksor9ma5xtQJeagXfUAdv++sZ0WFxYH7KZRJH+2dULtRS jQZA== X-Gm-Message-State: ALoCoQlUy8vqj6zLfW/gNtqI6ykRUwKwZxwZElqg4AGzUmQE+QhSVEoIMYZUaU1CNV5XX0z23qSO X-Received: by 10.236.194.201 with SMTP id m49mr1693831yhn.0.1386973568061; Fri, 13 Dec 2013 14:26:08 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.237 with SMTP id y13ls1262001qeu.2.gmail; Fri, 13 Dec 2013 14:26:07 -0800 (PST) X-Received: by 10.58.255.195 with SMTP id as3mr2240402ved.50.1386973567920; Fri, 13 Dec 2013 14:26:07 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id fu7si938951vec.31.2013.12.13.14.26.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:07 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.51; Received: by mail-vb0-f51.google.com with SMTP id 11so1692474vbe.24 for ; Fri, 13 Dec 2013 14:26:07 -0800 (PST) X-Received: by 10.58.186.198 with SMTP id fm6mr2260497vec.16.1386973567832; Fri, 13 Dec 2013 14:26:07 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp73426vcz; Fri, 13 Dec 2013 14:26:07 -0800 (PST) X-Received: by 10.68.52.202 with SMTP id v10mr6132933pbo.118.1386973567109; Fri, 13 Dec 2013 14:26:07 -0800 (PST) Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by mx.google.com with ESMTPS id eq2si2443579pbb.52.2013.12.13.14.26.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:07 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.172 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.192.172; Received: by mail-pd0-f172.google.com with SMTP id g10so3026520pdj.17 for ; Fri, 13 Dec 2013 14:26:06 -0800 (PST) X-Received: by 10.66.190.198 with SMTP id gs6mr6058027pac.49.1386973566730; Fri, 13 Dec 2013 14:26:06 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id qz9sm7457908pbc.3.2013.12.13.14.26.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:05 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , John Stultz Subject: [PATCH 002/115] gpu: ion: ion_carveout_heap: fix for 3.4 Date: Fri, 13 Dec 2013 14:23:36 -0800 Message-Id: <1386973529-4884-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Colin Cross __arch_ioremap is no longer available, use __arm_ioremap instead. Signed-off-by: Colin Cross [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion_carveout_heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c index 6d02cd3..e8c4e36 100644 --- a/drivers/staging/android/ion/ion_carveout_heap.c +++ b/drivers/staging/android/ion/ion_carveout_heap.c @@ -99,14 +99,14 @@ void ion_carveout_heap_unmap_dma(struct ion_heap *heap, void *ion_carveout_heap_map_kernel(struct ion_heap *heap, struct ion_buffer *buffer) { - return __arch_ioremap(buffer->priv_phys, buffer->size, + return __arm_ioremap(buffer->priv_phys, buffer->size, MT_MEMORY_NONCACHED); } void ion_carveout_heap_unmap_kernel(struct ion_heap *heap, struct ion_buffer *buffer) { - __arch_iounmap(buffer->vaddr); + __arm_iounmap(buffer->vaddr); buffer->vaddr = NULL; return; }