Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp764343ybl; Wed, 4 Dec 2019 10:27:44 -0800 (PST) X-Google-Smtp-Source: APXvYqwXKaie7ocRzz0PUc6g0NpmYHkb6w8kL5I0ZyyZCAAyTaAzRT0Xg7QB/G/dI6OdeYIthlPv X-Received: by 2002:aca:fd58:: with SMTP id b85mr3906871oii.106.1575484063873; Wed, 04 Dec 2019 10:27:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575484063; cv=none; d=google.com; s=arc-20160816; b=S7qUMcffg7IpBzJP1Ddh/YkzUMFEmyUlGaPfCDqQynzMkD/eJPRoOHVR3LQy5D67tq afWr4ZKaaBpOK+CD18e2Qo2WzAc6XpZ6TqQqajxFePtDfNMcG60MvUrL/6OLaiou9y7j REPESK1GI80KcztSOUSHcqFGKIhRpH0fcEahKZFiaKkGrjJsZHJ5NrP3mYx3NLaz+qfb fhlGC2QYaXL0LTxVlbUUo5pGp4YcZtL8pDMI20P1SoYp7JolqCNLEMlLFiT8K7Ovlcjd YwRVAt0fkmx257G+X2n1XPN2FNd0YLeMXdd69kUz7r82jltu03H0VtcsE3KMHERXWbhz Bozg== 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=wNgXuAVjdkEOFh3r1XvNxzltN/0RuWexwcVTq81p63A=; b=aupPieqMalcW3+syWxJrKz2Yn5iSBhJRBedjWlYjcKV+Sy5r7XBVilXTrM0PRTZsTA u/tFaAqmHlAXjAZsOGSFL+Cw4idkMt/XMR3MfRb3e6sGqJUspiQAcXzahUSHGQsdfXma +EH6J/aB7JP60YJ0youzQFydop9/x38Nm+OT9Q2+iWqwU2UB+LMzu8Tz67ggC+ehwu+b 3tdbTunJoO9FuUqGSDnm4Gh46HLMv1yd4LOXzCs5AqB7Wop2becFsj0ZnqzJkOM1m0bY fgBXwy0hYEoQ6HF4dd2BHW55bneHQwMNU8kCWGuL5AhhrsHU8LmyUufFqHIv9WRZSvYa Yp7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0OIZ8I4x; 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 k125si2026254oif.166.2019.12.04.10.27.31; Wed, 04 Dec 2019 10:27:43 -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=0OIZ8I4x; 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 S1729722AbfLDS0c (ORCPT + 99 others); Wed, 4 Dec 2019 13:26:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:35994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729106AbfLDR72 (ORCPT ); Wed, 4 Dec 2019 12:59:28 -0500 Received: from localhost (unknown [217.68.49.72]) (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 604E22084F; Wed, 4 Dec 2019 17:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482367; bh=KfUUKl4OJ/iRiB6WP0nLVctzTrRXlSgHQu7Wc1fD4IY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0OIZ8I4xoJZJHUHpcXC8dPDTfmIKU6JlCyUbzMhBWDJRQVXii4bEm/YNR4w+qY87m wHxV9CwDWbyv1jfYok/n06OBHIyBYrC1s65nH4lXLvyAguMxBxnkE2Z3jq4rVtBNj/ eU+X1oN6ccTyXeL94rJm1u3jfGAyDmqsc+4UrjGM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Stafford Horne , Sasha Levin Subject: [PATCH 4.4 42/92] openrisc: Fix broken paths to arch/or32 Date: Wed, 4 Dec 2019 18:49:42 +0100 Message-Id: <20191204174333.056751048@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204174327.215426506@linuxfoundation.org> References: <20191204174327.215426506@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Geert Uytterhoeven [ Upstream commit 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff ] OpenRISC was mainlined as "openrisc", not "or32". vmlinux.lds is generated from vmlinux.lds.S. Signed-off-by: Geert Uytterhoeven Signed-off-by: Stafford Horne Signed-off-by: Sasha Levin --- arch/openrisc/kernel/entry.S | 2 +- arch/openrisc/kernel/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S index fec8bf97d8064..c17e8451d9978 100644 --- a/arch/openrisc/kernel/entry.S +++ b/arch/openrisc/kernel/entry.S @@ -179,7 +179,7 @@ handler: ;\ * occured. in fact they never do. if you need them use * values saved on stack (for SPR_EPC, SPR_ESR) or content * of r4 (for SPR_EEAR). for details look at EXCEPTION_HANDLE() - * in 'arch/or32/kernel/head.S' + * in 'arch/openrisc/kernel/head.S' */ /* =====================================================[ exceptions] === */ diff --git a/arch/openrisc/kernel/head.S b/arch/openrisc/kernel/head.S index f14793306b03f..98dd6860bc0b9 100644 --- a/arch/openrisc/kernel/head.S +++ b/arch/openrisc/kernel/head.S @@ -1596,7 +1596,7 @@ _string_esr_irq_bug: /* * .data section should be page aligned - * (look into arch/or32/kernel/vmlinux.lds) + * (look into arch/openrisc/kernel/vmlinux.lds.S) */ .section .data,"aw" .align 8192 -- 2.20.1