linux-toradex.git/arch/m68k/kernel/asm-offsets.c, branch v3.2.20

m68k: merge mmu and non-mmu versions of asm-offsets.c

2011-05-24T05:17:18+00:00

It is strait forward to merge the mmu and non-mmu versions of
asm-offstes.c. Some name changes are required for the preempt and
thread_info.flags in the non-mmu entry.S assembler to make them
consistent for both setups.

Signed-off-by: Greg Ungerer

m68k: merge m68k and m68knommu arch directories

2011-03-25T04:05:13+00:00

There is a lot of common code that could be shared between the m68k
and m68knommu arch branches. It makes sense to merge the two branches
into a single directory structure so that we can more easily share
that common code.

This is a brute force merge, based on a script from Stephen King
, which was originally written by Arnd Bergmann
.

> The script was inspired by the script Sam Ravnborg used to merge the
> includes from m68knommu. For those files common to both arches but
> differing in content, the m68k version of the file is renamed to
> _mm. and the m68knommu version of the file is moved into the
> corresponding m68k directory and renamed _no. and a small
> wrapper file . is used to select between the two version. Files
> that are common to both but don't differ are removed from the m68knommu
> tree and files and directories that are unique to the m68knommu tree are
> moved to the m68k tree. Finally, the arch/m68knommu tree is removed.
>
> To select between the the versions of the files, the wrapper uses
>
> #ifdef CONFIG_MMU
> #include _mm.
> #else
> #include _no.
> #endif

On top of this file merge I have done a simplistic merge of m68k and
m68knommu Kconfig, which primarily attempts to keep existing options and
menus in place. Other than a handful of options being moved it produces
identical .config outputs on m68k and m68knommu targets I tested it on.

With this in place there is now quite a bit of scope for merge cleanups
in future patches.

Signed-off-by: Greg Ungerer

m68k{nommu}: Remove unused DEFINE's from asm-offsets.c

2010-10-21T00:17:30+00:00

m68k{nommu}/asm-offsets.c define many constants which are not used
anymore anywhere; remove IRQ_DEVID, IRQ_HANDLER, IRQ_NEXT, STAT_IRQ,
TASK_ACTIVE_MM, TASK_BLOCKED, TASK_FLAGS, TASK_PTRACE, TASK_STATE,
TASK_THREAD_INFO, TI_CPU, TI_EXECDOMAIN and TI_TASK.

Signed-off-by: Philippe De Muyter 
Acked-by: Geert Uytterhoeven 
Signed-off-by: Greg Ungerer

locking, m68k/asm-offsets: Rename signal defines

2009-09-01T07:38:03+00:00

In order to be able to use asm-offsets.h in C files the
existing namespace conflicts must be solved first. In
asm-offsets.h there are defines for signal constants, so they
can be used in assembler files.

Unfortunately the existing defines use a 1:1 mapping for the
macro names which results in name space conflicts if the header
file would also be used in C files. So rename the created
defines and add an "L" prefix to each one since that has
already been done for the SIGTRAP define in entry_mm.

Signed-off-by: Heiko Carstens 
Cc: Peter Zijlstra 
Cc: Arnd Bergmann 
Cc: Nick Piggin 
Cc: Martin Schwidefsky 
Cc: Horst Hartmann 
Cc: Christian Ehrhardt 
Cc: Andrew Morton 
Cc: Linus Torvalds 
Cc: David Miller 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: Geert Uytterhoeven 
Cc: Roman Zippel 
Cc: 
LKML-Reference: <20090831124416.998821502@de.ibm.com>
Signed-off-by: Ingo Molnar

locking, m68k: Calculate thread_info offset with asm offset

2009-08-31T16:08:49+00:00

m68k has the thread_info structure embedded in its task struct.
Therefore its not possible to implement current_thread_info()
by looking at the stack pointer and do some simple calculations
like most other architectures do it.

To return the thread_info pointer for a task two defines are
used. This works until the spinlock function bodies get moved
into an own header file and CONFIG_SPINLOCK_DEBUG is turned on.
That results into this compile error:

  In file included from include/linux/spinlock.h:378,
                   from include/linux/seqlock.h:29,
                   from include/linux/time.h:8,
                   from include/linux/timex.h:56,
                   from include/linux/sched.h:54,
                   from arch/m68k/kernel/asm-offsets.c:12:
  include/linux/spinlock_api_smp.h: In function '__spin_unlock_irq':
  include/linux/spinlock_api_smp.h:371: error: 'current' undeclared (first use in this function)
  include/linux/spinlock_api_smp.h:371: error: (Each undeclared identifier is reported only once
  include/linux/spinlock_api_smp.h:371: error: for each function it appears in.)

Including asm/current.h to asm-offsets.c wouldn't help since
the definition of struct task is needed. So we end up with ugly
header file include dependencies.

To solve this calculate the offset of the thread_info structure
into the task struct in asm-offsets.h and use the offset in
task_thread_info(). This works just like it does for IA64 as
well.

Signed-off-by: Heiko Carstens 
Acked-by: Peter Zijlstra 
Cc: Arnd Bergmann 
Cc: Nick Piggin 
Cc: Martin Schwidefsky 
Cc: Horst Hartmann 
Cc: Christian Ehrhardt 
Cc: Andrew Morton 
Cc: Linus Torvalds 
Cc: David Miller 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: Geert Uytterhoeven 
Cc: Roman Zippel 
Cc: 
LKML-Reference: <20090831124417.329662275@de.ibm.com>
Signed-off-by: Ingo Molnar

locking, m68k/asm-offsets: Rename pt_regs offset defines

2009-08-31T16:08:49+00:00

In order to be able to use asm-offsets.h in C files the
existing namespace conflicts must be solved first. In
asm-offsets.h e.g. PT_D0 gets defined which is the offset of
the d0 member of the pt_regs structure. However a same define
(with a different meaning) exists in asm/ptregs.h.

So rename the defines created with the asm-offset mechanism to
PT_OFF_D0 etc. There also already exist a few defines with
these names that have the same meaning. So remove the existing
defines and use the asm-offset generated ones.

Signed-off-by: Heiko Carstens 
Acked-by: Peter Zijlstra 
Cc: Arnd Bergmann 
Cc: Nick Piggin 
Cc: Martin Schwidefsky 
Cc: Horst Hartmann 
Cc: Christian Ehrhardt 
Cc: Andrew Morton 
Cc: Linus Torvalds 
Cc: David Miller 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: Geert Uytterhoeven 
Cc: Roman Zippel 
Cc: 
LKML-Reference: <20090831124416.666403991@de.ibm.com>
Signed-off-by: Ingo Molnar

m68k/m68kmmu: use kbuild.h instead of defining macros in asm-offsets.c

2008-04-29T15:06:30+00:00

Signed-off-by: Christoph Lameter 
Cc: Geert Uytterhoeven 
Cc: Roman Zippel 
Cc: Greg Ungerer 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] m68k: namespace pollution fix (custom->amiga_custom)

2006-01-12T17:09:00+00:00

in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself

Signed-off-by: Al Viro 
Cc: Roman Zippel 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] m68k: convert thread flags to use bit fields

2005-11-14T02:14:14+00:00

Remove task_work structure, use the standard thread flags functions and use
shifts in entry.S to test the thread flags.  Add a few local labels to entry.S
to allow gas to generate short jumps.

Finally it changes a number of inline functions in thread_info.h to macros to
delay the current_thread_info() usage, which requires on m68k a structure
(task_struct) not yet defined at this point.

Signed-off-by: Roman Zippel 
Cc: Al Viro 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] m68k: m68k-specific thread_info changes

2005-11-14T02:14:14+00:00

a) added embedded thread_info [m68k processor.h]

b) added missing symbols in asm-offsets.c

c) task_thread_info() and friends in asm-m68k/thread_info.h

d) made m68k thread_info.h included by m68k processor.h, not the other way
   round.

Signed-off-by: Al Viro 
Signed-off-by: Roman Zippel 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds