From patchwork Tue May 10 07:41:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 772812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4A7fHoF019340 for ; Tue, 10 May 2011 07:41:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754720Ab1EJHlQ (ORCPT ); Tue, 10 May 2011 03:41:16 -0400 Received: from mga01.intel.com ([192.55.52.88]:48412 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754715Ab1EJHlP (ORCPT ); Tue, 10 May 2011 03:41:15 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 10 May 2011 00:41:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.64,345,1301900400"; d="scan'208";a="210387" Received: from yhuang-dev.sh.intel.com ([10.239.13.107]) by fmsmga001.fm.intel.com with ESMTP; 10 May 2011 00:41:13 -0700 From: Huang Ying To: Len Brown Cc: linux-kernel@vger.kernel.org, Andi Kleen , Tony Luck , ying.huang@intel.com, linux-acpi@vger.kernel.org Subject: [RFC, BUGFIX] ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled Date: Tue, 10 May 2011 15:41:10 +0800 Message-Id: <1305013270-5651-1-git-send-email-ying.huang@intel.com> X-Mailer: git-send-email 1.7.4.4 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 10 May 2011 07:41:17 +0000 (UTC) erst_dbg module can not work with ERST is disabled. So disable module loading to provide clearer information to user. Signed-off-by: Huang Ying --- drivers/acpi/apei/erst-dbg.c | 4 ++++ 1 file changed, 4 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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); }