From patchwork Fri Dec 13 22:24:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22415 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E4EB23FBA for ; Fri, 13 Dec 2013 22:27:28 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id at1sf8907957iec.7 for ; Fri, 13 Dec 2013 14:27:28 -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=LiPCJAyfGyKnlFaT9kl3JLoLlD6ZJkOP0YjtGPIuDik=; b=OdPrJMbeii4qn24rcXfgGfS+WIf5joYwNVndIlIpUN3+i04wePVgMkaar36Y9VvzY6 +6tjhPv5M7xjHhTgGdM21NPJCFIAy5F0WV5wINa8RVw70FyCiJUOBjj/6FHk08niT1Bm /IUKjFllftY6s19REXhcN/tTcHKsmomBAW/+/56XBK0uBSBD3JjqMeCjxBFvDAtLHdk5 crhdztaLspCCABuip23+v2AnGOTJIx24k0Ve8Ur5QvkTdebtR8GKFDY60RMpM/LiPjSL mO1M6JZhpgnE2WU0Z/LLpRXWBghyEG61A5o9ZBvwd9Tfcjdy/kDQTtil8DY2/kQxG5Xi M9Gw== X-Gm-Message-State: ALoCoQkCEdOz/o7ZzaUC+NdjgeNEhDOVsbNubzTATCU7abQojlijwjzDlCyLzUTZYGV+2h/I0NxN X-Received: by 10.42.131.129 with SMTP id z1mr1724927ics.25.1386973648090; Fri, 13 Dec 2013 14:27:28 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.25.196 with SMTP id e4ls1212462qeg.6.gmail; Fri, 13 Dec 2013 14:27:27 -0800 (PST) X-Received: by 10.58.186.198 with SMTP id fm6mr2262176vec.16.1386973647909; Fri, 13 Dec 2013 14:27:27 -0800 (PST) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ti3si1202384vdc.2.2013.12.13.14.27.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:27:27 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id if17so1703835vcb.25 for ; Fri, 13 Dec 2013 14:27:27 -0800 (PST) X-Received: by 10.52.187.66 with SMTP id fq2mr27823vdc.93.1386973647837; Fri, 13 Dec 2013 14:27:27 -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 u4csp73545vcz; Fri, 13 Dec 2013 14:27:27 -0800 (PST) X-Received: by 10.68.34.37 with SMTP id w5mr5872000pbi.159.1386973646948; Fri, 13 Dec 2013 14:27:26 -0800 (PST) Received: from mail-pb0-f52.google.com (mail-pb0-f52.google.com [209.85.160.52]) by mx.google.com with ESMTPS id ph10si2518647pbb.49.2013.12.13.14.27.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:27:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.52 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.160.52; Received: by mail-pb0-f52.google.com with SMTP id uo5so3144005pbc.39 for ; Fri, 13 Dec 2013 14:27:26 -0800 (PST) X-Received: by 10.68.106.130 with SMTP id gu2mr5952706pbb.59.1386973646587; Fri, 13 Dec 2013 14:27:26 -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.27.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:27:25 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , Rebecca Schultz Zavin , John Stultz Subject: [PATCH 050/115] gpu: ion: Fix bug where MAP ioctl was no longer supported Date: Fri, 13 Dec 2013 14:24:24 -0800 Message-Id: <1386973529-4884-51-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.220.180 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: Rebecca Schultz Zavin Signed-off-by: Rebecca Schultz Zavin [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 3167c1d..3f22f88 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1086,6 +1086,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) break; } case ION_IOC_SHARE: + case ION_IOC_MAP: { struct ion_fd_data data;