From patchwork Wed Apr 30 01:00:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4090071 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 C3198BFF02 for ; Wed, 30 Apr 2014 01:01:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BEA220218 for ; Wed, 30 Apr 2014 01:01:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AA9D20200 for ; Wed, 30 Apr 2014 01:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756149AbaD3BAY (ORCPT ); Tue, 29 Apr 2014 21:00:24 -0400 Received: from mail-ie0-f182.google.com ([209.85.223.182]:38307 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756147AbaD3BAV (ORCPT ); Tue, 29 Apr 2014 21:00:21 -0400 Received: by mail-ie0-f182.google.com with SMTP id tp5so1142609ieb.27 for ; Tue, 29 Apr 2014 18:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=/sEm13Fl2tKyy1HkkPtIRsQInsGZE53zDJDen5mG6tc=; b=JlhimmwufSboflxsiks8W44TZM+vbcNPKqXHLkndXxwftA5ekIkT0g0dgxC4qSHL9Y 0wxQywt8VnU3j+YVwPCRXnV4hS9YdG662Xv5WvY9DlO2tl4SkCJjj2J34G34SVjb6Ldl Z2w2pwZPU+Op2Bh5pPgrYxTgdx3e/ItBzEGHtrkxcvBuz4fxuAwWs8+EsLDI6GNZgeZR uZP5qqWVFPGm3OLxnOIXwOZngwrqUW0OvFG2DIcexNzmkoxQPcMkWFo2eee5VaOwyEN2 1E8rri3BycJHEkECFgz4g9sMdwtUeSuYx9DZJp/sHhqc4+npbnohZ3R3KZS/Tr9+qjX5 wG2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=/sEm13Fl2tKyy1HkkPtIRsQInsGZE53zDJDen5mG6tc=; b=dz2TPy0coM/PwP+AKSDZNCs8wKzAUiLywtY0J7qh4HT47uukGb6swO/XCf4JdvLkTn az44AcY+efm4YMPkh8jlqRk2UH9kQ2Fptrqlz8Pj0uIbAVEC3MwaEPxvOVpFYM30lAD7 ArbcGnfPuyJWcYoJP/pVMZ2Bny+jQB3BOD5wTkzhdfzi6jUW8Pbyki0yY5syi5O3A1lh ofDpYAfx5wq2q6Kx6CmtSkjY/zc2J3IcmYpLtk4NtmTaVQ8xuQ8jGUOMcL5bdcLlV/sY 0nlIhS/2tC59qD0lXR/tfWnXQg7EEb3NKAtmqIe6nGAOHU4Hmar+ohFAm7/yzoZ6nLxQ 6ZeQ== X-Gm-Message-State: ALoCoQlHJSzd4LLMELOhoi2LV5FqPFweMqcCxG0qTdKv5qEKl+HcKHI5r4inQL0nrJhU33EPgj+lgV/MVaX9syWaKPWpJtbNhAoT3j2tWaa0iG7yKYxnJx2NOmEyAdnjR+Pzeogsie2I0QtjjGvTbpfXHdx/bhXWnNl5kM//1ONjScQ1/XqQSPLk4ObFJWQ4huyuQe2aGP6BqmcKhg7B5kxsB8EM1dR1TnPad30qeOuLh+CFSbTmWvI= X-Received: by 10.42.86.196 with SMTP id v4mr1042819icl.62.1398819620689; Tue, 29 Apr 2014 18:00:20 -0700 (PDT) Received: from localhost ([172.16.51.53]) by mx.google.com with ESMTPSA id pi3sm88784igb.5.2014.04.29.18.00.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 29 Apr 2014 18:00:20 -0700 (PDT) Subject: [PATCH 6/7] resources: Clarify sanity check message To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-kernel@vger.kernel.org Date: Tue, 29 Apr 2014 19:00:19 -0600 Message-ID: <20140430010019.13138.61238.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140430005642.13138.99577.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140430005642.13138.99577.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 The resource map sanity check message is a bit confusing. Change it to be more readable: -resource map sanity check conflict: 0xfed10000 0xfed15fff 0xfed10000 0xfed13fff pnp 00:01 +resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff] Signed-off-by: Bjorn Helgaas --- kernel/resource.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernel/resource.c b/kernel/resource.c index 8957d686e29b..3c2237ac32db 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1288,13 +1288,10 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) if (p->flags & IORESOURCE_BUSY) continue; - printk(KERN_WARNING "resource map sanity check conflict: " - "0x%llx 0x%llx 0x%llx 0x%llx %s\n", + printk(KERN_WARNING "resource sanity check: requesting [mem %#010llx-%#010llx], which spans more than %s %pR\n", (unsigned long long)addr, (unsigned long long)(addr + size - 1), - (unsigned long long)p->start, - (unsigned long long)p->end, - p->name); + p->name, p); err = -1; break; }