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>
master
Vasili Galka 11 years ago committed by Tom Rini
parent 4b9ca09399
commit 7d89982b7a
  1. 2
      arch/arm/include/asm/atomic.h
  2. 2
      arch/arm/include/asm/bitops.h
  3. 2
      arch/arm/include/asm/proc-armv/processor.h
  4. 2
      arch/arm/include/asm/processor.h
  5. 2
      arch/arm/include/asm/ptrace.h
  6. 5
      mkconfig

@ -25,7 +25,7 @@ typedef struct { volatile int counter; } atomic_t;
#define ATOMIC_INIT(i) { (i) } #define ATOMIC_INIT(i) { (i) }
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/proc/system.h> #include <asm/proc-armv/system.h>
#define atomic_read(v) ((v)->counter) #define atomic_read(v) ((v)->counter)
#define atomic_set(v,i) (((v)->counter) = (i)) #define atomic_set(v,i) (((v)->counter) = (i))

@ -17,7 +17,7 @@
#ifdef __KERNEL__ #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__before_clear_bit() do { } while (0)
#define smp_mb__after_clear_bit() do { } while (0) #define smp_mb__after_clear_bit() do { } while (0)

@ -18,7 +18,7 @@
#ifndef __ASM_PROC_PROCESSOR_H #ifndef __ASM_PROC_PROCESSOR_H
#define __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 #define KERNEL_STACK_SIZE PAGE_SIZE

@ -45,7 +45,7 @@ typedef unsigned long mm_segment_t; /* domain register */
#if 0 /* XXX###XXX */ #if 0 /* XXX###XXX */
#include <asm/arch/memory.h> #include <asm/arch/memory.h>
#endif /* XXX###XXX */ #endif /* XXX###XXX */
#include <asm/proc/processor.h> #include <asm/proc-armv/processor.h>
#include <asm/types.h> #include <asm/types.h>
union debug_insn { union debug_insn {

@ -11,7 +11,7 @@
/* options set using PTRACE_SETOPTIONS */ /* options set using PTRACE_SETOPTIONS */
#define PTRACE_O_TRACESYSGOOD 0x00000001 #define PTRACE_O_TRACESYSGOOD 0x00000001
#include <asm/proc/ptrace.h> #include <asm/proc-armv/ptrace.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#define pc_pointer(v) \ #define pc_pointer(v) \

@ -120,11 +120,6 @@ else
ln -s ${LNPREFIX}arch-${soc} asm/arch ln -s ${LNPREFIX}arch-${soc} asm/arch
fi fi
if [ "${arch}" = "arm" ] ; then
rm -f asm/proc
ln -s ${LNPREFIX}proc-armv asm/proc
fi
if [ -z "$KBUILD_SRC" ] ; then if [ -z "$KBUILD_SRC" ] ; then
cd ${srctree}/include cd ${srctree}/include
fi fi

Loading…
Cancel
Save