From patchwork Mon Jul 29 18:51:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Luck X-Patchwork-Id: 2835237 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3937BC0319 for ; Tue, 30 Jul 2013 05:38:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EA1620181 for ; Tue, 30 Jul 2013 05:38:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5BBB32011B for ; Tue, 30 Jul 2013 05:38:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C180E6C3C for ; Mon, 29 Jul 2013 22:38:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id BA63FE6E54 for ; Mon, 29 Jul 2013 11:51:34 -0700 (PDT) Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 29 Jul 2013 11:51:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,771,1367996400"; d="scan'208";a="274928866" Received: from agluck-desk.sc.intel.com ([10.3.52.72]) by AZSMGA002.ch.intel.com with SMTP; 29 Jul 2013 11:51:33 -0700 From: "Luck, Tony" To: David Airlie Subject: [PATCH] Fix #include in drm_mm.h to unbreak ia64 build Date: Mon, 29 Jul 2013 11:51:33 -0700 Message-Id: <51f6b9b51365634ccf@agluck-desk.sc.intel.com> X-Mailman-Approved-At: Mon, 29 Jul 2013 22:34:03 -0700 Cc: linux-next@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Linux-next build on ia64 is falling over with errors like this: In file included from include/drm/drm_vma_manager.h:26, from include/drm/ttm/ttm_bo_api.h:35, from include/drm/ttm/ttm_bo_driver.h:33, from drivers/gpu/drm/ttm/ttm_agp_backend.c:35: include/drm/drm_mm.h:67: error: expected specifier-qualifier-list before 'spinlock_t' I guess other architectures are pulling in spinlock.h through some twisty #include path so are not seeing this error. But drm_mm.h makes use of spinlock_t - so it should do the right thing and #include Signed-off-by: Tony Luck --- First saw this break in tag "next-20130726" diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index b87d05e..7d5fbae 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h @@ -37,6 +37,7 @@ * Generic range manager structs */ #include +#include #ifdef CONFIG_DEBUG_FS #include #endif