From patchwork Wed Sep 10 10:43:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 4876801 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B8C09F32E for ; Wed, 10 Sep 2014 12:11:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B426E2018B for ; Wed, 10 Sep 2014 12:11:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 06D56200E5 for ; Wed, 10 Sep 2014 12:11:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5369F6E44A; Wed, 10 Sep 2014 05:11:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B8596E44B for ; Wed, 10 Sep 2014 05:11:25 -0700 (PDT) Received: by mail-wi0-f173.google.com with SMTP id em10so2065843wid.6 for ; Wed, 10 Sep 2014 05:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BSZS55zfY53iJtNZ298bu410e34BlEzycczRQbwtq9c=; b=Vs0VV4An5+WCm8Yie1OPGu3SySAlnl3Btm1/3a+gGrYFoUrOVx1BJ2cooyOYZ3PaAI GqXjhlN8TP3hKMgHFDKDZlE+8SCB/Q4LMb2WCJIiImzCw/ziTA3M0+v6uhXY5dsteZbq IMiUpB+VFDlPw3cN+9aXRXwb+XUj+q9IasGTc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BSZS55zfY53iJtNZ298bu410e34BlEzycczRQbwtq9c=; b=JZYEoq64kU4Pa9y0zT0kZz9SaqsG9GVhFX7neJVO/FTG+29kud2vnbh+/s3jdSXFWq rsw9NTR5jc2hwstKFVuRjzLRcTvG+AURCILI+jyO7uiafXw4xHlImoujDEtLShWQSIf9 lAhk9sKcgjiotiwQ2UPyjUKFXI5RXakzwbLZA9Ut69UHZc3jKFEpUuItufSEqSd7Hn3w 56qD575M4mDacla9oU9dXVrvbK4iR5Xqd/0s8rIfwlrFz0xpPDrIe6n+z3BO0O75BfMt 2oxxFqUfNUsC84Q9wrHpjQlPvlDIw+8342V1DC5vOhFSi9Gcm/YtawkLqZ6rP/RFRlYd XarA== X-Gm-Message-State: ALoCoQlzyU0PpXPUoj7CMKAdXL8TPa/RKfIlK+SBDIMEho+f9NTDSmiLMQ5OeKsJMxDwrzU5kF6F X-Received: by 10.194.61.99 with SMTP id o3mr2764115wjr.103.1410351084412; Wed, 10 Sep 2014 05:11:24 -0700 (PDT) Received: from wespe.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id fp19sm2244443wic.3.2014.09.10.05.11.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Sep 2014 05:11:23 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/15] drm: unexport drm_global_mutex Date: Wed, 10 Sep 2014 12:43:54 +0200 Message-Id: <1410345840-3326-10-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1410345840-3326-1-git-send-email-daniel.vetter@ffwll.ch> References: <1410345840-3326-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Drivers really, really have no business even looking at this lock. And thankfully they don't. So unexport it and move the declaration to drm_internal.h. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_fops.c | 1 - drivers/gpu/drm/drm_internal.h | 1 + drivers/gpu/drm/drm_lock.c | 1 + include/drm/drmP.h | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index d6b7fc559df7..c99414ebc998 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -43,7 +43,6 @@ /* from BKL pushdown */ DEFINE_MUTEX(drm_global_mutex); -EXPORT_SYMBOL(drm_global_mutex); static int drm_open_helper(struct file *filp, struct drm_minor *minor); diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index a71cf4b839f2..d6dc75534304 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -25,6 +25,7 @@ extern unsigned int drm_timestamp_monotonic; /* drm_fops.c */ +extern struct mutex drm_global_mutex; int drm_lastclose(struct drm_device *dev); /* drm_pci.c */ diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 727b032292b4..f861361a635e 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -36,6 +36,7 @@ #include #include #include "drm_legacy.h" +#include "drm_internal.h" static int drm_notifier(void *priv); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index ce2f9d0175f8..197133a5139b 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1086,7 +1086,6 @@ extern long drm_compat_ioctl(struct file *filp, extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags); /* Device support (drm_fops.h) */ -extern struct mutex drm_global_mutex; extern int drm_open(struct inode *inode, struct file *filp); extern ssize_t drm_read(struct file *filp, char __user *buffer, size_t count, loff_t *offset);