From patchwork Tue Oct 31 12:25:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiju Jose X-Patchwork-Id: 10034391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 384D2602B9 for ; Tue, 31 Oct 2017 12:26:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E5BC27CEA for ; Tue, 31 Oct 2017 12:26:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2337D28A7F; Tue, 31 Oct 2017 12:26:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2323027CEA for ; Tue, 31 Oct 2017 12:26:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752386AbdJaM0g (ORCPT ); Tue, 31 Oct 2017 08:26:36 -0400 Received: from [45.249.212.32] ([45.249.212.32]:41749 "EHLO huawei.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752598AbdJaM0e (ORCPT ); Tue, 31 Oct 2017 08:26:34 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 1931ADBA99005; Tue, 31 Oct 2017 20:26:21 +0800 (CST) Received: from [127.0.0.1] (10.202.226.121) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.361.1; Tue, 31 Oct 2017 20:25:55 +0800 To: , , , CC: , , From: Subject: [PATCH 1/1] scsi: hisi_sas: fix for the build error log_non_standard_event undefined Message-ID: <3f14f745-6fdf-4948-85bb-d21d565dbcab@huawei.com> Date: Tue, 31 Oct 2017 12:25:51 +0000 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Thunderbird/45.5.0 MIME-Version: 1.0 X-Originating-IP: [10.202.226.121] X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fix the build error log_non_standard_event undefined for the i386 build for COMPILE_TEST. https://lists.01.org/pipermail/kbuild-all/2017-October/039518.html The function call log_non_standard_event is replaced with the function call trace_non_standard_event. Signed-off-by: Shiju Jose Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 41 ++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index 433412a..72f606a 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -2959,12 +2959,13 @@ static irqreturn_t int_chnl_int_v2_hw(int irq_no, void *p) if (trace_ns_event_enabled) { err_data.physical_addr = val; err_data.type = ecc_error->type; - log_non_standard_event(&CPER_SEC_TYPE_HISI_SAS, - &NULL_UUID_LE, - dev_name(dev), - GHES_SEV_RECOVERABLE, - (const u8 *)&err_data, - sizeof(err_data)); + trace_non_standard_event( + &CPER_SEC_TYPE_HISI_SAS, + &NULL_UUID_LE, + dev_name(dev), + GHES_SEV_RECOVERABLE, + (const u8 *)&err_data, + sizeof(err_data)); } else { dev_warn(dev, ecc_error->msg, val); } @@ -3000,12 +3001,13 @@ static void multi_bit_ecc_error_process_v2_hw(struct hisi_hba *hisi_hba, if (trace_ns_event_enabled) { err_data.physical_addr = val; err_data.type = ecc_error->type; - log_non_standard_event(&CPER_SEC_TYPE_HISI_SAS, - &NULL_UUID_LE, - dev_name(dev), - GHES_SEV_PANIC, - (const u8 *)&err_data, - sizeof(err_data)); + trace_non_standard_event( + &CPER_SEC_TYPE_HISI_SAS, + &NULL_UUID_LE, + dev_name(dev), + GHES_SEV_PANIC, + (const u8 *)&err_data, + sizeof(err_data)); } else { dev_warn(dev, ecc_error->msg, irq_value, val); } @@ -3135,7 +3137,7 @@ static irqreturn_t fatal_axi_int_v2_hw(int irq_no, void *p) HISI_SAS_VALID_AXI_ERR_INFO; err_data.type = axi_error->type; err_data.axi_err_info = sub->msk; - log_non_standard_event( + trace_non_standard_event( &CPER_SEC_TYPE_HISI_SAS, &NULL_UUID_LE, dev_name(dev), @@ -3152,12 +3154,13 @@ static irqreturn_t fatal_axi_int_v2_hw(int irq_no, void *p) err_data.validation_bits = HISI_SAS_VALID_ERR_TYPE; err_data.type = axi_error->type; - log_non_standard_event(&CPER_SEC_TYPE_HISI_SAS, - &NULL_UUID_LE, - dev_name(dev), - GHES_SEV_PANIC, - (const u8 *)&err_data, - sizeof(err_data)); + trace_non_standard_event( + &CPER_SEC_TYPE_HISI_SAS, + &NULL_UUID_LE, + dev_name(dev), + GHES_SEV_PANIC, + (const u8 *)&err_data, + sizeof(err_data)); } else dev_warn(dev, "%s (0x%x) found!\n", axi_error->msg, irq_value);