From 685304d5af7ffa54a61fcaf347411e75dd781ff3 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 6 Jun 2012 19:37:52 +0200 Subject: [PATCH] --- yaml --- r: 321299 b: refs/heads/master c: 9f1f118035b2d28bb741844537b9ee87705b4c6e h: refs/heads/master i: 321297: a460a424ac36884a3fa2e08fb227238d4a83d05a 321295: c472fe463f4ec318e0fbf05fe8f2fb5c3dc0fd4f v: v3 --- [refs] | 2 +- trunk/arch/m68k/Kconfig.cpu | 5 +++++ trunk/arch/m68k/include/asm/unaligned.h | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d1cb56788af9..77df29a6115b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5df58f3aac58bb0f08fa205a006c6b7840cd7ac4 +refs/heads/master: 9f1f118035b2d28bb741844537b9ee87705b4c6e diff --git a/trunk/arch/m68k/Kconfig.cpu b/trunk/arch/m68k/Kconfig.cpu index 6cd8c1a32893..c4ed65081475 100644 --- a/trunk/arch/m68k/Kconfig.cpu +++ b/trunk/arch/m68k/Kconfig.cpu @@ -27,6 +27,7 @@ config COLDFIRE select ARCH_HAVE_CUSTOM_GPIO_H select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64 + select CPU_HAS_NO_UNALIGNED select GENERIC_CSUM endchoice @@ -37,6 +38,7 @@ config M68000 bool select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64 + select CPU_HAS_NO_UNALIGNED select GENERIC_CSUM help The Freescale (was Motorola) 68000 CPU is the first generation of @@ -366,6 +368,9 @@ config CPU_HAS_NO_BITFIELDS config CPU_HAS_NO_MULDIV64 bool +config CPU_HAS_NO_UNALIGNED + bool + config CPU_HAS_ADDRESS_SPACES bool diff --git a/trunk/arch/m68k/include/asm/unaligned.h b/trunk/arch/m68k/include/asm/unaligned.h index f4043ae63db1..2b3ca0bf7a0d 100644 --- a/trunk/arch/m68k/include/asm/unaligned.h +++ b/trunk/arch/m68k/include/asm/unaligned.h @@ -2,7 +2,7 @@ #define _ASM_M68K_UNALIGNED_H -#if defined(CONFIG_COLDFIRE) || defined(CONFIG_M68000) +#ifdef CONFIG_CPU_HAS_NO_UNALIGNED #include #include #include @@ -12,7 +12,7 @@ #else /* - * The m68k can do unaligned accesses itself. + * The m68k can do unaligned accesses itself. */ #include #include