Re: [PATCH 05/35] Disintegrate asm/system.h for Blackfin [ver #2]
From: Bob Liu
Date: Tue Mar 13 2012 - 00:44:11 EST
On Tue, Mar 13, 2012 at 7:36 AM, David Howells <dhowells@xxxxxxxxxx> wrote:
> Disintegrate asm/system.h for Blackfin.
>
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
> cc: uclinux-dist-devel@xxxxxxxxxxxxxxxxxxxx
Thanks, i'll apply it.
> ---
>
> Âarch/blackfin/include/asm/atomic.h   Â|  Â2
> Âarch/blackfin/include/asm/barrier.h   |  48 ++++++++
> Âarch/blackfin/include/asm/cmpxchg.h   | Â132 +++++++++++++++++++++
> Âarch/blackfin/include/asm/exec.h    Â|  Â1
> Âarch/blackfin/include/asm/irq_handler.h | Â Â1
> Âarch/blackfin/include/asm/switch_to.h  |  39 ++++++
> Âarch/blackfin/include/asm/system.h   Â| Â197 +------------------------------
> Âarch/blackfin/kernel/asm-offsets.c   Â|  Â1
> Âarch/blackfin/kernel/ipipe.c      Â|  Â1
> Âarch/blackfin/kernel/kgdb_test.c    Â|  Â1
> Âarch/blackfin/kernel/process.c     Â|  Â1
> Âarch/blackfin/kernel/ptrace.c      |  Â1
> Âarch/blackfin/kernel/reboot.c      |  Â1
> Âarch/blackfin/kernel/setup.c      Â|  Â1
> Âarch/blackfin/kernel/trace.c      Â|  Â1
> Âarch/blackfin/kernel/traps.c      Â|  Â1
> Â16 files changed, 233 insertions(+), 196 deletions(-)
> Âcreate mode 100644 arch/blackfin/include/asm/barrier.h
> Âcreate mode 100644 arch/blackfin/include/asm/cmpxchg.h
> Âcreate mode 100644 arch/blackfin/include/asm/exec.h
> Âcreate mode 100644 arch/blackfin/include/asm/switch_to.h
>
> diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h
> index 54c6e28..c8db653 100644
> --- a/arch/blackfin/include/asm/atomic.h
> +++ b/arch/blackfin/include/asm/atomic.h
> @@ -7,6 +7,8 @@
> Â#ifndef __ARCH_BLACKFIN_ATOMIC__
> Â#define __ARCH_BLACKFIN_ATOMIC__
>
> +#include <asm/cmpxchg.h>
> +
> Â#ifdef CONFIG_SMP
>
> Â#include <linux/linkage.h>
> diff --git a/arch/blackfin/include/asm/barrier.h b/arch/blackfin/include/asm/barrier.h
> new file mode 100644
> index 0000000..ebb1895
> --- /dev/null
> +++ b/arch/blackfin/include/asm/barrier.h
> @@ -0,0 +1,48 @@
> +/*
> + * Copyright 2004-2009 Analog Devices Inc.
> + * Â Â Â Â Â Â Â Tony Kou (tonyko@xxxxxxxx)
> + *
> + * Licensed under the GPL-2 or later
> + */
> +
> +#ifndef _BLACKFIN_BARRIER_H
> +#define _BLACKFIN_BARRIER_H
> +
> +#include <asm/cache.h>
> +
> +#define nop() Â__asm__ __volatile__ ("nop;\n\t" : : )
> +
> +/*
> + * Force strict CPU ordering.
> + */
> +#ifdef CONFIG_SMP
> +
> +#ifdef __ARCH_SYNC_CORE_DCACHE
> +/* Force Core data cache coherence */
> +# define mb() Âdo { barrier(); smp_check_barrier(); smp_mark_barrier(); } while (0)
> +# define rmb() do { barrier(); smp_check_barrier(); } while (0)
> +# define wmb() do { barrier(); smp_mark_barrier(); } while (0)
> +# define read_barrier_depends() Â Â Â Âdo { barrier(); smp_check_barrier(); } while (0)
> +#else
> +# define mb() Âbarrier()
> +# define rmb() barrier()
> +# define wmb() barrier()
> +# define read_barrier_depends() Â Â Â Âdo { } while (0)
> +#endif
> +
> +#else /* !CONFIG_SMP */
> +
> +#define mb() Â barrier()
> +#define rmb() Âbarrier()
> +#define wmb() Âbarrier()
> +#define read_barrier_depends() do { } while (0)
> +
> +#endif /* !CONFIG_SMP */
> +
> +#define smp_mb() Âmb()
> +#define smp_rmb() rmb()
> +#define smp_wmb() wmb()
> +#define set_mb(var, value) do { var = value; mb(); } while (0)
> +#define smp_read_barrier_depends() Â Â read_barrier_depends()
> +
> +#endif /* _BLACKFIN_BARRIER_H */
> diff --git a/arch/blackfin/include/asm/cmpxchg.h b/arch/blackfin/include/asm/cmpxchg.h
> new file mode 100644
> index 0000000..ba2484f
> --- /dev/null
> +++ b/arch/blackfin/include/asm/cmpxchg.h
> @@ -0,0 +1,132 @@
> +/*
> + * Copyright 2004-2011 Analog Devices Inc.
> + *
> + * Licensed under the GPL-2 or later.
> + */
> +
> +#ifndef __ARCH_BLACKFIN_CMPXCHG__
> +#define __ARCH_BLACKFIN_CMPXCHG__
> +
> +#ifdef CONFIG_SMP
> +
> +#include <linux/linkage.h>
> +
> +asmlinkage unsigned long __raw_xchg_1_asm(volatile void *ptr, unsigned long value);
> +asmlinkage unsigned long __raw_xchg_2_asm(volatile void *ptr, unsigned long value);
> +asmlinkage unsigned long __raw_xchg_4_asm(volatile void *ptr, unsigned long value);
> +asmlinkage unsigned long __raw_cmpxchg_1_asm(volatile void *ptr,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, unsigned long old);
> +asmlinkage unsigned long __raw_cmpxchg_2_asm(volatile void *ptr,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, unsigned long old);
> +asmlinkage unsigned long __raw_cmpxchg_4_asm(volatile void *ptr,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, unsigned long old);
> +
> +static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âint size)
> +{
> + Â Â Â unsigned long tmp;
> +
> + Â Â Â switch (size) {
> + Â Â Â case 1:
> + Â Â Â Â Â Â Â tmp = __raw_xchg_1_asm(ptr, x);
> + Â Â Â Â Â Â Â break;
> + Â Â Â case 2:
> + Â Â Â Â Â Â Â tmp = __raw_xchg_2_asm(ptr, x);
> + Â Â Â Â Â Â Â break;
> + Â Â Â case 4:
> + Â Â Â Â Â Â Â tmp = __raw_xchg_4_asm(ptr, x);
> + Â Â Â Â Â Â Â break;
> + Â Â Â }
> +
> + Â Â Â return tmp;
> +}
> +
> +/*
> + * Atomic compare and exchange. ÂCompare OLD with MEM, if identical,
> + * store NEW in MEM. ÂReturn the initial value in MEM. ÂSuccess is
> + * indicated by comparing RETURN with OLD.
> + */
> +static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, int size)
> +{
> + Â Â Â unsigned long tmp;
> +
> + Â Â Â switch (size) {
> + Â Â Â case 1:
> + Â Â Â Â Â Â Â tmp = __raw_cmpxchg_1_asm(ptr, new, old);
> + Â Â Â Â Â Â Â break;
> + Â Â Â case 2:
> + Â Â Â Â Â Â Â tmp = __raw_cmpxchg_2_asm(ptr, new, old);
> + Â Â Â Â Â Â Â break;
> + Â Â Â case 4:
> + Â Â Â Â Â Â Â tmp = __raw_cmpxchg_4_asm(ptr, new, old);
> + Â Â Â Â Â Â Â break;
> + Â Â Â }
> +
> + Â Â Â return tmp;
> +}
> +#define cmpxchg(ptr, o, n) \
> + Â Â Â ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \
> + Â Â Â Â Â Â Â (unsigned long)(n), sizeof(*(ptr))))
> +
> +#else /* !CONFIG_SMP */
> +
> +#include <mach/blackfin.h>
> +#include <asm/irqflags.h>
> +
> +struct __xchg_dummy {
> + Â Â Â unsigned long a[100];
> +};
> +#define __xg(x) ((volatile struct __xchg_dummy *)(x))
> +
> +static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âint size)
> +{
> + Â Â Â unsigned long tmp = 0;
> + Â Â Â unsigned long flags;
> +
> + Â Â Â flags = hard_local_irq_save();
> +
> + Â Â Â switch (size) {
> + Â Â Â case 1:
> + Â Â Â Â Â Â Â __asm__ __volatile__
> + Â Â Â Â Â Â Â Â Â Â Â ("%0 = b%2 (z);\n\t"
> + Â Â Â Â Â Â Â Â Â Â Â Â"b%2 = %1;\n\t"
> + Â Â Â Â Â Â Â Â Â Â Â Â: "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
> + Â Â Â Â Â Â Â break;
> + Â Â Â case 2:
> + Â Â Â Â Â Â Â __asm__ __volatile__
> + Â Â Â Â Â Â Â Â Â Â Â ("%0 = w%2 (z);\n\t"
> + Â Â Â Â Â Â Â Â Â Â Â Â"w%2 = %1;\n\t"
> + Â Â Â Â Â Â Â Â Â Â Â Â: "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
> + Â Â Â Â Â Â Â break;
> + Â Â Â case 4:
> + Â Â Â Â Â Â Â __asm__ __volatile__
> + Â Â Â Â Â Â Â Â Â Â Â ("%0 = %2;\n\t"
> + Â Â Â Â Â Â Â Â Â Â Â Â"%2 = %1;\n\t"
> + Â Â Â Â Â Â Â Â Â Â Â Â: "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
> + Â Â Â Â Â Â Â break;
> + Â Â Â }
> + Â Â Â hard_local_irq_restore(flags);
> + Â Â Â return tmp;
> +}
> +
> +#include <asm-generic/cmpxchg-local.h>
> +
> +/*
> + * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
> + * them available.
> + */
> +#define cmpxchg_local(ptr, o, n) Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
> + Â Â Â ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
> + Â Â Â Â Â Â Â Â Â Â Â (unsigned long)(n), sizeof(*(ptr))))
> +#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
> +
> +#include <asm-generic/cmpxchg.h>
> +
> +#endif /* !CONFIG_SMP */
> +
> +#define xchg(ptr, x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
> +#define tas(ptr) ((void)xchg((ptr), 1))
> +
> +#endif /* __ARCH_BLACKFIN_CMPXCHG__ */
> diff --git a/arch/blackfin/include/asm/exec.h b/arch/blackfin/include/asm/exec.h
> new file mode 100644
> index 0000000..54c2e1d
> --- /dev/null
> +++ b/arch/blackfin/include/asm/exec.h
> @@ -0,0 +1 @@
> +/* define arch_align_stack() here */
> diff --git a/arch/blackfin/include/asm/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h
> index ee73f79..4fbf835 100644
> --- a/arch/blackfin/include/asm/irq_handler.h
> +++ b/arch/blackfin/include/asm/irq_handler.h
> @@ -9,6 +9,7 @@
>
> Â#include <linux/types.h>
> Â#include <linux/linkage.h>
> +#include <mach/irq.h>
>
> Â/* init functions only */
> Âextern int __init init_arch_irq(void);
> diff --git a/arch/blackfin/include/asm/switch_to.h b/arch/blackfin/include/asm/switch_to.h
> new file mode 100644
> index 0000000..aaf671b
> --- /dev/null
> +++ b/arch/blackfin/include/asm/switch_to.h
> @@ -0,0 +1,39 @@
> +/*
> + * Copyright 2004-2009 Analog Devices Inc.
> + * Â Â Â Â Â Â Â Tony Kou (tonyko@xxxxxxxx)
> + *
> + * Licensed under the GPL-2 or later
> + */
> +
> +#ifndef _BLACKFIN_SWITCH_TO_H
> +#define _BLACKFIN_SWITCH_TO_H
> +
> +#define prepare_to_switch() Â Â do { } while(0)
> +
> +/*
> + * switch_to(n) should switch tasks to task ptr, first checking that
> + * ptr isn't the current task, in which case it does nothing.
> + */
> +
> +#include <asm/l1layout.h>
> +#include <asm/mem_map.h>
> +
> +asmlinkage struct task_struct *resume(struct task_struct *prev, struct task_struct *next);
> +
> +#ifndef CONFIG_SMP
> +#define switch_to(prev,next,last) \
> +do { Â Â\
> + Â Â Â memcpy (&task_thread_info(prev)->l1_task_info, L1_SCRATCH_TASK_INFO, \
> + Â Â Â Â Â Â Â sizeof *L1_SCRATCH_TASK_INFO); \
> + Â Â Â memcpy (L1_SCRATCH_TASK_INFO, &task_thread_info(next)->l1_task_info, \
> + Â Â Â Â Â Â Â sizeof *L1_SCRATCH_TASK_INFO); \
> + Â Â Â (last) = resume (prev, next); Â \
> +} while (0)
> +#else
> +#define switch_to(prev, next, last) \
> +do { Â Â\
> + Â Â Â (last) = resume(prev, next); Â \
> +} while (0)
> +#endif
> +
> +#endif /* _BLACKFIN_SWITCH_TO_H */
> diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h
> index 44bd0cc..a7f4057 100644
> --- a/arch/blackfin/include/asm/system.h
> +++ b/arch/blackfin/include/asm/system.h
> @@ -1,192 +1,5 @@
> -/*
> - * Copyright 2004-2009 Analog Devices Inc.
> - * Â Â Â Â Â Â Â Tony Kou (tonyko@xxxxxxxx)
> - *
> - * Licensed under the GPL-2 or later
> - */
> -
> -#ifndef _BLACKFIN_SYSTEM_H
> -#define _BLACKFIN_SYSTEM_H
> -
> -#include <linux/linkage.h>
> -#include <linux/irqflags.h>
> -#include <mach/anomaly.h>
> -#include <asm/cache.h>
> -#include <asm/pda.h>
> -#include <asm/irq.h>
> -
> -/*
> - * Force strict CPU ordering.
> - */
> -#define nop() Â__asm__ __volatile__ ("nop;\n\t" : : )
> -#define smp_mb() Âmb()
> -#define smp_rmb() rmb()
> -#define smp_wmb() wmb()
> -#define set_mb(var, value) do { var = value; mb(); } while (0)
> -#define smp_read_barrier_depends() Â Â read_barrier_depends()
> -
> -#ifdef CONFIG_SMP
> -asmlinkage unsigned long __raw_xchg_1_asm(volatile void *ptr, unsigned long value);
> -asmlinkage unsigned long __raw_xchg_2_asm(volatile void *ptr, unsigned long value);
> -asmlinkage unsigned long __raw_xchg_4_asm(volatile void *ptr, unsigned long value);
> -asmlinkage unsigned long __raw_cmpxchg_1_asm(volatile void *ptr,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, unsigned long old);
> -asmlinkage unsigned long __raw_cmpxchg_2_asm(volatile void *ptr,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, unsigned long old);
> -asmlinkage unsigned long __raw_cmpxchg_4_asm(volatile void *ptr,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, unsigned long old);
> -
> -#ifdef __ARCH_SYNC_CORE_DCACHE
> -/* Force Core data cache coherence */
> -# define mb() Âdo { barrier(); smp_check_barrier(); smp_mark_barrier(); } while (0)
> -# define rmb() do { barrier(); smp_check_barrier(); } while (0)
> -# define wmb() do { barrier(); smp_mark_barrier(); } while (0)
> -# define read_barrier_depends() Â Â Â Âdo { barrier(); smp_check_barrier(); } while (0)
> -#else
> -# define mb() Âbarrier()
> -# define rmb() barrier()
> -# define wmb() barrier()
> -# define read_barrier_depends() Â Â Â Âdo { } while (0)
> -#endif
> -
> -static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âint size)
> -{
> - Â Â Â unsigned long tmp;
> -
> - Â Â Â switch (size) {
> - Â Â Â case 1:
> - Â Â Â Â Â Â Â tmp = __raw_xchg_1_asm(ptr, x);
> - Â Â Â Â Â Â Â break;
> - Â Â Â case 2:
> - Â Â Â Â Â Â Â tmp = __raw_xchg_2_asm(ptr, x);
> - Â Â Â Â Â Â Â break;
> - Â Â Â case 4:
> - Â Â Â Â Â Â Â tmp = __raw_xchg_4_asm(ptr, x);
> - Â Â Â Â Â Â Â break;
> - Â Â Â }
> -
> - Â Â Â return tmp;
> -}
> -
> -/*
> - * Atomic compare and exchange. ÂCompare OLD with MEM, if identical,
> - * store NEW in MEM. ÂReturn the initial value in MEM. ÂSuccess is
> - * indicated by comparing RETURN with OLD.
> - */
> -static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned long new, int size)
> -{
> - Â Â Â unsigned long tmp;
> -
> - Â Â Â switch (size) {
> - Â Â Â case 1:
> - Â Â Â Â Â Â Â tmp = __raw_cmpxchg_1_asm(ptr, new, old);
> - Â Â Â Â Â Â Â break;
> - Â Â Â case 2:
> - Â Â Â Â Â Â Â tmp = __raw_cmpxchg_2_asm(ptr, new, old);
> - Â Â Â Â Â Â Â break;
> - Â Â Â case 4:
> - Â Â Â Â Â Â Â tmp = __raw_cmpxchg_4_asm(ptr, new, old);
> - Â Â Â Â Â Â Â break;
> - Â Â Â }
> -
> - Â Â Â return tmp;
> -}
> -#define cmpxchg(ptr, o, n) \
> - Â Â Â ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \
> - Â Â Â Â Â Â Â (unsigned long)(n), sizeof(*(ptr))))
> -
> -#else /* !CONFIG_SMP */
> -
> -#define mb() Â barrier()
> -#define rmb() Âbarrier()
> -#define wmb() Âbarrier()
> -#define read_barrier_depends() do { } while (0)
> -
> -struct __xchg_dummy {
> - Â Â Â unsigned long a[100];
> -};
> -#define __xg(x) ((volatile struct __xchg_dummy *)(x))
> -
> -#include <mach/blackfin.h>
> -
> -static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âint size)
> -{
> - Â Â Â unsigned long tmp = 0;
> - Â Â Â unsigned long flags;
> -
> - Â Â Â flags = hard_local_irq_save();
> -
> - Â Â Â switch (size) {
> - Â Â Â case 1:
> - Â Â Â Â Â Â Â __asm__ __volatile__
> - Â Â Â Â Â Â Â Â Â Â Â ("%0 = b%2 (z);\n\t"
> - Â Â Â Â Â Â Â Â Â Â Â Â"b%2 = %1;\n\t"
> - Â Â Â Â Â Â Â Â Â Â Â Â: "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
> - Â Â Â Â Â Â Â break;
> - Â Â Â case 2:
> - Â Â Â Â Â Â Â __asm__ __volatile__
> - Â Â Â Â Â Â Â Â Â Â Â ("%0 = w%2 (z);\n\t"
> - Â Â Â Â Â Â Â Â Â Â Â Â"w%2 = %1;\n\t"
> - Â Â Â Â Â Â Â Â Â Â Â Â: "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
> - Â Â Â Â Â Â Â break;
> - Â Â Â case 4:
> - Â Â Â Â Â Â Â __asm__ __volatile__
> - Â Â Â Â Â Â Â Â Â Â Â ("%0 = %2;\n\t"
> - Â Â Â Â Â Â Â Â Â Â Â Â"%2 = %1;\n\t"
> - Â Â Â Â Â Â Â Â Â Â Â Â: "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
> - Â Â Â Â Â Â Â break;
> - Â Â Â }
> - Â Â Â hard_local_irq_restore(flags);
> - Â Â Â return tmp;
> -}
> -
> -#include <asm-generic/cmpxchg-local.h>
> -
> -/*
> - * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
> - * them available.
> - */
> -#define cmpxchg_local(ptr, o, n) Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â\
> - Â Â Â ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
> - Â Â Â Â Â Â Â Â Â Â Â (unsigned long)(n), sizeof(*(ptr))))
> -#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
> -
> -#include <asm-generic/cmpxchg.h>
> -
> -#endif /* !CONFIG_SMP */
> -
> -#define xchg(ptr, x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
> -#define tas(ptr) ((void)xchg((ptr), 1))
> -
> -#define prepare_to_switch() Â Â do { } while(0)
> -
> -/*
> - * switch_to(n) should switch tasks to task ptr, first checking that
> - * ptr isn't the current task, in which case it does nothing.
> - */
> -
> -#include <asm/l1layout.h>
> -#include <asm/mem_map.h>
> -
> -asmlinkage struct task_struct *resume(struct task_struct *prev, struct task_struct *next);
> -
> -#ifndef CONFIG_SMP
> -#define switch_to(prev,next,last) \
> -do { Â Â\
> - Â Â Â memcpy (&task_thread_info(prev)->l1_task_info, L1_SCRATCH_TASK_INFO, \
> - Â Â Â Â Â Â Â sizeof *L1_SCRATCH_TASK_INFO); \
> - Â Â Â memcpy (L1_SCRATCH_TASK_INFO, &task_thread_info(next)->l1_task_info, \
> - Â Â Â Â Â Â Â sizeof *L1_SCRATCH_TASK_INFO); \
> - Â Â Â (last) = resume (prev, next); Â \
> -} while (0)
> -#else
> -#define switch_to(prev, next, last) \
> -do { Â Â\
> - Â Â Â (last) = resume(prev, next); Â \
> -} while (0)
> -#endif
> -
> -#endif /* _BLACKFIN_SYSTEM_H */
> +/* FILE TO BE DELETED. DO NOT ADD STUFF HERE! */
> +#include <asm/barrier.h>
> +#include <asm/cmpxchg.h>
> +#include <asm/exec.h>
> +#include <asm/switch_to.h>
> diff --git a/arch/blackfin/kernel/asm-offsets.c b/arch/blackfin/kernel/asm-offsets.c
> index 17e3546..37fcae9 100644
> --- a/arch/blackfin/kernel/asm-offsets.c
> +++ b/arch/blackfin/kernel/asm-offsets.c
> @@ -14,6 +14,7 @@
> Â#include <linux/irq.h>
> Â#include <linux/thread_info.h>
> Â#include <linux/kbuild.h>
> +#include <asm/pda.h>
>
> Âint main(void)
> Â{
> diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
> index dbe1122..f657b38 100644
> --- a/arch/blackfin/kernel/ipipe.c
> +++ b/arch/blackfin/kernel/ipipe.c
> @@ -31,7 +31,6 @@
> Â#include <linux/kthread.h>
> Â#include <linux/unistd.h>
> Â#include <linux/io.h>
> -#include <asm/system.h>
> Â#include <linux/atomic.h>
> Â#include <asm/irq_handler.h>
>
> diff --git a/arch/blackfin/kernel/kgdb_test.c b/arch/blackfin/kernel/kgdb_test.c
> index 4a7dcfe..18ab004 100644
> --- a/arch/blackfin/kernel/kgdb_test.c
> +++ b/arch/blackfin/kernel/kgdb_test.c
> @@ -13,7 +13,6 @@
>
> Â#include <asm/current.h>
> Â#include <asm/uaccess.h>
> -#include <asm/system.h>
>
> Â#include <asm/blackfin.h>
>
> diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
> index 8dd0416..8c5369c 100644
> --- a/arch/blackfin/kernel/process.c
> +++ b/arch/blackfin/kernel/process.c
> @@ -19,6 +19,7 @@
> Â#include <asm/blackfin.h>
> Â#include <asm/fixed_code.h>
> Â#include <asm/mem_map.h>
> +#include <asm/irq.h>
>
> Âasmlinkage void ret_from_fork(void);
>
> diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
> index 75089f8..e1f88e0 100644
> --- a/arch/blackfin/kernel/ptrace.c
> +++ b/arch/blackfin/kernel/ptrace.c
> @@ -20,7 +20,6 @@
>
> Â#include <asm/page.h>
> Â#include <asm/pgtable.h>
> -#include <asm/system.h>
> Â#include <asm/processor.h>
> Â#include <asm/asm-offsets.h>
> Â#include <asm/dma.h>
> diff --git a/arch/blackfin/kernel/reboot.c b/arch/blackfin/kernel/reboot.c
> index c4c0081..b0434f8 100644
> --- a/arch/blackfin/kernel/reboot.c
> +++ b/arch/blackfin/kernel/reboot.c
> @@ -9,7 +9,6 @@
> Â#include <linux/interrupt.h>
> Â#include <asm/bfin-global.h>
> Â#include <asm/reboot.h>
> -#include <asm/system.h>
> Â#include <asm/bfrom.h>
>
> Â/* A system soft reset makes external memory unusable so force
> diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
> index d6102c8..2aa0193 100644
> --- a/arch/blackfin/kernel/setup.c
> +++ b/arch/blackfin/kernel/setup.c
> @@ -30,6 +30,7 @@
> Â#include <asm/fixed_code.h>
> Â#include <asm/early_printk.h>
> Â#include <asm/irq_handler.h>
> +#include <asm/pda.h>
>
> Âu16 _bfin_swrst;
> ÂEXPORT_SYMBOL(_bfin_swrst);
> diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c
> index 050db44..44bbf2f 100644
> --- a/arch/blackfin/kernel/trace.c
> +++ b/arch/blackfin/kernel/trace.c
> @@ -21,6 +21,7 @@
> Â#include <asm/fixed_code.h>
> Â#include <asm/traps.h>
> Â#include <asm/irq_handler.h>
> +#include <asm/pda.h>
>
> Âvoid decode_address(char *buf, unsigned long address)
> Â{
> diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
> index 655f25d..de5c2c3 100644
> --- a/arch/blackfin/kernel/traps.c
> +++ b/arch/blackfin/kernel/traps.c
> @@ -17,6 +17,7 @@
> Â#include <asm/trace.h>
> Â#include <asm/fixed_code.h>
> Â#include <asm/pseudo_instructions.h>
> +#include <asm/pda.h>
>
> Â#ifdef CONFIG_KGDB
> Â# include <linux/kgdb.h>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
> Please read the FAQ at Âhttp://www.tux.org/lkml/
--
Regards,
--Bob
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/