Commit c4f607c3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Geert Uytterhoeven
Browse files

m68k: Remove the 030 case in virt_to_phys_slow 



The 030 case in virt_to_phys_slow can't ever be reached, so remove it.

Suggested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Link: https://lore.kernel.org/r/20210916070405.52750-3-hch@lst.de


Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 1dc4027b

arch/m68k/mm/cache.c

+1 −18
Original line number Diff line number Diff line
@@ -49,24 +49,7 @@ static unsigned long virt_to_phys_slow(unsigned long vaddr) 
		if (mmusr & MMU_R_040)

			return (mmusr & PAGE_MASK) | (vaddr & ~PAGE_MASK);

	} else {

		unsigned short mmusr;

		unsigned long *descaddr;



		asm volatile ("ptestr %3,%2@,#7,%0\n\t"

			      "pmove %%psr,%1"

			      : "=a&" (descaddr), "=m" (mmusr)

			      : "a" (vaddr), "d" (get_fs().seg));

		if (mmusr & (MMU_I|MMU_B|MMU_L))

			return 0;

		descaddr = phys_to_virt((unsigned long)descaddr);

		switch (mmusr & MMU_NUM) {

		case 1:

			return (*descaddr & 0xfe000000) | (vaddr & 0x01ffffff);

		case 2:

			return (*descaddr & 0xfffc0000) | (vaddr & 0x0003ffff);

		case 3:

			return (*descaddr & PAGE_MASK) | (vaddr & ~PAGE_MASK);

		}

		WARN_ON_ONCE(!CPU_IS_040_OR_060);

	}

	return 0;

}