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

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

[Adrian Bunk]

This patch fixes the following build error caused by
commit 6510d41954dc6a9c8b1dbca7eaca0f23195ca727
(kernel: Move arches to use common unaligned access):

<--  snip  -->

...
make[2]: *** No rule to make target `arch/frv/mm/unaligned.o', needed by `arch/frv/mm/built-in.o'.  Stop.
make[1]: *** [arch/frv/mm] Error 2

<--  snip  -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
e3dae1fd99455187e952928f53f43b3bde6d0a08 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

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

[Harvey Harrison]

On Wed, 2008-04-30 at 02:57 +0300, Adrian Bunk wrote:
> This patch fixes the following build error caused by
> commit 6510d41954dc6a9c8b1dbca7eaca0f23195ca727
> (kernel: Move arches to use common unaligned access):
> 
> <--  snip  -->
> 
> ...
> make[2]: *** No rule to make target `arch/frv/mm/unaligned.o', needed by `arch/frv/mm/built-in.o'.  Stop.
> make[1]: *** [arch/frv/mm] Error 2
> 
> <--  snip  -->
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

Thanks Adrian, I must have missed a git add during some of the revisions
this patchset went through.

Reviewed-by: Harvey Harrison <harvey.harrison@gmail.com>

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

[David Howells]

Please use this patch instead.  I believe I sent it to you previously.

David
---
[PATCH] FRV: Unbreak misalignment handling changes

From: David Howells <dhowells@redhat.com>

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@redhat.com>
---

 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 */

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

[Adrian Bunk]

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@redhat.com>
> 
> 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@redhat.com>
> ---
> 
>  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