From patchwork Sun Jun 12 06:54:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 9171353 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 23BB460869 for ; Sun, 12 Jun 2016 06:55:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14535265B9 for ; Sun, 12 Jun 2016 06:55:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 092BF27C8F; Sun, 12 Jun 2016 06:55:00 +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=ham 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 3076227C0C for ; Sun, 12 Jun 2016 06:54:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753157AbcFLGyq (ORCPT ); Sun, 12 Jun 2016 02:54:46 -0400 Received: from mail2.asahi-net.or.jp ([202.224.39.198]:8938 "EHLO mail2.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752629AbcFLGyl (ORCPT ); Sun, 12 Jun 2016 02:54:41 -0400 Received: from sa76r4 (y081184.ppp.asahi-net.or.jp [118.243.81.184]) by mail2.asahi-net.or.jp (Postfix) with ESMTP id 9111D14FFB; Sun, 12 Jun 2016 15:54:39 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by sa76r4 (Postfix) with ESMTP id 7FFCC12A79; Sun, 12 Jun 2016 15:54:39 +0900 (JST) X-Virus-Scanned: Debian amavisd-new at sa76r4.localdomain Received: from sa76r4 ([127.0.0.1]) by localhost (sa76r4.localdomain [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vcd-cJfWjsQu; Sun, 12 Jun 2016 15:54:39 +0900 (JST) Received: by sa76r4 (Postfix, from userid 1000) id 5F33312A60; Sun, 12 Jun 2016 15:54:39 +0900 (JST) From: Yoshinori Sato To: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yoshinori Sato Subject: [PATCH v2 04/17] sh: Use P1SEGADDR Date: Sun, 12 Jun 2016 15:54:22 +0900 Message-Id: <1465714475-24111-5-git-send-email-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1465714475-24111-1-git-send-email-ysato@users.sourceforge.jp> References: <1465714475-24111-1-git-send-email-ysato@users.sourceforge.jp> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP FDT address is P1SEG. So not virtual address. Signed-off-by: Yoshinori Sato --- arch/sh/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 86f2792..8e3b099 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -254,7 +254,7 @@ void __ref sh_fdt_init(phys_addr_t dt_phys) #ifdef CONFIG_USE_BUILTIN_DTB dt_virt = __dtb_start; #else - dt_virt = phys_to_virt(dt_phys); + dt_virt = (void *)P1SEGADDR(dt_phys); #endif if (!dt_virt || !early_init_dt_scan(dt_virt)) {