From patchwork Thu Mar 12 15:23:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 449533 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 12A4E1400EA for ; Fri, 13 Mar 2015 02:38:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932441AbbCLPg4 (ORCPT ); Thu, 12 Mar 2015 11:36:56 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:10579 "EHLO mailhub1.si.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932155AbbCLPfm (ORCPT ); Thu, 12 Mar 2015 11:35:42 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 95C9A1C8340; Thu, 12 Mar 2015 16:35:39 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from mailhub1.si.c-s.fr ([192.168.12.234]) by localhost (mailhub1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FkZ0TzT_9wiw; Thu, 12 Mar 2015 16:35:39 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 564BC1C8357; Thu, 12 Mar 2015 16:35:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C5138C73CD; Thu, 12 Mar 2015 16:35:38 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id CCHDe-TfJ5Cj; Thu, 12 Mar 2015 16:35:38 +0100 (CET) Received: from PO10863.localdomain (unknown [192.168.4.167]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 89AA3C73CB; Thu, 12 Mar 2015 16:35:36 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 83BA31A241D; Thu, 12 Mar 2015 16:23:44 +0100 (CET) From: Christophe Leroy To: Jeff Dike , Richard Weinberger CC: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, linux-fbdev@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH 2/8] um: replace CONFIG_8xx by CONFIG_PPC_8xx Message-Id: <20150312152344.83BA31A241D@localhost.localdomain> Date: Thu, 12 Mar 2015 16:23:44 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Two config options exist to define powerpc MPC8xx: * CONFIG_PPC_8xx * CONFIG_8xx In addition, CONFIG_PPC_8xx also defines CONFIG_CPM1 as communication co-processor arch/powerpc/platforms/Kconfig.cputype has contained the following comment about CONFIG_8xx item for some years: "# this is temp to handle compat with arch=ppc" It looks like not many places still have that old CONFIG_8xx used, so it is likely to be a good time to get rid of it completely ? Signed-off-by: Christophe Leroy --- arch/um/sys-ppc/misc.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/um/sys-ppc/misc.S b/arch/um/sys-ppc/misc.S index 1364b7d..163e0b2 100644 --- a/arch/um/sys-ppc/misc.S +++ b/arch/um/sys-ppc/misc.S @@ -18,7 +18,7 @@ #include #include "ppc_asm.h" -#if defined(CONFIG_4xx) || defined(CONFIG_8xx) +#if defined(CONFIG_4xx) || defined(CONFIG_PPC_8xx) #define CACHE_LINE_SIZE 16 #define LG_CACHE_LINE_SIZE 4 #define MAX_COPY_PREFETCH 1 @@ -26,7 +26,7 @@ #define CACHE_LINE_SIZE 32 #define LG_CACHE_LINE_SIZE 5 #define MAX_COPY_PREFETCH 4 -#endif /* CONFIG_4xx || CONFIG_8xx */ +#endif /* CONFIG_4xx || CONFIG_PPC_8xx */ .text @@ -38,7 +38,7 @@ _GLOBAL(clear_page) li r0,4096/CACHE_LINE_SIZE mtctr r0 -#ifdef CONFIG_8xx +#ifdef CONFIG_PPC_8xx li r4, 0 1: stw r4, 0(r3) stw r4, 4(r3) @@ -72,7 +72,7 @@ _GLOBAL(copy_page) addi r4,r4,-4 li r5,4 -#ifndef CONFIG_8xx +#ifndef CONFIG_PPC_8xx #if MAX_COPY_PREFETCH > 1 li r0,MAX_COPY_PREFETCH li r11,4 @@ -84,12 +84,12 @@ _GLOBAL(copy_page) dcbt r5,r4 li r11,CACHE_LINE_SIZE+4 #endif /* MAX_COPY_PREFETCH */ -#endif /* CONFIG_8xx */ +#endif /* CONFIG_PPC_8xx */ li r0,4096/CACHE_LINE_SIZE mtctr r0 1: -#ifndef CONFIG_8xx +#ifndef CONFIG_PPC_8xx dcbt r11,r4 dcbz r5,r3 #endif