From patchwork Tue Sep 13 03:08:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 669113 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sY8sC0Pg5z9sC3 for ; Tue, 13 Sep 2016 13:13:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=siK2QfJz; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sY8sB6PJGzDsZC for ; Tue, 13 Sep 2016 13:13:50 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=siK2QfJz; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sY8ln1zyXzDsRL for ; Tue, 13 Sep 2016 13:09:09 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=siK2QfJz; dkim-atps=neutral Received: by mail-pf0-x244.google.com with SMTP id x24so8934377pfa.3 for ; Mon, 12 Sep 2016 20:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yRy3a/VbKDO6SwKfIpG21dWZ1Sy9qv7qbIsBm7iwf98=; b=siK2QfJzKuzI4G/QvJJ/DIxO1CvoK8iENC1OqBlW6A4wlfzRBbx49qzoHsuh9n9bqS DdEmD4V2qGks0EK3uY2cGaUq9zLR39in77FiUAg6MDCc6PJI6X6wd1Tjc6Poe2Sh+Bpg jkB72dw6BdKGajLvyfmA403r/sxShjT55Ag67jdSD0YH/VcZi/ajt8IzzKjMZh8uBwha IzXCOH2vMLUfB0Vt0xwM16RytB5c+WneM+mIByn2RCVTEHE3IkBGC3gKw6HOl2zCOELs PNOfAo+X5GUHaI/cflbgexJlTY6wJhxSyfpaUdgPBSyTjwa0fDDVERsqlQ/8+NubsGeJ Atxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yRy3a/VbKDO6SwKfIpG21dWZ1Sy9qv7qbIsBm7iwf98=; b=NpLR0XXno3hV/p52p9y+qpfbImcoGDWYIPj/R9u8gc0gQVZVZUq7tL6EQwXWw274HR d2SVC0n/gqRMdpUTQc99v/5+L1wZd7Y5az/tOCt1iYb/RSo2S0W8v2+KUwz8bQrzAjVU Z8oXlAnmZRxQeuZEFZV8pQ1/O8nNq+5cV6U+NlU5iP/ZJWXvELvH0nBxLDpMDyPZE5lY 2zH8oRKjJXH83WL7Smx6UDBfh9UFcNvHvIBMY7LWWoHCInFY/wm+BLx22qHVsoApG/kv u42roGX7B2efrZwqZd/35GW/w13aV/Jv66qRjYKUooPpN6OKFxp7GSRQ50Z6A6EHlW6R Hnzg== X-Gm-Message-State: AE9vXwPF8Vlv5rR9mnssciZbNC1+cbY1Ts2I+Ihyr73Sc8vlAC96oN6ogEb5itA8OaYp0g== X-Received: by 10.98.99.67 with SMTP id x64mr39781927pfb.26.1473736147732; Mon, 12 Sep 2016 20:09:07 -0700 (PDT) Received: from roar.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id q8sm27429315pac.32.2016.09.12.20.09.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 20:09:07 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras Subject: [PATCH 2/8] powerpc/pseries: syscall remove trampoline Date: Tue, 13 Sep 2016 13:08:40 +1000 Message-Id: <20160913030846.29790-3-npiggin@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160913030846.29790-1-npiggin@gmail.com> References: <20160913030846.29790-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The syscall trampoline is not required, remove it. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 4015f71..ea57a2c 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -42,7 +42,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE) \ #define SYSCALL_PSERIES_2_RFID \ mfspr r12,SPRN_SRR1 ; \ ld r10,PACAKBASE(r13) ; \ - LOAD_HANDLER(r10, system_call_entry) ; \ + LOAD_HANDLER(r10, system_call_common) ; \ mtspr SPRN_SRR0,r10 ; \ ld r10,PACAKMSR(r13) ; \ mtspr SPRN_SRR1,r10 ; \ @@ -65,7 +65,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE) \ #define SYSCALL_PSERIES_2_DIRECT \ mflr r10 ; \ ld r12,PACAKBASE(r13) ; \ - LOAD_HANDLER(r12, system_call_entry) ; \ + LOAD_HANDLER(r12, system_call_common) ; \ mtctr r12 ; \ mfspr r12,SPRN_SRR1 ; \ /* Re-use of r13... No spare regs to do this */ \ @@ -910,10 +910,6 @@ hv_facility_unavailable_relon_trampoline: #endif STD_RELON_EXCEPTION_PSERIES(0x5700, 0x1700, altivec_assist) - .align 7 -system_call_entry: - b system_call_common - ppc64_runlatch_on_trampoline: b __ppc64_runlatch_on