Skip to contentSkip to conversation

Remove ${objtree}/include/asm/proc/ link

PATCH In review Vasili Galka 2 participants 2 messages Jun 10, 2014 – Jun 11, 2014

Subsystems (4)
Arm (32-bit) ptrace support Atomic infrastructure Bitops API
lore
Share & tools
lore

Vasili Galka

author
#0 lore raw

PATCH 1/1 Remove ${objtree}/include/asm/proc/ link

mkconfig links ${objtree}/include/asm/proc/ to ${srctree}/arch/${arch}/include/asm/proc-armv/. This seems to be a remnant from the past. Ever since its introduction in 2003 it is used only in ARM build and always links to same place, so let's simplify the code, remove it and reference directly where needed.

Successful MAKEALL for ARM and PowerPC verified on Linux.

Signed-off-by Vasili Galka <[email protected]>
---
 arch/arm/include/asm/atomic.h              |    2 +-
 arch/arm/include/asm/bitops.h              |    2 +-
 arch/arm/include/asm/proc-armv/processor.h |    2 +-
 arch/arm/include/asm/processor.h           |    2 +-
 arch/arm/include/asm/ptrace.h              |    2 +-
 mkconfig                                   |    5 -----
 6 files changed, 5 insertions(+), 10 deletions(-)
arch/arm/include/asm/atomic.h +1 -1
index 1b22eeb..34c07fe 100644
@@ -25,7 +25,7 @@ typedef struct { volatile int counter; } atomic_t;
 #define ATOMIC_INIT(i)	{ (i) }
 
 #ifdef __KERNEL__
-#include <asm/proc/system.h>
+#include <asm/proc-armv/system.h>
 
 #define atomic_read(v)	((v)->counter)
 #define atomic_set(v,i)	(((v)->counter) = (i))
arch/arm/include/asm/bitops.h +1 -1
index 879e20e..597dafb 100644
@@ -17,7 +17,7 @@
 
 #ifdef __KERNEL__
 
-#include <asm/proc/system.h>
+#include <asm/proc-armv/system.h>
 
 #define smp_mb__before_clear_bit()	do { } while (0)
 #define smp_mb__after_clear_bit()	do { } while (0)
arch/arm/include/asm/proc-armv/processor.h +1 -1
index 5bfab7f..532f207 100644
@@ -18,7 +18,7 @@
 #ifndef __ASM_PROC_PROCESSOR_H
 #define __ASM_PROC_PROCESSOR_H
 
-#include <asm/proc/domain.h>
+#include <asm/proc-armv/domain.h>
 
 #define KERNEL_STACK_SIZE	PAGE_SIZE
arch/arm/include/asm/processor.h +1 -1
index 445d449..83481c6 100644
@@ -45,7 +45,7 @@ typedef unsigned long mm_segment_t;		/* domain register	*/
 #if 0	/* XXX###XXX */
 #include <asm/arch/memory.h>
 #endif	/* XXX###XXX */
-#include <asm/proc/processor.h>
+#include <asm/proc-armv/processor.h>
 #include <asm/types.h>
 
 union debug_insn {
arch/arm/include/asm/ptrace.h +1 -1
index 73c9087..a836f6c 100644
@@ -11,7 +11,7 @@
 /* options set using PTRACE_SETOPTIONS */
 #define PTRACE_O_TRACESYSGOOD	0x00000001
 
-#include <asm/proc/ptrace.h>
+#include <asm/proc-armv/ptrace.h>
 
 #ifndef __ASSEMBLY__
 #define pc_pointer(v) \
mkconfig +0 -5
index cd911a9..2bf5897 100755
@@ -120,11 +120,6 @@ else
 	ln -s ${LNPREFIX}arch-${soc} asm/arch
 fi
 
-if [ "${arch}" = "arm" ] ; then
-	rm -f asm/proc
-	ln -s ${LNPREFIX}proc-armv asm/proc
-fi
-
 if [ -z "$KBUILD_SRC" ] ; then
 	cd ${srctree}/include
 fi
Signature · 1 line
1.7.9
#1 lore raw
Quoted 9 lines · Vasili Galka

mkconfig links ${objtree}/include/asm/proc/ to ${srctree}/arch/${arch}/include/asm/proc-armv/. This seems to be a remnant from the past. Ever since its introduction in 2003 it is used only in ARM build and always links to same place, so let's simplify the code, remove it and reference directly where needed.

Successful MAKEALL for ARM and PowerPC verified on Linux.

Signed-off-by Vasili Galka <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140611/334e5e86/attachment.pgp>