From patchwork Fri Dec 13 22:24:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22391 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0E69023FBA for ; Fri, 13 Dec 2013 22:26:47 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id z6sf4753171yhz.3 for ; Fri, 13 Dec 2013 14:26:46 -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=6G7E/IiRdvxefQsBg/erhjtstfl++dV/lcrpwuIzhcA=; b=JhuRqAbakx24TukabeTak4kykNE/InfDO9iLGUoRDUWpm4kEczCYdecZ/CPHOZ2wtq LoOeLfr1pushjlqMZwgmd1N7aGT0+F5jhuvY5tgSmBdg9eiXto1etS2RSJCgaiZssFAK tb1rNi/2MIV4p54/JLCbnc4cY/EexTPnVqjY0etpkHVaITQhrtF+hwKg6EM9dOn6X0S5 BuUcVQ8cE0EIqB1XIi2qvKB5gdP9DGTEhAmDwrEIXpznVxfrwV+vMBejxpbcBrXEzHFj qwqw+fgQd31ecqWOMxD/UuAH30kszOZ0gm+F7yZbDKWw2drasZxxjDwsP68Ih/ThxxqW b3sg== X-Gm-Message-State: ALoCoQn8H6t4T+rJgVgcrHv/CfbrsEyIOTo0IpnvVWcYuIUUpLGZcpJVrKcbKV7YmJnkiep7hoH3 X-Received: by 10.236.14.100 with SMTP id c64mr1712508yhc.38.1386973606892; Fri, 13 Dec 2013 14:26:46 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.81.229 with SMTP id d5ls1182157qey.64.gmail; Fri, 13 Dec 2013 14:26:46 -0800 (PST) X-Received: by 10.58.168.205 with SMTP id zy13mr2176412veb.19.1386973606762; Fri, 13 Dec 2013 14:26:46 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id cp3si1189046vcb.133.2013.12.13.14.26.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:46 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 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.44; Received: by mail-vb0-f44.google.com with SMTP id x8so1732623vbf.31 for ; Fri, 13 Dec 2013 14:26:46 -0800 (PST) X-Received: by 10.53.13.44 with SMTP id ev12mr1859266vdd.17.1386973606688; Fri, 13 Dec 2013 14:26:46 -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 u4csp73491vcz; Fri, 13 Dec 2013 14:26:46 -0800 (PST) X-Received: by 10.68.235.72 with SMTP id uk8mr5991228pbc.93.1386973606010; Fri, 13 Dec 2013 14:26:46 -0800 (PST) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by mx.google.com with ESMTPS id ty3si2480101pbc.347.2013.12.13.14.26.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:46 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.43 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.43; Received: by mail-pa0-f43.google.com with SMTP id bj1so595978pad.30 for ; Fri, 13 Dec 2013 14:26:45 -0800 (PST) X-Received: by 10.66.162.136 with SMTP id ya8mr5970751pab.110.1386973605568; Fri, 13 Dec 2013 14:26:45 -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.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:44 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , Greg Hackmann , John Stultz Subject: [PATCH 026/115] gpu: ion: fix page offset in dma_buf_kmap() Date: Fri, 13 Dec 2013 14:24:00 -0800 Message-Id: <1386973529-4884-27-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.44 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: Greg Hackmann Signed-off-by: Greg Hackmann [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 4d91d20..84229bd 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -846,7 +846,7 @@ static void ion_dma_buf_release(struct dma_buf *dmabuf) static void *ion_dma_buf_kmap(struct dma_buf *dmabuf, unsigned long offset) { struct ion_buffer *buffer = dmabuf->priv; - return buffer->vaddr + offset; + return buffer->vaddr + offset * PAGE_SIZE; } static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset,