From patchwork Fri Jan 21 20:25:04 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Mike Travis <travis@sgi.com>
X-Patchwork-Id: 496401
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0LKPa8r003353
	for <patchwork-acpi@patchwork.kernel.org>;
	Fri, 21 Jan 2011 20:25:37 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753421Ab1AUUZG (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Fri, 21 Jan 2011 15:25:06 -0500
Received: from relay3.sgi.com ([192.48.152.1]:36103 "EHLO relay.sgi.com"
	rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
	id S1752354Ab1AUUZF (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Fri, 21 Jan 2011 15:25:05 -0500
Received: from gulag1.americas.sgi.com (gulag1.americas.sgi.com
	[128.162.236.41])
	by relay3.corp.sgi.com (Postfix) with ESMTP id C3BF8AC00D;
	Fri, 21 Jan 2011 12:25:03 -0800 (PST)
Received: by gulag1.americas.sgi.com (Postfix, from userid 5508)
	id 4EDDE10377FE9; Fri, 21 Jan 2011 14:25:03 -0600 (CST)
Message-Id: <20110121202502.787539652@gulag1.americas.sgi.com>
References: <20110121202502.090169599@gulag1.americas.sgi.com>
User-Agent: quilt/0.46-1
Date: Fri, 21 Jan 2011 14:25:04 -0600
From: Mike Travis <travis@sgi.com>
To: Andrew Morton <akpm@linux-foundation.org>, Ingo Molnar <mingo@elte.hu>,
	Len Brown <len.brown@intel.com>, "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>, Jack Steiner <steiner@sgi.com>,
	Robin Holt <holt@sgi.com>, Lori Gilbertson <loriann@sgi.com>,
	x86@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/6] ACPI: Minimize X2APIC initial messages
Content-Disposition: inline; filename=minimize-x2apic-msgs
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Fri, 21 Jan 2011 20:25:37 +0000 (UTC)


--- linux-2.6.32.orig/arch/x86/kernel/acpi/boot.c
+++ linux-2.6.32/arch/x86/kernel/acpi/boot.c
@@ -848,6 +848,9 @@ static int __init acpi_parse_madt_lapic_
 	if (!count) {
 		x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC,
 						acpi_parse_x2apic, MAX_APICS);
+		/* insure trailing newline is output */
+		pr_cont("\n");
+
 		count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC,
 					      acpi_parse_lapic, MAX_APICS);
 	}
--- linux-2.6.32.orig/drivers/acpi/tables.c
+++ linux-2.6.32/drivers/acpi/tables.c
@@ -66,11 +66,16 @@ void acpi_table_print_madt_entry(struct
 		{
 			struct acpi_madt_local_x2apic *p =
 			    (struct acpi_madt_local_x2apic *)header;
-			printk(KERN_INFO PREFIX
-			       "X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n",
+
+			if ((p->uid & 7) == 0)
+				pr_info(PREFIX "X2APIC apic_id=uid:");
+
+			pr_cont(" %02x=%02x%s%s",
 			       p->local_apic_id, p->uid,
-			       (p->lapic_flags & ACPI_MADT_ENABLED) ?
-			       "enabled" : "disabled");
+			       /* assume "enabled" unless "disabled" */
+				(p->lapic_flags & ACPI_MADT_ENABLED) ?
+				"" : " disabled",
+				(p->uid & 7) == 7 ? "\n" : "");
 		}
 		break;