From patchwork Mon Dec 7 08:43:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fu.wei@linaro.org X-Patchwork-Id: 7781491 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E941BBEEE1 for ; Mon, 7 Dec 2015 08:43:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2548C203F4 for ; Mon, 7 Dec 2015 08:43:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28DB4203FB for ; Mon, 7 Dec 2015 08:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753643AbbLGIns (ORCPT ); Mon, 7 Dec 2015 03:43:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45647 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753310AbbLGInr (ORCPT ); Mon, 7 Dec 2015 03:43:47 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id EF64F49DD7; Mon, 7 Dec 2015 08:43:46 +0000 (UTC) Received: from magi-f22.redhat.com (vpn1-5-138.pek2.redhat.com [10.72.5.138]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB78hWs6012685; Mon, 7 Dec 2015 03:43:34 -0500 From: fu.wei@linaro.org To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linaro-acpi@lists.linaro.org, tomasz.nowicki@linaro.org, tn@semihalf.com, rjw@rjwysocki.net, lenb@kernel.org Cc: graeme.gregory@linaro.org, al.stone@linaro.org, hanjun.guo@linaro.org, jcm@redhat.com, rruigrok@codeaurora.org, harba@qti.qualcomm.com, Fu Wei Subject: [PATCH] acpi, apei, hest: Move HEST table initialization where it belongs. Date: Mon, 7 Dec 2015 16:43:17 +0800 Message-Id: <1449477797-12086-1-git-send-email-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Tomasz Nowicki Since HEST (hardware error sources table) can describe more than PCI specific errors, it needs to be moved out of acpi_pci_root_init. Changelog: v1: This patch - the first upstream patch to linux mailing lists. Fu Wei: (1)Rebase to v4.4-rc4; (2)Remove "#include " from drivers/acpi/pci_root.c] Signed-off-by: Tomasz Nowicki Signed-off-by: Fu Wei --- drivers/acpi/pci_root.c | 2 -- drivers/acpi/scan.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ae3fe4e..a35dd23 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -33,7 +33,6 @@ #include #include #include -#include /* for acpi_hest_init() */ #include "internal.h" @@ -865,7 +864,6 @@ out_release_info: void __init acpi_pci_root_init(void) { - acpi_hest_init(); if (acpi_pci_disabled) return; diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 78d5f02..a52e776 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -13,6 +13,8 @@ #include #include +#include /* for acpi_hest_init() */ + #include #include "internal.h" @@ -1912,6 +1914,7 @@ int __init acpi_scan_init(void) { int result; + acpi_hest_init(); acpi_pci_root_init(); acpi_pci_link_init(); acpi_processor_init();