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 <vvv444@gmail.com>

diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 1b22eeb5fc242cdbbfabea683efee6b1e5976bc0..34c07fe5005a900346fff26b5e510006c3cd7140 100644 (file)
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -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))

diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index 879e20e0246c2ddfa7eab8dd26a4a91b3943e4b2..597dafbf9d26fadcb27dce69cf03df2dd08ca44b 100644 (file)
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -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)

diff --git a/arch/arm/include/asm/proc-armv/processor.h b/arch/arm/include/asm/proc-armv/processor.h
index 5bfab7fb905c86c2f3d4cfbe1f5e7fe3d89e857f..532f2079e613a26dfdaefc8b6c1915ee9f3f6f1e 100644 (file)
--- a/arch/arm/include/asm/proc-armv/processor.h
+++ b/arch/arm/include/asm/proc-armv/processor.h
@@ -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
 

diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
index 445d4495be17a96db05417fa08b08f08741ff6b9..83481c6cdaf29f1f755387b0cd2560b7e0248bb7 100644 (file)
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
@@ -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 {

diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index 73c9087b5084c242f119606d167104686613ef58..a836f6cc60db49bbf9da5f4b1df7efd565e7da3e 100644 (file)
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -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) \

diff --git a/mkconfig b/mkconfig
index cd911a9dc7322ecd4b126001b31209f44debe2d7..2bf5897528d9fbc14377033a48dad47f5b9e3386 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -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