Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757940Ab2FHDzU (ORCPT ); Thu, 7 Jun 2012 23:55:20 -0400 Received: from dalsmrelay2.nai.com ([205.227.136.216]:28336 "EHLO dalsmrelay2.nai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756951Ab2FHDzS (ORCPT ); Thu, 7 Jun 2012 23:55:18 -0400 Message-ID: <4FD1768B.4050206@snapgear.com> Date: Fri, 8 Jun 2012 13:50:35 +1000 From: Greg Ungerer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Geert Uytterhoeven CC: , Greg Ungerer , Philippe De Muyter , Subject: Re: [PATCH 4/5] m68k: Introduce config option CPU_HAS_NO_UNALIGNED References: <1339094827-12349-1-git-send-email-geert@linux-m68k.org> <1339094827-12349-4-git-send-email-geert@linux-m68k.org> In-Reply-To: <1339094827-12349-4-git-send-email-geert@linux-m68k.org> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2536 Lines: 83 On 08/06/12 04:47, Geert Uytterhoeven wrote: > Use CONFIG_CPU_HAS_NO_UNALIGNED instead of open coding CONFIG_M68000 || > CONFIG_COLDFIRE > > Signed-off-by: Geert Uytterhoeven Acked-by: Greg Ungerer Regards Greg > --- > arch/m68k/Kconfig.cpu | 5 +++++ > arch/m68k/include/asm/unaligned.h | 4 ++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu > index 6cd8c1a..c4ed650 100644 > --- a/arch/m68k/Kconfig.cpu > +++ b/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/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h > index f4043ae..2b3ca0b 100644 > --- a/arch/m68k/include/asm/unaligned.h > +++ b/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 -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/