mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

m68k: sun3: Fix indentation by 5 or 7 spaces 

Indentation should use TABs, not spaces.
Fix whitespace in reindented code while at it.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/167216dfe9795056b7a69415695772887aca6d80.1696602993.git.geert@linux-m68k.org
This commit is contained in:
Geert Uytterhoeven 2023-10-06 16:41:11 +02:00
parent 8851453123
commit 50802d84cb
3 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/m68k/include/asm/sun3_pgalloc.h
View File

@ -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) 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); new_pgd = (pgd_t *)get_zeroed_page(GFP_KERNEL);
memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE);
memset(new_pgd, 0, (PAGE_OFFSET >> PGDIR_SHIFT)); memset(new_pgd, 0, (PAGE_OFFSET >> PGDIR_SHIFT));
return new_pgd; return new_pgd;
} }
#endif /* SUN3_PGALLOC_H */ #endif /* SUN3_PGALLOC_H */

70
arch/m68k/include/asm/tlbflush.h
View File

@ -112,53 +112,51 @@ extern unsigned char pmeg_ctx[SUN3_PMEGS_NUM];
sun?) */ sun?) */
static inline void flush_tlb_all(void) static inline void flush_tlb_all(void)
{ {
unsigned long addr; unsigned long addr;
unsigned char ctx, oldctx; unsigned char ctx, oldctx;
oldctx = sun3_get_context(); oldctx = sun3_get_context();
for(addr = 0x00000000; addr < TASK_SIZE; addr += SUN3_PMEG_SIZE) { for (addr = 0x00000000; addr < TASK_SIZE; addr += SUN3_PMEG_SIZE) {
for(ctx = 0; ctx < 8; ctx++) { for (ctx = 0; ctx < 8; ctx++) {
sun3_put_context(ctx); sun3_put_context(ctx);
sun3_put_segmap(addr, SUN3_INVALID_PMEG); 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;
}
}
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 */ /* Clear user TLB entries within the context named in mm */
static inline void flush_tlb_mm (struct mm_struct *mm) static inline void flush_tlb_mm (struct mm_struct *mm)
{ {
unsigned char oldctx; unsigned char oldctx;
unsigned char seg; unsigned char seg;
unsigned long i; unsigned long i;
oldctx = sun3_get_context(); oldctx = sun3_get_context();
sun3_put_context(mm->context); sun3_put_context(mm->context);
for(i = 0; i < TASK_SIZE; i += SUN3_PMEG_SIZE) { for (i = 0; i < TASK_SIZE; i += SUN3_PMEG_SIZE) {
seg = sun3_get_segmap(i); seg = sun3_get_segmap(i);
if(seg == SUN3_INVALID_PMEG) if (seg == SUN3_INVALID_PMEG)
continue; continue;
sun3_put_segmap(i, SUN3_INVALID_PMEG); sun3_put_segmap(i, SUN3_INVALID_PMEG);
pmeg_alloc[seg] = 0; pmeg_alloc[seg] = 0;
pmeg_ctx[seg] = 0; pmeg_ctx[seg] = 0;
pmeg_vaddr[seg] = 0; pmeg_vaddr[seg] = 0;
} }
sun3_put_context(oldctx);
sun3_put_context(oldctx);
} }
/* Flush a single TLB page. In this case, we're limited to flushing a /* Flush a single TLB page. In this case, we're limited to flushing a

40
arch/m68k/sun3/mmu_emu.c
View File

@ -207,32 +207,32 @@ void __init mmu_emu_init(unsigned long bootmem_end)
context for when they're cleared */ context for when they're cleared */
void clear_context(unsigned long context) void clear_context(unsigned long context)
{ {
unsigned char oldctx; unsigned char oldctx;
unsigned long i; unsigned long i;
if(context) { if (context) {
if(!ctx_alloc[context]) if (!ctx_alloc[context])
panic("%s: context not allocated\n", __func__); panic("%s: context not allocated\n", __func__);
ctx_alloc[context]->context = SUN3_INVALID_CONTEXT; ctx_alloc[context]->context = SUN3_INVALID_CONTEXT;
ctx_alloc[context] = (struct mm_struct *)0; ctx_alloc[context] = (struct mm_struct *)0;
ctx_avail++; 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++) { for (i = 0; i < SUN3_INVALID_PMEG; i++) {
if((pmeg_ctx[i] == context) && (pmeg_alloc[i] == 1)) { if ((pmeg_ctx[i] == context) && (pmeg_alloc[i] == 1)) {
sun3_put_segmap(pmeg_vaddr[i], SUN3_INVALID_PMEG); sun3_put_segmap(pmeg_vaddr[i], SUN3_INVALID_PMEG);
pmeg_ctx[i] = 0; pmeg_ctx[i] = 0;
pmeg_alloc[i] = 0; pmeg_alloc[i] = 0;
pmeg_vaddr[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 /* gets an empty context. if full, kills the next context listed to