From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755619Ab1HBWPd (ORCPT ); Tue, 2 Aug 2011 18:15:33 -0400 Received: from vms173005pub.verizon.net ([206.46.173.5]:47033 "EHLO vms173005pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755501Ab1HBWPW (ORCPT ); Tue, 2 Aug 2011 18:15:22 -0400 From: Len Brown To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Huang Ying , Len Brown Subject: [PATCH 01/19] ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled Date: Tue, 02 Aug 2011 18:14:34 -0400 Message-id: X-Mailer: git-send-email 1.7.6.396.ge0613 In-reply-to: <1312323292-2986-1-git-send-email-lenb@kernel.org> References: <1312323292-2986-1-git-send-email-lenb@kernel.org> X-Patchwork-Hint: ignore Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Ying erst_dbg module can not work when ERST is disabled. So disable module loading to provide clearer information to user. Signed-off-by: Huang Ying Signed-off-by: Len Brown --- drivers/acpi/apei/erst-dbg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/apei/erst-dbg.c b/drivers/acpi/apei/erst-dbg.c index a4cfb64..cb04aa4 100644 --- a/drivers/acpi/apei/erst-dbg.c +++ b/drivers/acpi/apei/erst-dbg.c @@ -213,6 +213,10 @@ static struct miscdevice erst_dbg_dev = { static __init int erst_dbg_init(void) { + if (erst_disable) { + pr_info(ERST_DBG_PFX "ERST support is disabled.\n"); + return -ENODEV; + } return misc_register(&erst_dbg_dev); } -- 1.7.6.396.ge0613