Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2481779imj; Mon, 18 Feb 2019 06:47:03 -0800 (PST) X-Google-Smtp-Source: AHgI3IYu0vTZDxIj+l3Aw4d2CXTdm6GJ8UsB1PQ9A+qI7X0Y7qmgc1IDuswBT03ODmvZ6k7ZWWlT X-Received: by 2002:a17:902:8e8a:: with SMTP id bg10mr25694569plb.192.1550501223504; Mon, 18 Feb 2019 06:47:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550501223; cv=none; d=google.com; s=arc-20160816; b=YbtqAtWSJl+C7Jlv3dqomu/OeMQdCRXdBRc0NVp8mCj8299XqJ15InxS2YGkpDp2/e E4Pt05k+tdQQIef7TdWZRccrW2wj5qsE8VTmBEa/QZ4qfu6LUXpiLoS7M7bbAEEuZVeY BUR1myaI8BuovUxwJViCiefgkqQO51vM+kpoKb408OIxKX90KxWi0AOngMBloNCGQbWY jeF0oQQo1+Lq5DXjKhLeDLbcho5DAmmxrHtd5ffKAxY4qi8AR41kSf6MV2qRIjIHFsgQ r+pcBgBj7ZF5EV2AM9FBTroknPQRpMCH1QabyzgE3AmyOS8+EG7JLMiLPbdcwJR9kYPd nDAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EDU1l3PV7/0TNXqwdcW2glTLoYPooFFvx6XJwJYoDLM=; b=yEIZPR1V3A8vb784zq7JDZ7MlWHrqRbszQtCxrHKiFpUYu9kc+HXCdEJ+PUrmIS2UH kpDNj+Dhpt80nuhKeYL1i6BlrHdhk5hCkw4FcMg2uN+glRMDrOY00Yjr3TdJ1MlG+Q+D Od02MiOk/eU87K/5p33BseJML/s+XmQwn6D8Rhsq8P2S91dEccMJoZJpWZ8EAh8Zsr9q 6gS7VCYdtZj1GHHddrfMvqHPp4+JFS5mD4SaEYXIilg/HPiwycmwupDX344nQiBNYxZJ GqfJdSB4a0sHyVkHt9brT8Olcn+/p/H0uRSNFJBlgGue3DGO7ahlUrz3SeveWlY/Mj3P y+kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CFt8OZ6z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m188si13774937pfb.266.2019.02.18.06.46.40; Mon, 18 Feb 2019 06:47:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CFt8OZ6z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732006AbfBROp4 (ORCPT + 99 others); Mon, 18 Feb 2019 09:45:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:53762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728626AbfBRNrK (ORCPT ); Mon, 18 Feb 2019 08:47:10 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04F1E218FC; Mon, 18 Feb 2019 13:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497629; bh=ENJu57nRz0rW2Gfynn6Sq1T0VvmkbIZMOCBxxC9ob+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CFt8OZ6zRgL3Z7XqsLL3rNiBytbR+HeWaNEBPduVV1SSBRW/e1jyxwgE9SNrJZTRq esC4rkZ5tTSrqHedS2zHcdAeJUE3+2QANFlO3g9P5r1BWjhBD1aYK/bYilT7OwvF2X xFC/AZSam0Aei9TwiTXghFPA4IsqCdI+9F144G8M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guo Ren , Arnd Bergmann , Linus Torvalds , Sasha Levin Subject: [PATCH 4.20 37/92] csky: fixup compile error with CPU 810. Date: Mon, 18 Feb 2019 14:42:40 +0100 Message-Id: <20190218133458.185734906@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133454.668268457@linuxfoundation.org> References: <20190218133454.668268457@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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