[uClinux-dev] [PATCH] m68knommu: fix compile error in merged entry.S code

[Steven King]

The merge of MMU and non-MMU versions of entry.S broke building for any
coldfire processor with COLDFIRE_SW_A7 selected (ie 5206, 5249, 525x,...);
entry.h must be included after asm-offsets.h.

Signed-off-by: Steven King <sfking at fdwdc.com>
---
arch/m68k/kernel/entry.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 43e13d4..e918937 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -34,7 +34,6 @@
*/

#include <linux/linkage.h>
-#include <asm/entry.h>
#include <asm/errno.h>
#include <asm/setup.h>
#include <asm/segment.h>
@@ -42,6 +41,7 @@
#include <asm/unistd.h>

#include <asm/asm-offsets.h>
+#include <asm/entry.h>

.globl system_call, buserr, trap, resume
.globl sys_call_table

[Greg Ungerer]

Hi Steven,

Post by Steven King
The merge of MMU and non-MMU versions of entry.S broke building for any
coldfire processor with COLDFIRE_SW_A7 selected (ie 5206, 5249, 525x,...);
entry.h must be included after asm-offsets.h.

What breakage do you see?

I can build 3.5-rc2 for a 5307 target (which has CONFIG_COLDFIRE_SW_A7
set) with no problems.

Regards
Greg

Post by Steven King
Signed-off-by: Steven King<sfking at fdwdc.com>
---
arch/m68k/kernel/entry.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 43e13d4..e918937 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -34,7 +34,6 @@
*/
#include<linux/linkage.h>
-#include<asm/entry.h>
#include<asm/errno.h>
#include<asm/setup.h>
#include<asm/segment.h>
@@ -42,6 +41,7 @@
#include<asm/unistd.h>
#include<asm/asm-offsets.h>
+#include<asm/entry.h>
.globl system_call, buserr, trap, resume
.globl sys_call_table
_______________________________________________
uClinux-dev mailing list
uClinux-dev at uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev at uclinux.org
http://mailman.uclinux.org/mailman/options/uclinux-dev

[Steven King]

Post by Greg Ungerer
Hi Steven,

Post by Steven King
The merge of MMU and non-MMU versions of entry.S broke building for any
coldfire processor with COLDFIRE_SW_A7 selected (ie 5206, 5249,
525x,...); entry.h must be included after asm-offsets.h.

What breakage do you see?

arch/m68k/kernel/built-in.o: In function `buserr':
(.text+0xc6): undefined reference to `PT_OFF_PC'
arch/m68k/kernel/built-in.o: In function `buserr':
(.text+0xca): undefined reference to `PT_OFF_FORMATVEC'
arch/m68k/kernel/built-in.o: In function `buserr':
(.text+0xe2): undefined reference to `PT_OFF_ORIG_D0'
arch/m68k/kernel/built-in.o: In function `trap':
(.text+0x12a): undefined reference to `PT_OFF_PC'
arch/m68k/kernel/built-in.o: In function `trap':
(.text+0x12e): undefined reference to `PT_OFF_FORMATVEC'
arch/m68k/kernel/built-in.o: In function `trap':
(.text+0x146): undefined reference to `PT_OFF_ORIG_D0'

Post by Greg Ungerer
I can build 3.5-rc2 for a 5307 target (which has CONFIG_COLDFIRE_SW_A7
set) with no problems.

I tried 5206, 5249 and 525x (where I first noticed it).

[Steven King]

Post by Greg Ungerer
Hi Steven,

Post by Steven King
The merge of MMU and non-MMU versions of entry.S broke building for any
coldfire processor with COLDFIRE_SW_A7 selected (ie 5206, 5249,
525x,...); entry.h must be included after asm-offsets.h.

What breakage do you see?
I can build 3.5-rc2 for a 5307 target (which has CONFIG_COLDFIRE_SW_A7
set) with no problems.

Also, this was against for-next, since thats where the merged entry.S
lives ;).

[Greg Ungerer]

Hi Steven,

Post by Steven King

Post by Greg Ungerer

Post by Steven King
The merge of MMU and non-MMU versions of entry.S broke building for any
coldfire processor with COLDFIRE_SW_A7 selected (ie 5206, 5249,
525x,...); entry.h must be included after asm-offsets.h.

What breakage do you see?
I can build 3.5-rc2 for a 5307 target (which has CONFIG_COLDFIRE_SW_A7
set) with no problems.

Also, this was against for-next, since thats where the merged entry.S
lives ;).

Ah yes, that would be it. Would you be bothered if I just rolled this
into the merge patch? Since it is in for-next and not yet Linus's
tree I would rather just fix the original patch.

Regards
Greg



------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg at snapgear.com
SnapGear Group, McAfee PHONE: [phone]
8 Gardner Close FAX: [phone]
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com

[Steven King]

Post by Greg Ungerer
Hi Steven,

Post by Steven King

Post by Greg Ungerer

Post by Steven King
The merge of MMU and non-MMU versions of entry.S broke building for any
coldfire processor with COLDFIRE_SW_A7 selected (ie 5206, 5249,
525x,...); entry.h must be included after asm-offsets.h.

What breakage do you see?
I can build 3.5-rc2 for a 5307 target (which has CONFIG_COLDFIRE_SW_A7
set) with no problems.

Also, this was against for-next, since thats where the merged entry.S
lives ;).

Ah yes, that would be it. Would you be bothered if I just rolled this
into the merge patch? Since it is in for-next and not yet Linus's
tree I would rather just fix the original patch.

I wouldn't be bothered in the slightest for you to do that.

[Greg Ungerer]

Post by Steven King

Post by Greg Ungerer
Hi Steven,

Post by Steven King

Post by Greg Ungerer

Post by Steven King
The merge of MMU and non-MMU versions of entry.S broke building for any
coldfire processor with COLDFIRE_SW_A7 selected (ie 5206, 5249,
525x,...); entry.h must be included after asm-offsets.h.

What breakage do you see?
I can build 3.5-rc2 for a 5307 target (which has CONFIG_COLDFIRE_SW_A7
set) with no problems.

Also, this was against for-next, since thats where the merged entry.S
lives ;).

Ah yes, that would be it. Would you be bothered if I just rolled this
into the merge patch? Since it is in for-next and not yet Linus's
tree I would rather just fix the original patch.

I wouldn't be bothered in the slightest for you to do that.

Thanks. I'll fix that up then.

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg at snapgear.com
SnapGear Group, McAfee PHONE: [phone]
8 Gardner Close FAX: [phone]
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com