Re: [2.6 patch] fix arch/frv/mm/unaligned.o build error

From: Adrian Bunk
Date: Wed Apr 30 2008 - 16:46:37 EST


On Wed, Apr 30, 2008 at 11:40:01AM +0100, David Howells wrote:
>
> Please use this patch instead. I believe I sent it to you previously.

You sent it to Harvey (from whom the unaligned patches are) two weeks ago.

Sorry, I didn't search for that old patches before making my patch.

> David
> ---
> [PATCH] FRV: Unbreak misalignment handling changes
>
> From: David Howells <dhowells@xxxxxxxxxx>
>
> Fix a reference in a arch/frv/mm/Makefile to unaligned.c which has now been
> deleted.
>
> Also revert the change to the guard macro name in include/asm-frv/unaligned.h.
>
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
> ---
>
> arch/frv/mm/Makefile | 2 +-
> include/asm-frv/unaligned.h | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>
> diff --git a/arch/frv/mm/Makefile b/arch/frv/mm/Makefile
> index fb8b1d8..1bca5ab 100644
> --- a/arch/frv/mm/Makefile
> +++ b/arch/frv/mm/Makefile
> @@ -6,4 +6,4 @@ obj-y := init.o kmap.o
>
> obj-$(CONFIG_MMU) += \
> pgalloc.o highmem.o fault.o extable.o cache-page.o tlb-flush.o tlb-miss.o \
> - mmu-context.o dma-alloc.o unaligned.o elf-fdpic.o
> + mmu-context.o dma-alloc.o elf-fdpic.o
> diff --git a/include/asm-frv/unaligned.h b/include/asm-frv/unaligned.h
> index 64ccc73..839a2fb 100644
> --- a/include/asm-frv/unaligned.h
> +++ b/include/asm-frv/unaligned.h
> @@ -9,8 +9,8 @@
> * 2 of the License, or (at your option) any later version.
> */
>
> -#ifndef _ASM_FRV_UNALIGNED_H
> -#define _ASM_FRV_UNALIGNED_H
> +#ifndef _ASM_UNALIGNED_H
> +#define _ASM_UNALIGNED_H
>
> #include <linux/unaligned/le_byteshift.h>
> #include <linux/unaligned/be_byteshift.h>
> @@ -19,4 +19,4 @@
> #define get_unaligned __get_unaligned_be
> #define put_unaligned __put_unaligned_be
>
> -#endif /* _ASM_FRV_UNALIGNED_H */
> +#endif /* _ASM_UNALIGNED_H */

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/