From patchwork Thu Jan 29 18:47:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 5744691 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BDE36BF6C3 for ; Thu, 29 Jan 2015 18:47:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B8D7F2024D for ; Thu, 29 Jan 2015 18:47:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0BE612024C for ; Thu, 29 Jan 2015 18:47:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D9157A009; Thu, 29 Jan 2015 10:47:38 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CF326E782 for ; Thu, 29 Jan 2015 10:47:36 -0800 (PST) Received: by mail-wi0-f177.google.com with SMTP id r20so28536097wiv.4 for ; Thu, 29 Jan 2015 10:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cjyn8ltvyNicx2YlzmoO0M2g9X3JyDl47HrZQSxFgC8=; b=k/n5cvqyDWNG0Pzw0UmgNxqI0L+JTn6JgfRnRw9kY0GqmZnL48DuDDBQzikhKGb1B6 QOJpsPdqv2PoNdPvmEi8LkHItEg372mBEzOuxNvu3opOrnhOd/kX/Q9LFKpfmqI4ufz0 kxzpRO5+Fz9QABhbs2gsFvC14mvWfrM0a3XDijcChFbvuboZIC832TSckLySrvTL4iBf SSg2n96aYFdYAHJaO7sfL8jKzKproDCmRkhliRjt+6/eHMFxQVIzb3Yxnmrr5gy+OoOS rea6o2u9JHxFWRcEEKDOXnhSD29oke9O2drRtGfVn2BXXH74ef8Wkp8+baGuoyAbmvSB mODA== X-Received: by 10.180.72.199 with SMTP id f7mr3958960wiv.58.1422557255352; Thu, 29 Jan 2015 10:47:35 -0800 (PST) Received: from arch-laptop.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by mx.google.com with ESMTPSA id hl1sm11558164wjc.18.2015.01.29.10.47.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jan 2015 10:47:34 -0800 (PST) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/6] libdrm: fix the Android 64bit build Date: Thu, 29 Jan 2015 18:47:07 +0000 Message-Id: <1422557230-22155-4-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1422557230-22155-1-git-send-email-emil.l.velikov@gmail.com> References: <1422557230-22155-1-git-send-email-emil.l.velikov@gmail.com> Cc: Chih-Wei Huang , emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With 64bit bionic mmap now handles 64bit offset, thus we no longer need the __mmap2 trick. Fix from Chih-Wei Huang, over at the google forums. Cc: Chih-Wei Huang Signed-off-by: Emil Velikov --- libdrm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdrm.h b/libdrm.h index acfada5..6c3cd59 100644 --- a/libdrm.h +++ b/libdrm.h @@ -45,7 +45,7 @@ #include -#if defined(ANDROID) +#if defined(ANDROID) && !defined(__LP64__) #include /* for EINVAL */ extern void *__mmap2(void *, size_t, int, int, int, size_t);