Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: [PATCH 2/3] powerpc/lib/sstep: Remove unneeded #ifdef __powerpc64__
Thread-Topic: [PATCH 2/3] powerpc/lib/sstep: Remove unneeded #ifdef
 __powerpc64__
Thread-Index: AQHYDp3N3afa5Bk3SEeYq+oBxP6DJQ==
Date:   Fri, 21 Jan 2022 08:06:32 +0000
Message-ID: <ee61b693bc7e046eed1abb7a34909eb4878a9442.1642752375.git.christophe.leroy@csgroup.eu>
References: <6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu>
In-Reply-To: <6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?zEi8m4vaAC2BLCVKlZ9myKr2og13mDGC9lhZFpXrA4nyvu5NFfi+frx9zS?=
 =?iso-8859-1?Q?y85PobqeE1hmGKWco+ExBVJgGiAyoSuy/PZTpmvE56tiOManenQZlUJg/x?=
 =?iso-8859-1?Q?+qyg1tKvXRHV7mmEd9U7z2YZ3imRwfmP8ttsUlqcU6JhA5AgcguAfw/KlW?=
 =?iso-8859-1?Q?5cv/CBLY/QnVOpNiUA5EzfVkceUI0kv6G8yES90pdQii8hxmdlhosLKAFb?=
 =?iso-8859-1?Q?gUs+ZshJplNoYnKceY6PqXNcs32Cx3eyLDJCDYz1INotUlww7unJ4osH33?=
 =?iso-8859-1?Q?gz2BMHoIxxatWYcaHOtjoQc16pKG5rehB8Z0C+Oxa8DzxXpkT9l9FSVqka?=
 =?iso-8859-1?Q?H/Ad8VDJYjc0XVUPVOybID4HHI7Szsuxnf+xEpX5kB5XunDO65jY6X+z67?=
 =?iso-8859-1?Q?uoZ/FUDbc5a3GfJeBS+4t6W+e2yymiAEnzE07xhEgJubdUNaUoP8xgmOlS?=
 =?iso-8859-1?Q?77m75ejZyyf5dx61lSEUaOHKwt0JeL3QON2M7jP3UjkuLz9W5yZ2qJmj2u?=
 =?iso-8859-1?Q?X0r1Ittb4sVGHBHbsCTw1EytAxwUAt9CA6AtGCDLGa+UYFZEPOB/awuvl/?=
 =?iso-8859-1?Q?w5Fo+ZOsEGe3G3G7i6TGoP4y4iP1QMsKq/WgfXk+/V3IiBgEfTXVIqJQe+?=
 =?iso-8859-1?Q?tsSRfYJVDpTw7OQOwZ2zrjD+zRSlryT0rrnA0FvuD3m7erjGvnjK0ZcO5o?=
 =?iso-8859-1?Q?jLJ9mJstFYP43+XBr1czkyUZtUvn6UlkGR4JMtK6X4IDfIFRNbaEPIe5Uh?=
 =?iso-8859-1?Q?3lLz58NlJXi/b7dpelzCWNzDRmTvsCNLw2+M4L4487n8BNHZDGmNbqNSrO?=
 =?iso-8859-1?Q?V40a1XMQ5xHJ8roJ02E45Eqjje6Gg1odOxDrhMnU7T/pRy233NioknVJ4n?=
 =?iso-8859-1?Q?zBNFwu5qjNQ99GJXKR3i2n6/xUVRad600r6cUgLhtyJrbY91z14mzJBWy5?=
 =?iso-8859-1?Q?FU9hZ8+9HFJQJy3vdAYmI+LD2UfFYlNt7kNXIkom91ktdRQMlO/ibnntdV?=
 =?iso-8859-1?Q?oPDa0IEOp0EWPbqiyux/vPf1CWtOjAFBraoQkv+uLCGRixWtzRfNE8+5wo?=
 =?iso-8859-1?Q?EQr7PqydlGsqUu9rrD93PF6RoDOx9G3pkbOEAJFshih/NImyLCcnSaDWzL?=
 =?iso-8859-1?Q?cNOKX1a1XuJU+NZINXs1B0VMOwe8qv0RT+USDekCzPm/2rv/zvemxObhBa?=
 =?iso-8859-1?Q?AS3tWwSri1GA1Or4OHmyTn95D07ZOH8OR296TU1PMpfOCh/GCoymqb2Eqg?=
 =?iso-8859-1?Q?yoV6NKNU2h/2PP7/48wuFm23nWZv+7TBc3S+83xdPLL2M6N9msKXjoVguj?=
 =?iso-8859-1?Q?fj1b6AUMPz4KqqWQuyo4RiXM+KTaB9CJQzYWEowIIIdhGoCrE3UNM3Uu1x?=
 =?iso-8859-1?Q?D1OnlXj+SEO90/z2GqwkLFYh6HuwovbcH3yLR0tXgO8pbS2rmoREzn1wRT?=
 =?iso-8859-1?Q?ms44jAY618UHJWmU21sRy2qzcz/Q0FESFDWGPtzBcVv4QhCLpcl9fnPMK+?=
 =?iso-8859-1?Q?11hfoIUlBA/mWBXSHYfLHvvtFYfgkpNtxoADT/SFs9yRuMgPstj53BZTmA?=
 =?iso-8859-1?Q?7fQBUsLMJABmTinof+djCs2mghEsRROHTOQDt8rHCXYE5ET5dq9P2OVW9u?=
 =?iso-8859-1?Q?yy+Bwp0cxiMyzZx+2TEUaY4tvS7uJxoxrHhh9nweaw2U1ee/2vWDOwhrxf?=
 =?iso-8859-1?Q?0JRhKV/MBTAU+r9gIJmjFpweGCRxEGW8OZPDHtprkFy9f9Zkas+Uts8OKW?=
 =?iso-8859-1?Q?FWoJrjUNpG8M2kUQ2LNS5Gm9A=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: d06ae815-b1e3-4cf2-14ab-08d9dcb4efee
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2022 08:06:32.6592
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 7IJfXNHq+qp/r9n0LSasGeIWV2sQydQIvDhycq5OdBBHTdb6PAXrqHp+NvAgXMXRQxxarZRuPsk3ZKbnRQfDl+UP1EXW9Crf3he+tGFn3I8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2035
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

MSR_64BIT is always defined, no need to hide code using MSR_64BIT
inside an #ifdef __powerpc64__

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/lib/sstep.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index b7316d697d80..4aabe3854484 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -75,10 +75,8 @@ extern int do_stqcx(unsigned long ea, unsigned long val0, unsigned long val1,
 static nokprobe_inline unsigned long truncate_if_32bit(unsigned long msr,
 							unsigned long val)
 {
-#ifdef __powerpc64__
 	if ((msr & MSR_64BIT) == 0)
 		val &= 0xffffffffUL;
-#endif
 	return val;
 }
 
@@ -1067,10 +1065,8 @@ int emulate_dcbz(unsigned long ea, struct pt_regs *regs)
 	int err;
 	unsigned long size = l1_dcache_bytes();
 
-#ifdef __powerpc64__
 	if (!(regs->msr & MSR_64BIT))
 		ea &= 0xffffffffUL;
-#endif
 	ea &= ~(size - 1);
 	if (!address_ok(regs, ea, size))
 		return -EFAULT;
@@ -1136,10 +1132,8 @@ static nokprobe_inline void set_cr0(const struct pt_regs *regs,
 
 	op->type |= SETCC;
 	op->ccval = (regs->ccr & 0x0fffffff) | ((regs->xer >> 3) & 0x10000000);
-#ifdef __powerpc64__
 	if (!(regs->msr & MSR_64BIT))
 		val = (int) val;
-#endif
 	if (val < 0)
 		op->ccval |= 0x80000000;
 	else if (val > 0)
@@ -1170,12 +1164,10 @@ static nokprobe_inline void add_with_carry(const struct pt_regs *regs,
 	op->type = COMPUTE + SETREG + SETXER;
 	op->reg = rd;
 	op->val = val;
-#ifdef __powerpc64__
 	if (!(regs->msr & MSR_64BIT)) {
 		val = (unsigned int) val;
 		val1 = (unsigned int) val1;
 	}
-#endif
 	op->xerval = regs->xer;
 	if (val < val1 || (carry_in && val == val1))
 		op->xerval |= XER_CA;
-- 
2.33.1