From patchwork Wed Oct 7 03:48:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 527107 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 AF7B0140D95 for ; Wed, 7 Oct 2015 15:00:31 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 77E231A02C2 for ; Wed, 7 Oct 2015 15:00:31 +1100 (AEDT) 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-bn1on0134.outbound.protection.outlook.com [157.56.110.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 31B7C1A0118 for ; Wed, 7 Oct 2015 14:48:49 +1100 (AEDT) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.am.freescale.net (192.88.168.49) by BY1PR03MB1483.namprd03.prod.outlook.com (10.162.210.141) with Microsoft SMTP Server (TLS) id 15.1.286.20; Wed, 7 Oct 2015 03:48:43 +0000 From: Scott Wood To: Subject: [PATCH v2 09/18] powerpc/book3e-64: rename interrupt_end_book3e with __end_interrupts Date: Tue, 6 Oct 2015 22:48:13 -0500 Message-ID: <1444189702-17241-10-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444189702-17241-1-git-send-email-scottwood@freescale.com> References: <1444189702-17241-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BLUPR08CA0034.namprd08.prod.outlook.com (10.141.200.14) To BY1PR03MB1483.namprd03.prod.outlook.com (25.162.210.141) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 2:WSe3ZEdHEZy+/KXEslGR3GdN8Mx5UxGrcnFMjXmvbL0KGy25TQRqnVuEkTHvtBxTO36EttZ1wYBmbXJiGxluAzYs/tPyo1okLFqwClT6gdKY3O1BkJqVkjKfBINaipfohPLZhRJbTBakbxDWsR6NiHYPBchTT9oHXhtp7nge/y8=; 3:oM5sLp9CiSEtL2AFgu3X62jYTUU5IlCuxq4lNaMkKPsiz+YkiLvJa9K4tCjMmTPHrFTgm1utQttx0ITZEEZKGDPXErhasgbrx0IvmeRfuo74nes28L6VjhqcaOST7cxgsDcDBxyOg1aePh5OXgewkg==; 25:ILpLD+L57zoi8dbGIkZAgUlMDclvoJWJ9zdlwfoMQhjk8BgOclyDoE9YaG5jC4gW9omZaay/y5SPILhft0k4gB94wnBr9bpwgjWgxr4/GZC3YbPVEm9FqRX8xiWMqRIRRBXkjp69Y6oxZM8rvxYlgzEu45X+uJ96ndeVHbgsAWd7pf9ObUdvVb+tbL1tfyOFK5Ye3VjwfM/SLLE6jYQgtbrjTjS6q8s5hFeGclde/5t0dh0fda1UUIKl62ZIbgHwrj/g76byDaEvgV+V5PrMBw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 20:Zd0SZuXVxkzbwndn29tzPvz1UXXi33n62q9LbRNQkzSpXw6RFAnXTCRMURe9zrNFtqpnLGNcOupa2algzLHepYqiY1fGUPgaDynQEXykchez10S5ahbmBVPcj2YYWaYrw43+ATRnk/xPgccTGzAbXKR3y/tkAD81g6t2GZOyLJ98C8C4sVhfD0LACcYR0paKAz9dNCMlTXSpDLtZOoG8vqmKE1AyF6PJQaraPiR12YfsSoC/MrWBIwMu0ubiaFKXNuhakA1PFYD+dTvaoxKuoFfcnZUY3nP/hWCIZ/xX/BxiZsUslS2C4n9ZHKJGRm4FUNLAoCuGRAezbdw8qvJvXK9MLxxqtRm4icAGHVPan+WHGB6O3bh0tDMYNJedeJ1dG3gD5V8WDgf/tAduS+/CQsZ6Vqgnzhdt4oVQOYUuGESGRWj6r4vUrPze5zjkEHzJc7hfrSFWIw1qfY6SKa7Vh0GPSASpq/HQ3bqXN+ZboY8RjIEq+EY62wZp6mqiGQNz; 4:B6tqWBBjZBT+/NnFfngYB/ITMdqJ/TiSBdul39BYyUL7rFOYPXhydXPQXGYYnJj/3c6YHsQ7AQQcHu8f6NTHZYrT1qvDq+GeBFi385hEzUMcMKuOTtvn2CTvwvWZAH5dYgA40kJgnb/ZHmnGTtzlTViAM3WBLD39rPpof325JBnM9Feu2dmZdqLMp0o9fgC8aYcx9r6CQqimArizXPIv4ZZMeaLnzfGwXE4RaO4YMCs4ttDp64Da2jd2Uq/Q12Oz6Ltt4sR6xPmx+vYT6hBmHeKtQcTNkMZ9yrbQ/6wfMZLFLbjF0Hwkm+teVxW+94SymDB2RZMvjyYLvGIL6U1b0eVAdp8wtQva+U5MJrNmyOE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001); SRVR:BY1PR03MB1483; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1483; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(54534003)(189002)(122386002)(19580395003)(5007970100001)(5003940100001)(189998001)(19580405001)(107886002)(105586002)(46102003)(106356001)(50466002)(77096005)(40100003)(2351001)(110136002)(50986999)(64706001)(42186005)(87976001)(86362001)(5004730100002)(47776003)(5001960100002)(76176999)(229853001)(101416001)(50226001)(92566002)(5008740100001)(2950100001)(66066001)(33646002)(36756003)(81156007)(5001920100001)(97736004)(48376002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1483; H:snotra.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1483; 23:G2s4AOLylr+Kf3AIOdyPNq95ihZLRM7Pm1XTEStd2?= =?us-ascii?Q?Yi74nLK6NMWRJsiAD75HxPlEGjQ8emky1iIutzHLTMbz4URcRbNf3yZtK//x?= =?us-ascii?Q?EaNBUcW4q2jI8NZc5FCMe7cOi0ftuTmxMtgJkZt+ie5fNEBaEsZZLc3K9WBa?= =?us-ascii?Q?fRt+9VXFzPNVVl6nWbw0s1l4YUBHoxhNz8JVZuCtxrzwLAEC1AYIomondRwa?= =?us-ascii?Q?g1kP0fT0U7RfhggWjmSdGWEXOezg2b8txOtsY4KoOrOxU9x/JbUHGbICLC+G?= =?us-ascii?Q?kALsuf6vqrymiQDSZnlFZgWRqPfPp5P7+gsURgG7fWOEn9Ir4nxcwOkw5/cT?= =?us-ascii?Q?F6XsCuc/l99cmYHXjng8mDrUqJLxcW/bYT6Fvi2MnvWb9Aur0kyM3KKxB3rN?= =?us-ascii?Q?hP0UdcvSSxYhDPF9IvLrfBgV7qyaq6B320RYInDyPXwTq5q9kO2XZbVbX2GD?= =?us-ascii?Q?FIuApSOYP5ZCg+F2JehPJg7SjvKUA1GFmf1TuK7EEuwJDRvW5dYr6r16XuoH?= =?us-ascii?Q?NuDoInywgG8/F8uB55PrbvEccAduzocr0xeXgEjGs2wt9IfzebmvnzvKwRGe?= =?us-ascii?Q?8pkwyjptngoq6f5VK+e4ce8l95eepWhDebP+ebM7wF7yemxjWdV91M6XBqHg?= =?us-ascii?Q?QhicubB3yuvnzPs/7R7bT0+WemoslH75aAm4nD21FKIfeQQUrQGrNt7qPEKI?= =?us-ascii?Q?SjkhPv4KpcTBRgF1qCJAWi2oeyxKT7wpmLIwXWH4+IYk4GXoj766q0hTUg6Y?= =?us-ascii?Q?UoMTUGxXDKZzZsFxB6dyRlkaZlTUSFgxLfMJm0plYb1PRa5IeEUbctZJfU/b?= =?us-ascii?Q?3nMMyf7je2ZBoG6224EmuLKpHu7SaIBPiXLWGT186j+lhdaUiSD/VWsNkDbh?= =?us-ascii?Q?u6F0zmXEZI3mJJ1Ef9Oxo8X2Wlu8/V5fcT8PHlTQ7tm0MP9yc4eE2x0+n75O?= =?us-ascii?Q?qe303e+Pv4cImJWHIfK3EO/0tuLvyNqY3wYKQeorWGZfaAUOTecXiFriHFNu?= =?us-ascii?Q?R8ym7f4gHWxtxrRgguiTYIqPeU2pjmFXxv+pnD7DGp4NgF4jjLY5NpPpS3yt?= =?us-ascii?Q?ddUPV7tpmhsVM/x4OwR59nJw7pJ04XkmhwxNj9xifpTEg+1iyVF7FgSL9n3h?= =?us-ascii?Q?HT9cLEAe0sfEPWmarScr4wdXoaEewlT?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 5:qsjxdcPMSNc6bj5ucS0xzpmUUJRHC4+6oBsX7ukZmVJthdNKvvV4rlbhNdD97ma+V9uU91X4QDaE2kzEtC0zZIl2pvnB33Zzwf6EF42nzsZ33hNXJFdxqYLEu0tANUjYt7PBruj3Q5M0yisDS/pXuw==; 24:zV7NKMjhLBvo+txqv0Vd6LuDJgx2JAMBVInFsqSxtjUQVkkbj1IU5V8GlMk+uWyNwqWtXvHk7hUBs27i5VvS3OKXtc0TaW1VAAdUvlrr2rI=; 20:dWQJRw5Dr6Jp5YjqvLj02ql0LBJMNBBIF69DvSyR8QIU9pBfqJtLqI79Ay4V/es+593P0SJAPdanerPHbTFCgw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2015 03:48:43.4666 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1483 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: Tiejun Chen , Tiejun Chen , kexec@lists.infradead.org, Scott Wood 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