diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-05-08 00:07:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-05-10 17:50:47 +0200 |
| commit | 3aec1db05d1ba631311beca4715655591a9e17d5 (patch) | |
| tree | 6d850ad7e217a965e0bedd5ece0ba2eb93b35099 /arch | |
| parent | sh: remove unaligned access for sh4a (diff) | |
| download | linux-3aec1db05d1ba631311beca4715655591a9e17d5.tar.xz linux-3aec1db05d1ba631311beca4715655591a9e17d5.zip | |
m68k: select CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
All supported CPUs other than the old dragonball and in theory other 68000
derivatives use the include/linux/unaligned/access_ok.h implementation
for accessing unaligned variables, so presumably this works everywhere.
However, m68k never selects CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS,
so none of the other conditionals in the kernel get the optimized
implementation.
Select this based on CPU_HAS_NO_UNALIGNED to make the two settings
always match, and then use the generic version of the header.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
| -rw-r--r-- | arch/m68k/include/asm/unaligned.h | 19 |
2 files changed, 1 insertions, 19 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 372e4e69c43a..46089f3b9603 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -21,6 +21,7 @@ config M68K select HAVE_AOUT if MMU select HAVE_ASM_MODVERSIONS select HAVE_DEBUG_BUGVERBOSE + select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED select HAVE_FUTEX_CMPXCHG if MMU && FUTEX select HAVE_IDE select HAVE_MOD_ARCH_SPECIFIC diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h deleted file mode 100644 index 84e437337344..000000000000 --- a/arch/m68k/include/asm/unaligned.h +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_M68K_UNALIGNED_H -#define _ASM_M68K_UNALIGNED_H - -#ifdef CONFIG_CPU_HAS_NO_UNALIGNED -#include <asm-generic/unaligned.h> -#else -/* - * The m68k can do unaligned accesses itself. - */ -#include <linux/unaligned/access_ok.h> -#include <linux/unaligned/generic.h> - -#define get_unaligned __get_unaligned_be -#define put_unaligned __put_unaligned_be - -#endif - -#endif /* _ASM_M68K_UNALIGNED_H */ |