From patchwork Sat Jul 18 20:08:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 497406 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9ECFF140D21 for ; Sun, 19 Jul 2015 06:19:42 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 8530A1A2AE5 for ; Sun, 19 Jul 2015 06:19:42 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0130.outbound.protection.outlook.com [157.56.110.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 19AEA1A1986 for ; Sun, 19 Jul 2015 06:09:30 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=none (message not signed) header.d=none; Received: from snotra.am.freescale.net (192.88.168.49) by CY1PR03MB1486.namprd03.prod.outlook.com (10.163.17.16) with Microsoft SMTP Server (TLS) id 15.1.213.14; Sat, 18 Jul 2015 20:09:23 +0000 From: Scott Wood To: Subject: [RFC PATCH 08/17] powerpc/book3e-64: rename interrupt_end_book3e with __end_interrupts Date: Sat, 18 Jul 2015 15:08:45 -0500 Message-ID: <1437250134-307-9-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437250134-307-1-git-send-email-scottwood@freescale.com> References: <1437250134-307-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BY2PR21CA0002.namprd21.prod.outlook.com (25.162.74.140) To CY1PR03MB1486.namprd03.prod.outlook.com (25.163.17.16) X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 2:WoR6T9pYXbspf2d72+4kWGdMnF5jtg6dUD+JFrXeNKYqrc/TQo4ViNQv6d0CnnzM; 3:PQ1IOHn8lllMJiWnO35h+c08gfQ8MW7dD1fc45BJt4HgQiF+O6hYTEZofgGi4qpJhOkSlUCh8cuFreUbTsqappiSFPImIvEQkdk0IlWmRHAOWpMhsg9SEkhk9+eAe4sqyYkCI+51zsrBecNBq/Jdsw==; 25:S5HivBotGOlfOwiL/OFGlde7gK14P2iw+fca+gHzngokxq/xQGDoJaEn4YhdraaiJx04cghJiOKZTbWlbmuB4vzXl3I97l5R8A6M77FjXCRUv1CZjLQZmkFIrN4BQsecW8s0S6BoONCBXMHjSGOoICgr8JGGeWUoZud8bEoLNKzjsRCF+7XyayrjTXHqkYKBM5n88/EZan9inlV+68S5yF/x/XQm14BAvcRTz2Mcx3RmZrLItck+DSv/F3CF/fDe8O9SC1LdfVHKWn3rGsqN1Q== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1486; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 20:N92xlO3XXJ+pnF6YwloAvkcierCjR/ETcPj0wFW+Ejwlh4DEw8Q+qLtZu8B2Eivu36nuIl0uI1IYTaMs5kttlFAnSWGXV5JJW46drbDubh5gOS9tD3Li623LdN9Kly6fUAGY7ea/WDqEC3QRoFLD688Mh0pPpmSK6x9RdA3KJrNeXMFkPd6OEW0/VZFjqEaw/ode+0hYdMotXcJXwPAjEFT0IQuST4gEb9mTQgX2yXhLL/9VqGoFcbJVTJY1wmIUGMRW9150jr+zDNQ7Ic/xHvUiySSsiIaGfoqkLI6SjJin1K3yKM3zaiXZVnHhC72Cdm8WBctc7SZqkhGpmIJwCMUCPSx/Ie0Q1S+klvicL3YHAbPS06dYMI/BaksvkYdhpMsTOJhmsQRO5pVlJKVZT/urUTKkVQQROpFQ4r9L9KrDpKrQtb7vizhWLPESVbjw7vJZ4vVFGA5EzCqlh4urUnzXI393mIVtz740LEwU00uZoqRNAN2zWe5qLsljl2hZ; 4:CXhx8hcDAyQ1tF5HCmaVInFbkKi+xPt5Ee6SJyjH9Kl0tHAeZVMrslK+ovKLx8scAzg2h2NVkSAyjK/YHQQfea1/X/qfvIsjus03OZuyhHnVI4MXTTn12TcXvSNciD57yX4Z57+69fbXQy29b+QjShs9bEdi6Cuy30cI0ySK6fltKZGRQdldmRRIcaR1Wv8AZXGxPQbiLuAX9KbyL1vkp7O3gk5UXd2jCv9W72MfZDqz8Sqbb6Nps4/yEmXEH1EmXjyi2NiCim+iAIFcWjgruYPi6wEtgUadX9BENjGDiNg= CY1PR03MB1486: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR03MB1486; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1486; X-Forefront-PRVS: 0641678E68 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(19580395003)(50466002)(19580405001)(229853001)(36756003)(46102003)(2351001)(42186005)(40100003)(87976001)(122386002)(33646002)(86362001)(62966003)(5001960100002)(5001920100001)(92566002)(2950100001)(110136002)(77096005)(107886002)(48376002)(77156002)(50986999)(76176999)(66066001)(47776003)(50226001)(5003940100001)(189998001)(217873001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1486; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 23:vjX3a7pOZhKUJHIVVpU6mGZoe6KYxAb/mTC39YJLp8WMaA2ebIeXt/QzAt1Yn+6iKSA9yjuB9Ll9UbXSrDU3T90kgbEi2q0bhoPLMKNLd+C7i/YyDjgLt7blgMVNgdOKpfVROeFcdhDyl9pqrylhvawyHNfN/aOWw2tcW8Lc6dOdbZyfL5V9D/BWrBsxaH2Q9cI2/ugP4MCAtHWuF+GwhF0SMWTC0WEBbQSY59umhOgh/reEPXQc2OKOCQCvSoIRFz0VnRRJfe9d8Y6pJCn8br1eOkZkhnqJEKkmXBQXQXbhavPzw7jq06AdOPvSDp1a+hENbqz0WThrYoOu0V+RkTKfj2NpePPw4Iktg8EargtrSGhOeALCv26VVVLhLDbtHRm66kW0JNkEQcLonuLU/RgoL0KeFRGgI7Rv5dpqgk7Phhv/cjScb6P9wgPXDeThxqHFLZBymtxMFWpnmzevdiPL0Il0IeLfZLFdDS3M/IIVeIMhnd6qadp3/U4AZNfOyrCSOtSfFVocXVEnRpCZzzSDDmqx1v/pCUyi1lpZAXRNuxdUpqHwf0uRA2XLBtX7n/bgeFzAkr81dA+fGoIy2zHSbqM9K7fBT2V/nZi6QWRMLuLdAj7lqQx9ZDKL+NCu9uLdT6sAaOsx0QGQJyDcTe7edj2mdQST9/4oMbmI5td+ycV5KFUBooS6rAhzcm7cy+B6Oy75ZPAYP4UBNBEUMYoKlqRdyxOkNsbtFIpb+HCnVZ+gVpHH2S5OE74Ov1vxzdy0i/WySe27ReoV9dCIypzM5V4X3SSuFHohFWQnqsLggqE5u8rRrAEppxeG1Tib1+Aj/wgxxYVitNtDA0SYRKZEem5L5qlyaqtnydDT1rkzlx5vjX6q5WcFQhyrhVqqb2m3HT7W4OV9yj+VQa4JuikVasVxQoXiAG+x9K54C0s= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 5:k9r5cjlQHj+qChdPCyjJ8ekIus9BdCC+r4qCXt0zp3BqurLwfc88hjDehaUIjQj3sDMjvCfykhP71BCjXiD0tdJGrTx3j9E/cokyniAAA6M5ZTL2LP/pY7nvThWsl7yQygm2YD7moFfg+pPJx/LbIg==; 24:mJdx9nV3qNlwPVVngOVqnLVS1OqMrDSI9yC3e1xjdCEBwqhBDcB6hX3LKdmilYXGlAhP53M02Vi7c2jmUbAcKqWcPtiO1k9RCwkryTJfDkA=; 20:YGo9xvWwYvTXIfnoazmL+xbW+acaIIKEwc4KxIPXrHHTMAKFSEiJ3zqGn57Ahc9I7inbA1fyvcIgi39vrSGNCA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 20:09:23.0360 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1486 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood , Tiejun Chen , kexec@lists.infradead.org, Tiejun Chen Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Tiejun Chen Rename 'interrupt_end_book3e' to '__end_interrupts' so that the symbol can be used by both book3s and book3e. Signed-off-by: Tiejun Chen [scottwood: edit changelog] Signed-off-by: Scott Wood --- arch/powerpc/kernel/exceptions-64e.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index f3bd5e7..9d4a006 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -542,8 +542,8 @@ interrupt_base_book3e: /* fake trap */ EXCEPTION_STUB(0x320, ehpriv) EXCEPTION_STUB(0x340, lrat_error) - .globl interrupt_end_book3e -interrupt_end_book3e: + .globl __end_interrupts +__end_interrupts: /* Critical Input Interrupt */ START_EXCEPTION(critical_input); @@ -736,7 +736,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) beq+ 1f LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e) - LOAD_REG_IMMEDIATE(r15,interrupt_end_book3e) + LOAD_REG_IMMEDIATE(r15,__end_interrupts) cmpld cr0,r10,r14 cmpld cr1,r10,r15 blt+ cr0,1f @@ -800,7 +800,7 @@ kernel_dbg_exc: beq+ 1f LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e) - LOAD_REG_IMMEDIATE(r15,interrupt_end_book3e) + LOAD_REG_IMMEDIATE(r15,__end_interrupts) cmpld cr0,r10,r14 cmpld cr1,r10,r15 blt+ cr0,1f