From patchwork Wed Apr 1 16:15:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 6141231 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 923BC9F434 for ; Wed, 1 Apr 2015 16:12:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D521C20148 for ; Wed, 1 Apr 2015 16:12:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E6A5F2035E for ; Wed, 1 Apr 2015 16:12:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2ED066E8C9; Wed, 1 Apr 2015 09:12:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id CADDA6E8C7 for ; Wed, 1 Apr 2015 09:12:39 -0700 (PDT) Received: by wgra20 with SMTP id a20so58745685wgr.3 for ; Wed, 01 Apr 2015 09:12:39 -0700 (PDT) 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=zQM4LYFPMNi44GRGXiaguOiedyzXpgIglBJ4b4eEvWY=; b=IAwDigqCAtFjGXlCcdcdWc1i/ZCAlhFrpgd+5DYpt6MbS8S7tX5Q0kk3sSHtf1kCDA J/8mtirZJo85siO5DdeZRfUBkyMTDRDZQMoO7jdADrWLhFzOrL83bNpoyiNG51OTuo/P CU6vG0esygPfkDHiUG/CuqR00mSV59Rtz20tbVE7+CZc6pSWJPqJPD3hnyZPxTfol91M mONKn2MGfhtuet01pRTEuNDmkPLXSr8ltVuA7Ekez6KhzSvDocvRnZdcsqnsuUYEUvNN iDMlY2t01QENu7BllNi5Xrz+Dp4GY6faBruAGT0eMmHkI8UIuTJmEjNjHXYGKxbGITr7 5xiA== X-Received: by 10.194.175.137 with SMTP id ca9mr81875025wjc.67.1427904759081; Wed, 01 Apr 2015 09:12:39 -0700 (PDT) Received: from arch-x220.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by mx.google.com with ESMTPSA id ge8sm3319498wjc.32.2015.04.01.09.12.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2015 09:12:38 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 11/24] intel: remove the drm_mm* symbol workarounds Date: Wed, 1 Apr 2015 17:15:22 +0100 Message-Id: <1427904935-14387-12-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.3.1 In-Reply-To: <1427904935-14387-1-git-send-email-emil.l.velikov@gmail.com> References: <1427904935-14387-1-git-send-email-emil.l.velikov@gmail.com> Cc: 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 Added with commit 57b4c4c32d3(Move the renaming of mm.c symbols to symbol duplication/collision with ones that are available elsewhere. As the public/private symbols of libdrm are properly annotated neither one of the symbols will end up in the global name-space, thus should no longer be required. Eric, Does this sound correct, or there is something more subtle in there ? Cc: Eric Anholt Signed-off-by: Emil Velikov --- intel/mm.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/intel/mm.h b/intel/mm.h index 8a5235b..a6ee102 100644 --- a/intel/mm.h +++ b/intel/mm.h @@ -38,16 +38,6 @@ struct mem_block { unsigned int reserved:1; }; -/* Rename the variables in the drm copy of this code so that it doesn't - * conflict with mesa or whoever else has copied it around. - */ -#define mmInit drm_mmInit -#define mmAllocMem drm_mmAllocMem -#define mmFreeMem drm_mmFreeMem -#define mmFindBlock drm_mmFindBlock -#define mmDestroy drm_mmDestroy -#define mmDumpMemInfo drm_mmDumpMemInfo - /** * input: total size in bytes * return: a heap pointer if OK, NULL if error