From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6706DC282C4 for ; Sat, 9 Feb 2019 18:48:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 345802192B for ; Sat, 9 Feb 2019 18:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549738106; bh=bolxdIRHX7ktMlRtXeGX5290TGCwf0d8ZGQxePt8yK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G99AnN1RF/cfAyZAaOcXDgKpRtSYSAVYOXcl5cIlISngmWur0N4m9IKpEr5zAcmCZ vyH1Az9N15hEXcc/jro+R7xZM8aomV4/8D+9j4ZC8gRThYH+AXChyErZ+CN7Sk5jkp TVBJuCBwyCxjOTb4JqWrgLPZvHxRHbCZ0JNI5S68= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727662AbfBISsZ (ORCPT ); Sat, 9 Feb 2019 13:48:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:33240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727648AbfBISsY (ORCPT ); Sat, 9 Feb 2019 13:48:24 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D7F792192B; Sat, 9 Feb 2019 18:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549738103; bh=bolxdIRHX7ktMlRtXeGX5290TGCwf0d8ZGQxePt8yK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L9i3huPlqCw79vses/hmGX6E/TYfBeOLOYEHvRj5HrfScCEhAlMsxAW/oeAIogplw V4tR5NHxQkLdkYxuZMmMBGo8Gsv4PArXlsarApKW+dIUoWpeAzZVODy9Y5yshqBL+U QgQwORO1IwUyE/tFYNAhf9V4K/XmPpyQWlk1s0e8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guo Ren , Arnd Bergmann , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.20 34/42] csky: fixup compile error with CPU 810. Date: Sat, 9 Feb 2019 13:47:26 -0500 Message-Id: <20190209184734.125935-34-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190209184734.125935-1-sashal@kernel.org> References: <20190209184734.125935-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guo Ren [ Upstream commit 70c25259537c073584eb906865307687275b527f ] This bug is from commit f553aa1c13cb ("csky: fixup relocation error with 807 & 860"). I forgot to compile with 810 for that patch. Signed-off-by: Guo Ren Cc: Arnd Bergmann Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/csky/kernel/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/csky/kernel/module.c b/arch/csky/kernel/module.c index 0b028ee3c764..b5ad7d9de18c 100644 --- a/arch/csky/kernel/module.c +++ b/arch/csky/kernel/module.c @@ -28,7 +28,7 @@ static void jsri_2_lrw_jsr(uint32_t *location) { - uint16_t location_tmp = (uint16_t *)location; + uint16_t *location_tmp = (uint16_t *)location; if (IS_BSR32(*location_tmp, *(location_tmp + 1))) return; -- 2.19.1