From patchwork Thu May 9 19:46:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 2545471 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 836193FE37 for ; Thu, 9 May 2013 19:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753685Ab3EITrx (ORCPT ); Thu, 9 May 2013 15:47:53 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:45312 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753548Ab3EITrI (ORCPT ); Thu, 9 May 2013 15:47:08 -0400 Received: by mail-pd0-f171.google.com with SMTP id r11so2253790pdi.2 for ; Thu, 09 May 2013 12:47:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=kA8NNAc3Nio38AJaT8d+yShrIolQ+l0+mIow6XsTZ/E=; b=bVDpFIh8MMwC28gBKdpIO7i/u2KunRFMxnmax0Mc9RLvzLj5zdnXBbvjfIUvBbDQTa l+i6zSmj/UEvWgkI+1Ht8N6J25rEOqj//Dvf8GwjDXZwL/KiGtVPdg/uKqHfKbK/NH9X RVOZXdmeKpEaxAeHZXKUbBhQ4mmRKRbVAypdgy5FrKX2uvbXacTlUSZawYSsJ4gyifgT dObcSEGwMFlno871dHFatHjuSEZLo/QBWh4XM4DIMpUvoMsYltr4kccP2SihnLxQdQJk sgBWVkdHA7DGWyMpLCfviZepsMlMmv8riEwGI/4HtcPXqhtcYgJn5hZRsm7Q0+JivX50 u+yw== X-Received: by 10.66.233.167 with SMTP id tx7mr14424755pac.110.1368128827938; Thu, 09 May 2013 12:47:07 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) by mx.google.com with ESMTPSA id k2sm4793895pat.7.2013.05.09.12.47.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 May 2013 12:47:07 -0700 (PDT) From: Andy Lutomirski To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: Daniel Vetter , Jerome Glisse , Alex Deucher , Dave Airlie , Andy Lutomirski Subject: [RFC/PATCH v2 8/8] drm: Remove mtrr_add and mtrr_del fallback hack for non-MTRR systems Date: Thu, 9 May 2013 12:46:27 -0700 Message-Id: <20c48ef6c4353a67091f13ed8ff071595b01b9b8.1368128020.git.luto@amacapital.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQnFz49oeSwrWtPz75Uvjvrs/M/9c/raXYkRga56ZwOZ1pMVtyxLZ4OXVPMUhKPiKuaS8m5x Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org There are no users left in drivers/gpu. Signed-off-by: Andy Lutomirski --- This is new in v2. The code I'm deleting is kind of gross. include/drm/drmP.h | 5 +---- include/drm/drm_os_linux.h | 16 ---------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 3e6cfa0..7a9fef5 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -55,16 +55,13 @@ #include #include #include +#include #include #if defined(__alpha__) || defined(__powerpc__) #include /* For pte_wrprotect */ #endif -#include #include #include -#ifdef CONFIG_MTRR -#include -#endif #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) #include #include diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h index 3933691..35c7c2b 100644 --- a/include/drm/drm_os_linux.h +++ b/include/drm/drm_os_linux.h @@ -65,22 +65,6 @@ struct no_agp_kern { #define DRM_AGP_KERN struct no_agp_kern #endif -#if !(__OS_HAS_MTRR) -static __inline__ int mtrr_add(unsigned long base, unsigned long size, - unsigned int type, char increment) -{ - return -ENODEV; -} - -static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) -{ - return -ENODEV; -} - -#define MTRR_TYPE_WRCOMB 1 - -#endif - /** Other copying of data to kernel space */ #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ copy_from_user(arg1, arg2, arg3)