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

Previous thread: Problems with -git14 by J.A. on Tuesday, April 29, 2008 - 7:56 pm. (14 messages)

Next thread: 2.6.25-git WARNING: at arch/x86/kernel/genapic_64.c:86 read_apic_id+0x2e/0x46() by Kevin Winchester on Tuesday, April 29, 2008 - 7:59 pm. (3 messages)
To: <dhowells@...>, Harvey Harrison <harvey.harrison@...>
Cc: <linux-kernel@...>, Andrew Morton <akpm@...>
Date: Tuesday, April 29, 2008 - 7:57 pm

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

--

To: Adrian Bunk <bunk@...>
Cc: <dhowells@...>, <linux-kernel@...>, Andrew Morton <akpm@...>
Date: Tuesday, April 29, 2008 - 8:11 pm

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>

--

To: Harvey Harrison <harvey.harrison@...>
Cc: <dhowells@...>, Adrian Bunk <bunk@...>, <linux-kernel@...>, Andrew Morton <akpm@...>
Date: Wednesday, April 30, 2008 - 6:40 am

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

To: David Howells <dhowells@...>
Cc: Harvey Harrison <harvey.harrison@...>, <linux-kernel@...>, Andrew Morton <akpm@...>
Date: Wednesday, April 30, 2008 - 4:45 pm

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

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

--

Previous thread: Problems with -git14 by J.A. on Tuesday, April 29, 2008 - 7:56 pm. (14 messages)

Next thread: 2.6.25-git WARNING: at arch/x86/kernel/genapic_64.c:86 read_apic_id+0x2e/0x46() by Kevin Winchester on Tuesday, April 29, 2008 - 7:59 pm. (3 messages)