From patchwork Fri Oct 6 14:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 149277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp379301vqo; Fri, 6 Oct 2023 07:41:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQe/BTQYhsz30ecvDfOnM7B3iz55linTqEn3ubjNqeXyCNPv7lvtnqtvQDdNCkPcPVzy+N X-Received: by 2002:a05:6a20:1004:b0:14c:628b:4b98 with SMTP id gs4-20020a056a20100400b0014c628b4b98mr7420051pzc.4.1696603311829; Fri, 06 Oct 2023 07:41:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696603311; cv=none; d=google.com; s=arc-20160816; b=P/mdlKIefb4mVtdka8af1P8Yg6f6isAb2Cq2+OHhZ49NSCUqZponDh1TPUw+awqAdW ZeeCaX9D++07reSGYPRyObVS4H/fTDA/njlFkNn3iqgVuqua9N/dWxJhbd6e7TpwMJgj jJHJVyynq0eIKDOVSv0Uu+wLKeZBiLqrEhebhaUxPZjOSKwq+aye4PzCKqY+letUFAUt pfaSE/Q+GfgGu4j91hkoDfKKEnvQDhO6BVaExfw5J/HDgon6tDk1iA15WnuRQUlgmS+3 gFmF+DVE8vbF8Rk4Ly94SVeqPSXrRGcPhYfDp+xoKtlVYowBqZxT9uepSdEobmePpKuL lIHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=w3vkBbVSow2/ejyXLwz3W+q1LNze3h8EjqIHK8n+vl0=; fh=sJfVPp9TpZpqbPKPLxG7q4Z2mBGbVYcKWDRgOiqd4Ug=; b=X5L1a2UWlpAhl/YpU8frPWshseN16GXK2nMFx/g+sRM+wWBpbHl7IAvEbP30/IDY4j aKKGFcHsAdKyYG1oP/8tcFo01u72dYJMFxD2ShK13N65I50tLKs/UOG2qS3m2kFndAaU 4z3q7vlxb9KOKdRnih0J5VHq24KWg2sBXVagrkWBOrmhR6LjxOI1bHAbpLOlAncTK9HL Br6AP2j1wFA2e8KFgPrhm7MDbMletZZeXG+opvYdP56JkknA1fWUsFRoCsj2CkXEUTPC jTyNOaIq1Gyhc7GeuXAwhZcM8o0FtvtlB202xjwwjCytN4yHb7x6WDdOiaFuajI8V+cs wqmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id q7-20020a17090311c700b001bde9e8a29fsi4025981plh.183.2023.10.06.07.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 07:41:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id F037D81AFDB7; Fri, 6 Oct 2023 07:41:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232589AbjJFOlk (ORCPT + 18 others); Fri, 6 Oct 2023 10:41:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232561AbjJFOlZ (ORCPT ); Fri, 6 Oct 2023 10:41:25 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ADFAC6 for ; Fri, 6 Oct 2023 07:41:21 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5e53:403c:300c:38ca]) by albert.telenet-ops.be with bizsmtp id uehJ2A0010nPCdM06ehJGn; Fri, 06 Oct 2023 16:41:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qom10-005X4U-1Q; Fri, 06 Oct 2023 16:41:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qom0z-006v2M-Vg; Fri, 06 Oct 2023 16:41:17 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 1/5] m68k: Fix indentation by 7 spaces in Date: Fri, 6 Oct 2023 16:41:10 +0200 Message-Id: <41ca6ab21459164a52f5f468c32ef09aee7ba3d3.1696602993.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 06 Oct 2023 07:41:50 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779017514503124772 X-GMAIL-MSGID: 1779017514503124772 Indentation should use TABs, not spaces. Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/io_mm.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index 370ca49728096305..38a021bd212660c1 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -294,20 +294,20 @@ static inline void isa_delay(void) #define isa_outsb(port, buf, nr) raw_outsb(isa_itb(port), (u8 *)(buf), (nr)) #define isa_insw(port, buf, nr) \ - (ISA_SEX ? raw_insw(isa_itw(port), (u16 *)(buf), (nr)) : \ - raw_insw_swapw(isa_itw(port), (u16 *)(buf), (nr))) + (ISA_SEX ? raw_insw(isa_itw(port), (u16 *)(buf), (nr)) : \ + raw_insw_swapw(isa_itw(port), (u16 *)(buf), (nr))) #define isa_outsw(port, buf, nr) \ - (ISA_SEX ? raw_outsw(isa_itw(port), (u16 *)(buf), (nr)) : \ - raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr))) + (ISA_SEX ? raw_outsw(isa_itw(port), (u16 *)(buf), (nr)) : \ + raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr))) #define isa_insl(port, buf, nr) \ - (ISA_SEX ? raw_insl(isa_itl(port), (u32 *)(buf), (nr)) : \ - raw_insw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1)) + (ISA_SEX ? raw_insl(isa_itl(port), (u32 *)(buf), (nr)) : \ + raw_insw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1)) #define isa_outsl(port, buf, nr) \ - (ISA_SEX ? raw_outsl(isa_itl(port), (u32 *)(buf), (nr)) : \ - raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1)) + (ISA_SEX ? raw_outsl(isa_itl(port), (u32 *)(buf), (nr)) : \ + raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1)) #ifdef CONFIG_ATARI_ROM_ISA @@ -319,14 +319,14 @@ static inline void isa_delay(void) #define isa_rom_insb(port, buf, nr) raw_rom_insb(isa_itb(port), (u8 *)(buf), (nr)) #define isa_rom_insw(port, buf, nr) \ - (ISA_SEX ? raw_rom_insw(isa_itw(port), (u16 *)(buf), (nr)) : \ - raw_rom_insw_swapw(isa_itw(port), (u16 *)(buf), (nr))) + (ISA_SEX ? raw_rom_insw(isa_itw(port), (u16 *)(buf), (nr)) : \ + raw_rom_insw_swapw(isa_itw(port), (u16 *)(buf), (nr))) #define isa_rom_outsb(port, buf, nr) raw_rom_outsb(isa_itb(port), (u8 *)(buf), (nr)) #define isa_rom_outsw(port, buf, nr) \ - (ISA_SEX ? raw_rom_outsw(isa_itw(port), (u16 *)(buf), (nr)) : \ - raw_rom_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr))) + (ISA_SEX ? raw_rom_outsw(isa_itw(port), (u16 *)(buf), (nr)) : \ + raw_rom_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr))) #endif /* CONFIG_ATARI_ROM_ISA */ #endif /* CONFIG_ISA || CONFIG_ATARI_ROM_ISA */ From patchwork Fri Oct 6 14:41:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 149276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp379251vqo; Fri, 6 Oct 2023 07:41:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBNh8C9oRMtWWOaPjFDNpJIYW/OanvaCKF6sIyb8lZpsvRmx2HcUY6OABJ5G7fWGArWyly X-Received: by 2002:a17:902:e88c:b0:1c4:fae:bf4a with SMTP id w12-20020a170902e88c00b001c40faebf4amr10401133plg.16.1696603306536; Fri, 06 Oct 2023 07:41:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696603306; cv=none; d=google.com; s=arc-20160816; b=J/hZZtfwmHvdXhj4CgV4eT8JnbyATSbyZ64tanPRhYxkFe44V+HVy7eEaxJ6kWHuB1 RPNL1KqVhUzF6tbzM+IqHh9+MXI5glFyQCdobMt9qkdFW7yAs8tYpM7UGFcGjrg4kgyR 8Tz8H2BaoPGWc+KhHZmkVb407Wne8Th91a7/ryzCA8EtT2MHuuZjh35nLDtkzhpEePXW fTpW0NzAnyT3OOl45LS3FbgzpCdcdiYeNRaUyeUjco5QJLGSTNpv3vUxYHLPmzh3I4Q/ RZd0H2aOC+VBLibR2Rt+1CdKmDUhDRTDghmEV7HUJ+MQCFTBmcufBXz2RNmkVm2Q7jwG 3bSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Eo52KUMBLwAVFLxZ7EZM1FWk9iMH/v0KS383vFYrDQ8=; fh=sJfVPp9TpZpqbPKPLxG7q4Z2mBGbVYcKWDRgOiqd4Ug=; b=soU9CErtdLvk39lre8DMIeJDS1qs2GAq5X5miEUrreVwBoXV4jBwUF5NuGSHwJoc8Z kDdpuoZaJqpjJXOdMxqUGEIS1l4CI5GCbwfGyr+LuWitqd/zTogqhrc81/tQjLqVEP35 pdZgIEYK4vpy1EBnBVfTGBcBa6kB7SyGkMQjHjTTn6zDGQAXH+x1IUPjgOSd7BtN26Wi J8NeXuY3dfV4BWYRLBtngtSzNVBanahV+9QvL4qoEgdyuXlFb1c1roWXFv482NyED/4P 2bRNpQ66SARmVHkGJXGBV6b5GVKMa4/ySV7qW/wvU5f/2ATKkvps99ECjOwhxLk9siAV bxlg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id d10-20020a170903230a00b001c5db1e47c3si4065321plh.553.2023.10.06.07.41.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 07:41:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id C105181B4AE7; Fri, 6 Oct 2023 07:41:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232590AbjJFOlc (ORCPT + 18 others); Fri, 6 Oct 2023 10:41:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232554AbjJFOlY (ORCPT ); Fri, 6 Oct 2023 10:41:24 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B1B2CF for ; Fri, 6 Oct 2023 07:41:21 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5e53:403c:300c:38ca]) by michel.telenet-ops.be with bizsmtp id uehJ2A0030nPCdM06ehJJG; Fri, 06 Oct 2023 16:41:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qom10-005X4W-1p; Fri, 06 Oct 2023 16:41:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qom10-006v2P-02; Fri, 06 Oct 2023 16:41:18 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/5] m68k: sun3: Fix indentation by 5 or 7 spaces Date: Fri, 6 Oct 2023 16:41:11 +0200 Message-Id: <167216dfe9795056b7a69415695772887aca6d80.1696602993.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 06 Oct 2023 07:41:43 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779017508921760404 X-GMAIL-MSGID: 1779017508921760404 Indentation should use TABs, not spaces. Fix whitespace in reindented code while at it. Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/sun3_pgalloc.h | 10 ++-- arch/m68k/include/asm/tlbflush.h | 72 ++++++++++++++-------------- arch/m68k/sun3/mmu_emu.c | 40 ++++++++-------- 3 files changed, 60 insertions(+), 62 deletions(-) diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index ff48573db2c04c74..4a137eecb6fe44bd 100644 --- a/arch/m68k/include/asm/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h @@ -41,12 +41,12 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page static inline pgd_t * pgd_alloc(struct mm_struct *mm) { - pgd_t *new_pgd; + pgd_t *new_pgd; - new_pgd = (pgd_t *)get_zeroed_page(GFP_KERNEL); - memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); - memset(new_pgd, 0, (PAGE_OFFSET >> PGDIR_SHIFT)); - return new_pgd; + new_pgd = (pgd_t *)get_zeroed_page(GFP_KERNEL); + memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); + memset(new_pgd, 0, (PAGE_OFFSET >> PGDIR_SHIFT)); + return new_pgd; } #endif /* SUN3_PGALLOC_H */ diff --git a/arch/m68k/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush.h index 3ab329a03c76c8d8..6d42e2906887931b 100644 --- a/arch/m68k/include/asm/tlbflush.h +++ b/arch/m68k/include/asm/tlbflush.h @@ -112,53 +112,51 @@ extern unsigned char pmeg_ctx[SUN3_PMEGS_NUM]; sun?) */ static inline void flush_tlb_all(void) { - unsigned long addr; - unsigned char ctx, oldctx; - - oldctx = sun3_get_context(); - for(addr = 0x00000000; addr < TASK_SIZE; addr += SUN3_PMEG_SIZE) { - for(ctx = 0; ctx < 8; ctx++) { - sun3_put_context(ctx); - sun3_put_segmap(addr, SUN3_INVALID_PMEG); - } - } - - sun3_put_context(oldctx); - /* erase all of the userspace pmeg maps, we've clobbered them - all anyway */ - for(addr = 0; addr < SUN3_INVALID_PMEG; addr++) { - if(pmeg_alloc[addr] == 1) { - pmeg_alloc[addr] = 0; - pmeg_ctx[addr] = 0; - pmeg_vaddr[addr] = 0; - } - } + unsigned long addr; + unsigned char ctx, oldctx; + oldctx = sun3_get_context(); + for (addr = 0x00000000; addr < TASK_SIZE; addr += SUN3_PMEG_SIZE) { + for (ctx = 0; ctx < 8; ctx++) { + sun3_put_context(ctx); + sun3_put_segmap(addr, SUN3_INVALID_PMEG); + } + } + + sun3_put_context(oldctx); + /* erase all of the userspace pmeg maps, we've clobbered them + all anyway */ + for (addr = 0; addr < SUN3_INVALID_PMEG; addr++) { + if (pmeg_alloc[addr] == 1) { + pmeg_alloc[addr] = 0; + pmeg_ctx[addr] = 0; + pmeg_vaddr[addr] = 0; + } + } } /* Clear user TLB entries within the context named in mm */ static inline void flush_tlb_mm (struct mm_struct *mm) { - unsigned char oldctx; - unsigned char seg; - unsigned long i; - - oldctx = sun3_get_context(); - sun3_put_context(mm->context); + unsigned char oldctx; + unsigned char seg; + unsigned long i; - for(i = 0; i < TASK_SIZE; i += SUN3_PMEG_SIZE) { - seg = sun3_get_segmap(i); - if(seg == SUN3_INVALID_PMEG) - continue; + oldctx = sun3_get_context(); + sun3_put_context(mm->context); - sun3_put_segmap(i, SUN3_INVALID_PMEG); - pmeg_alloc[seg] = 0; - pmeg_ctx[seg] = 0; - pmeg_vaddr[seg] = 0; - } + for (i = 0; i < TASK_SIZE; i += SUN3_PMEG_SIZE) { + seg = sun3_get_segmap(i); + if (seg == SUN3_INVALID_PMEG) + continue; - sun3_put_context(oldctx); + sun3_put_segmap(i, SUN3_INVALID_PMEG); + pmeg_alloc[seg] = 0; + pmeg_ctx[seg] = 0; + pmeg_vaddr[seg] = 0; + } + sun3_put_context(oldctx); } /* Flush a single TLB page. In this case, we're limited to flushing a diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c index e5a92da43d1978df..119bd32efcfbc9d0 100644 --- a/arch/m68k/sun3/mmu_emu.c +++ b/arch/m68k/sun3/mmu_emu.c @@ -207,32 +207,32 @@ void __init mmu_emu_init(unsigned long bootmem_end) context for when they're cleared */ void clear_context(unsigned long context) { - unsigned char oldctx; - unsigned long i; + unsigned char oldctx; + unsigned long i; - if(context) { - if(!ctx_alloc[context]) - panic("%s: context not allocated\n", __func__); + if (context) { + if (!ctx_alloc[context]) + panic("%s: context not allocated\n", __func__); - ctx_alloc[context]->context = SUN3_INVALID_CONTEXT; - ctx_alloc[context] = (struct mm_struct *)0; - ctx_avail++; - } + ctx_alloc[context]->context = SUN3_INVALID_CONTEXT; + ctx_alloc[context] = (struct mm_struct *)0; + ctx_avail++; + } - oldctx = sun3_get_context(); + oldctx = sun3_get_context(); - sun3_put_context(context); + sun3_put_context(context); - for(i = 0; i < SUN3_INVALID_PMEG; i++) { - if((pmeg_ctx[i] == context) && (pmeg_alloc[i] == 1)) { - sun3_put_segmap(pmeg_vaddr[i], SUN3_INVALID_PMEG); - pmeg_ctx[i] = 0; - pmeg_alloc[i] = 0; - pmeg_vaddr[i] = 0; - } - } + for (i = 0; i < SUN3_INVALID_PMEG; i++) { + if ((pmeg_ctx[i] == context) && (pmeg_alloc[i] == 1)) { + sun3_put_segmap(pmeg_vaddr[i], SUN3_INVALID_PMEG); + pmeg_ctx[i] = 0; + pmeg_alloc[i] = 0; + pmeg_vaddr[i] = 0; + } + } - sun3_put_context(oldctx); + sun3_put_context(oldctx); } /* gets an empty context. if full, kills the next context listed to From patchwork Fri Oct 6 14:41:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 149279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp379357vqo; Fri, 6 Oct 2023 07:41:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCCjbBIVzB8KG7Yx5G8OEWD2lyERmV5ftYACEWSaqX5wA0PnaipnI6d8XCo7NhYMVycX5D X-Received: by 2002:a17:90a:f2c9:b0:274:84f3:d73a with SMTP id gt9-20020a17090af2c900b0027484f3d73amr8638611pjb.28.1696603317313; Fri, 06 Oct 2023 07:41:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696603317; cv=none; d=google.com; s=arc-20160816; b=eCqGKU/vUIjzGqJSd2/OG73e7kv0g5RfIaKarp5OWem4GmyUN7KhyflkQRUbVYzNK6 0lfVWBNBbsHfpFFiIiBYesY66Vv3OxkjPw/hN9zVBVkVRbp8LYLzKHCni3Gv5CgCeIci vnOvhERLN98mrtMF2g1W+N5v5n8JQjVe05kq68WIggMQcN3cnt88LHq3WC2KU8H+sH0J HRFlztgepAlAaX1HyginLTzBbZDcqwHXnrT6LtlktBIjpYP5OQHCWncxSp2IvhrgKVIf 4UM82MrO7WLbkEFH/+UFaxa2LdLYnszsrSk5f6WZWbDBVbx9uRsOwIphnQ3UT4fTKadU Xllw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Ujp+EERDNUM7tMQWPWWUPvfYsZHxXuT4WhDrq7IkRdk=; fh=sJfVPp9TpZpqbPKPLxG7q4Z2mBGbVYcKWDRgOiqd4Ug=; b=yXY4wesG1PB34WkSK2Nz3GR5Z9XBOhIrCSCXfJil/Sg4ToVdeZyBdNHnPHPpcruiPx ADqOxRnKawxa35F2+4ZP2vrBbBoB63EKV3adVnvY95mcLWQNFPdjzgXFSNhJuV7Oy+KP zQX6OzNjo4v1hgl+7zDNsensfuEUUvhiNIxa+bIVPjMCP9E6XbibY17Z0qeRQboaY+uR diqwrn+4uA/M0E7ahqfvB8/5li4go323FmpC069nPm/3Now5A9ujjR4QiPKdpnRFf589 ORk747gogdBU9IfU22xc0ETNrsIj5ziEBcf/PAeZemO1mpWCdNjKdfSWEzZF+owsKi9G +QNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id o6-20020a17090a55c600b002791baa4729si3948505pjm.57.2023.10.06.07.41.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 07:41:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 8C0DA8050034; Fri, 6 Oct 2023 07:41:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232622AbjJFOln (ORCPT + 18 others); Fri, 6 Oct 2023 10:41:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232562AbjJFOlZ (ORCPT ); Fri, 6 Oct 2023 10:41:25 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B8ADEA for ; Fri, 6 Oct 2023 07:41:21 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5e53:403c:300c:38ca]) by albert.telenet-ops.be with bizsmtp id uehJ2A0020nPCdM06ehJGo; Fri, 06 Oct 2023 16:41:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qom10-005X4e-33; Fri, 06 Oct 2023 16:41:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qom10-006v2U-0f; Fri, 06 Oct 2023 16:41:18 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 3/5] m68k: kernel: Fix indentation by 7 spaces in traps.c Date: Fri, 6 Oct 2023 16:41:12 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 06 Oct 2023 07:41:53 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779017520045097034 X-GMAIL-MSGID: 1779017520045097034 Indentation should use TABs, not spaces. Signed-off-by: Geert Uytterhoeven --- arch/m68k/kernel/traps.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index 8ee773d29954921c..53d0cf343d90f9b2 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -486,10 +486,10 @@ static inline void bus_error030 (struct frame *fp) if (buserr_type & SUN3_BUSERR_INVALID) { if (!mmu_emu_handle_fault(addr, 1, 0)) do_page_fault (&fp->ptregs, addr, 0); - } else { + } else { pr_debug("protection fault on insn access (segv).\n"); force_sig (SIGSEGV); - } + } } #else #if defined(CPU_M68020_OR_M68030) @@ -850,9 +850,9 @@ void show_registers(struct pt_regs *regs) pr_info("PC: [<%08lx>] %pS\n", regs->pc, (void *)regs->pc); pr_info("SR: %04x SP: %p a2: %08lx\n", regs->sr, regs, regs->a2); pr_info("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n", - regs->d0, regs->d1, regs->d2, regs->d3); + regs->d0, regs->d1, regs->d2, regs->d3); pr_info("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n", - regs->d4, regs->d5, regs->a0, regs->a1); + regs->d4, regs->d5, regs->a0, regs->a1); pr_info("Process %s (pid: %d, task=%p)\n", current->comm, task_pid_nr(current), current); From patchwork Fri Oct 6 14:41:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 149281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp379440vqo; Fri, 6 Oct 2023 07:42:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZHBeJWOVkDrL5JwwTQtKnc1BURtlphYFbK6gQuIBIGBdG9t220xcr+Z3FmRubfDxthT2n X-Received: by 2002:a05:6a00:1595:b0:68f:cb69:8e66 with SMTP id u21-20020a056a00159500b0068fcb698e66mr8681043pfk.15.1696603325868; Fri, 06 Oct 2023 07:42:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696603325; cv=none; d=google.com; s=arc-20160816; b=GUiHUP1bUPG8sgL4ZEZCemkQwNsMmLTXJK2dBW6hqsU6pzc04FTbxDkhDY6NAWYgjz PlSt0Fjdjr7BpaxIodRLScYBNeHIbGFri0qY8igIdCNDUbMjgjvC5BLH4EvynR5s1KIK eC2nwXgNzHNEaEiTn+0EFf6F0AsbCws7nJccSXTJVYtPE4pcrOWK8Uc/U9h1S29i52gB qY74wcNkEiXAQugirZTH6RBjl0FwmVp7WjuAqrt1SHAv+9mWPR7LH/LwHJPqAsDjIWjT mmlVfSMKPHJbmj4Wb+5VEIkmh31lf0EQU7AQQrzGVgyXzAj4pB/yOIU9TUm8EnSsoRWS ZXOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Ls2OCbIxS5fedxEN3MB37F0qvuCulu3scJupSV+a/1k=; fh=sJfVPp9TpZpqbPKPLxG7q4Z2mBGbVYcKWDRgOiqd4Ug=; b=BQ79KyH+qHtqJ6EoLNy9RCmCVcre3WG96CGgQqUrw4MeUg5w3XvmflJl29REQfNGjO PO/fuMvaDAThf5VzLFHt092+LHe8U6TSrLhmwgHw59cFC7Saw9dhtu1Wdw4bRnlZZvjE gZ4n2VV6jKU3vWq6ZRUP6eoX75TzhWSr92doGyfWBEQt6O4CMvhShRWba72oMNTQpYi8 5bymKYED4SXYvkih0xKnu93KpBxZBG1yL27h08m/tAHXYj2F+w5Pt2uRGTHKTWtN1seF J/RQbRKA10gp7J1lpttmTjjvNUi9TjoSkH5pAmYrrGRYxMWYk+ESAyNeMzPfQsBdEzEl oDtg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id eg7-20020a056a00800700b0069344f0eda3si1631854pfb.5.2023.10.06.07.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 07:42:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 3CB1D805001C; Fri, 6 Oct 2023 07:42:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232599AbjJFOlg (ORCPT + 18 others); Fri, 6 Oct 2023 10:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230158AbjJFOlY (ORCPT ); Fri, 6 Oct 2023 10:41:24 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B9DDEB for ; Fri, 6 Oct 2023 07:41:21 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5e53:403c:300c:38ca]) by xavier.telenet-ops.be with bizsmtp id uehJ2A0090nPCdM01ehJXs; Fri, 06 Oct 2023 16:41:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qom10-005X4i-3t; Fri, 06 Oct 2023 16:41:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qom10-006v2Y-1I; Fri, 06 Oct 2023 16:41:18 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 4/5] m68k: Fix indentation by 2 or 5 spaces in Date: Fri, 6 Oct 2023 16:41:13 +0200 Message-Id: <2819709eee2be69c93497d4e97413bd0e05a9268.1696602993.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 06 Oct 2023 07:42:03 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779017529077062930 X-GMAIL-MSGID: 1779017529077062930 Indentation should use TABs, not spaces. Fix whitespace in reindented code while at it. Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/page_mm.h | 45 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 363aa0f9ba8ae691..e0ae4d5fc98596a4 100644 --- a/arch/m68k/include/asm/page_mm.h +++ b/arch/m68k/include/asm/page_mm.h @@ -13,17 +13,16 @@ #ifdef CPU_M68040_OR_M68060_ONLY static inline void copy_page(void *to, void *from) { - unsigned long tmp; - - __asm__ __volatile__("1:\t" - ".chip 68040\n\t" - "move16 %1@+,%0@+\n\t" - "move16 %1@+,%0@+\n\t" - ".chip 68k\n\t" - "dbra %2,1b\n\t" - : "=a" (to), "=a" (from), "=d" (tmp) - : "0" (to), "1" (from) , "2" (PAGE_SIZE / 32 - 1) - ); + unsigned long tmp; + + __asm__ __volatile__("1:\t" + ".chip 68040\n\t" + "move16 %1@+,%0@+\n\t" + "move16 %1@+,%0@+\n\t" + ".chip 68k\n\t" + "dbra %2,1b\n\t" + : "=a" (to), "=a" (from), "=d" (tmp) + : "0" (to), "1" (from), "2" (PAGE_SIZE / 32 - 1)); } static inline void clear_page(void *page) @@ -95,23 +94,23 @@ static inline void *__va(unsigned long paddr) #define __pa(x) ___pa((unsigned long)(x)) static inline unsigned long ___pa(unsigned long x) { - if(x == 0) - return 0; - if(x >= PAGE_OFFSET) - return (x-PAGE_OFFSET); - else - return (x+0x2000000); + if (x == 0) + return 0; + if (x >= PAGE_OFFSET) + return (x - PAGE_OFFSET); + else + return (x + 0x2000000); } static inline void *__va(unsigned long x) { - if(x == 0) - return (void *)0; + if (x == 0) + return (void *)0; - if(x < 0x2000000) - return (void *)(x+PAGE_OFFSET); - else - return (void *)(x-0x2000000); + if (x < 0x2000000) + return (void *)(x + PAGE_OFFSET); + else + return (void *)(x - 0x2000000); } #endif /* CONFIG_SUN3 */ From patchwork Fri Oct 6 14:41:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 149278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp379309vqo; Fri, 6 Oct 2023 07:41:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IED9jOJaDmhd5+yusvZ+7CbNzbeQGBvo+7J2n3dnpTuR9y4fdTyCg8BhfSB+W8yC1LoQaaB X-Received: by 2002:a9d:6d8f:0:b0:6bc:8930:a1d4 with SMTP id x15-20020a9d6d8f000000b006bc8930a1d4mr8576291otp.15.1696603312743; Fri, 06 Oct 2023 07:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696603312; cv=none; d=google.com; s=arc-20160816; b=ILaF+uvgvIeQoVnMEeFkc5/XRG0RjacgTmO2j7JvJqhnrjuYzfXbQ03Epr+qacfMJK W9OK3CEu2d5FsAEDdCWRVtKN8QZW70Wgv4g/wABg6OqaHL2QSfKxZXFgHbnQ/2llCffr s7ZAfPCj9ozvCR6G0sVlMRKGIJ2t+d0EArhyrJ54TfS0lX/X+NpBhh7YTvDOd2zREgLb Q36kV3FX3+hgkjsI+LByukyEB+xJmGIKV0s7MisJ6ApFn1C2gK56rL614k3uj9/+yvxQ olJJG3hnosKyqDRoUAMpI88iD220qbpTPkCkGMB4auFgkm6AW8IH+zi5Eqcrcz6Wv7Y/ ZXOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ziJKo0IWLN4c1AdnZKIK+BI4Dt2mG4e5HNyU4g/q5mQ=; fh=sJfVPp9TpZpqbPKPLxG7q4Z2mBGbVYcKWDRgOiqd4Ug=; b=LOnG/MNmHPoQ0VfeSeiOtufyJjrVKW3JcjYqz6HqcpM+8WEFfdmXa8JftOKNFktpYm s4SdvW3WUjzqEo8sAkfrdqXeUwe2fcSfInoPOrKSioTrZkOllJT1dVMR24oU3C7iJ3Be HirKkexuetNmMJjccVFLYzZVlDY2Yq1JXsukrtikXUIHPxkfolCg1ta5i7s9Jzmh2x+q nBmSw2fTiCLgBFxzZ766R98FKGYeqNRg5vSSsmwddU3/Njs/eqM1WOQ0duag0VCNR2DK WlNSlv0oMhNRgp0ARKSeaOnHZJ4iHvHSmq4Jpe3FJB4/Txj477zGGT4+itfW5u+84Yi3 NyIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id 130-20020a630088000000b00578b4992008si3616725pga.133.2023.10.06.07.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 07:41:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 8B53A8263168; Fri, 6 Oct 2023 07:41:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232574AbjJFOl2 (ORCPT + 18 others); Fri, 6 Oct 2023 10:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232546AbjJFOlY (ORCPT ); Fri, 6 Oct 2023 10:41:24 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B0B6CE for ; Fri, 6 Oct 2023 07:41:21 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5e53:403c:300c:38ca]) by laurent.telenet-ops.be with bizsmtp id uehJ2A0030nPCdM01ehJJq; Fri, 06 Oct 2023 16:41:18 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qom10-005X4k-4h; Fri, 06 Oct 2023 16:41:18 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qom10-006v2c-2b; Fri, 06 Oct 2023 16:41:18 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 5/5] m68k: fpsp040: Fix indentation by 5 spaces Date: Fri, 6 Oct 2023 16:41:14 +0200 Message-Id: <5ab108be356a5d2a6e6d72bc418ccf1c1938e8fe.1696602993.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 06 Oct 2023 07:41:45 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779017515513823721 X-GMAIL-MSGID: 1779017515513823721 Indentation should use TABs, not spaces. Signed-off-by: Geert Uytterhoeven --- arch/m68k/fpsp040/slogn.S | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/arch/m68k/fpsp040/slogn.S b/arch/m68k/fpsp040/slogn.S index d98eaf641ec4c65b..5f3da4aa7e4515c7 100644 --- a/arch/m68k/fpsp040/slogn.S +++ b/arch/m68k/fpsp040/slogn.S @@ -261,56 +261,56 @@ slognd: |----the value TWOTO100 is no longer needed. |----Note that this code assumes the denormalized input is NON-ZERO. - moveml %d2-%d7,-(%a7) | ...save some registers - movel #0x00000000,%d3 | ...D3 is exponent of smallest norm. # - movel 4(%a0),%d4 - movel 8(%a0),%d5 | ...(D4,D5) is (Hi_X,Lo_X) - clrl %d2 | ...D2 used for holding K + moveml %d2-%d7,-(%a7) | ...save some registers + movel #0x00000000,%d3 | ...D3 is exponent of smallest norm. # + movel 4(%a0),%d4 + movel 8(%a0),%d5 | ...(D4,D5) is (Hi_X,Lo_X) + clrl %d2 | ...D2 used for holding K - tstl %d4 - bnes HiX_not0 + tstl %d4 + bnes HiX_not0 HiX_0: - movel %d5,%d4 - clrl %d5 - movel #32,%d2 - clrl %d6 - bfffo %d4{#0:#32},%d6 - lsll %d6,%d4 - addl %d6,%d2 | ...(D3,D4,D5) is normalized - - movel %d3,X(%a6) - movel %d4,XFRAC(%a6) - movel %d5,XFRAC+4(%a6) - negl %d2 - movel %d2,ADJK(%a6) - fmovex X(%a6),%fp0 - moveml (%a7)+,%d2-%d7 | ...restore registers - lea X(%a6),%a0 - bras LOGBGN | ...begin regular log(X) + movel %d5,%d4 + clrl %d5 + movel #32,%d2 + clrl %d6 + bfffo %d4{#0:#32},%d6 + lsll %d6,%d4 + addl %d6,%d2 | ...(D3,D4,D5) is normalized + + movel %d3,X(%a6) + movel %d4,XFRAC(%a6) + movel %d5,XFRAC+4(%a6) + negl %d2 + movel %d2,ADJK(%a6) + fmovex X(%a6),%fp0 + moveml (%a7)+,%d2-%d7 | ...restore registers + lea X(%a6),%a0 + bras LOGBGN | ...begin regular log(X) HiX_not0: - clrl %d6 - bfffo %d4{#0:#32},%d6 | ...find first 1 - movel %d6,%d2 | ...get k - lsll %d6,%d4 - movel %d5,%d7 | ...a copy of D5 - lsll %d6,%d5 - negl %d6 - addil #32,%d6 - lsrl %d6,%d7 - orl %d7,%d4 | ...(D3,D4,D5) normalized - - movel %d3,X(%a6) - movel %d4,XFRAC(%a6) - movel %d5,XFRAC+4(%a6) - negl %d2 - movel %d2,ADJK(%a6) - fmovex X(%a6),%fp0 - moveml (%a7)+,%d2-%d7 | ...restore registers - lea X(%a6),%a0 - bras LOGBGN | ...begin regular log(X) + clrl %d6 + bfffo %d4{#0:#32},%d6 | ...find first 1 + movel %d6,%d2 | ...get k + lsll %d6,%d4 + movel %d5,%d7 | ...a copy of D5 + lsll %d6,%d5 + negl %d6 + addil #32,%d6 + lsrl %d6,%d7 + orl %d7,%d4 | ...(D3,D4,D5) normalized + + movel %d3,X(%a6) + movel %d4,XFRAC(%a6) + movel %d5,XFRAC+4(%a6) + negl %d2 + movel %d2,ADJK(%a6) + fmovex X(%a6),%fp0 + moveml (%a7)+,%d2-%d7 | ...restore registers + lea X(%a6),%a0 + bras LOGBGN | ...begin regular log(X) .global slogn