[PATCH] powerpc: Merge thread_info.h
authorDavid Gibson <david@gibson.dropbear.id.au>
Fri, 21 Oct 2005 05:45:50 +0000 (15:45 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 21 Oct 2005 12:47:23 +0000 (22:47 +1000)
commit6cb7bfebb145af5ea1d052512a2ae7ff07a47202
tree677ce52e6ad423f8a652ec3e16f98c3ad33fcc54
parentb0faa28493f97b55b36ff5b1a2b8c81bf253a460
[PATCH] powerpc: Merge thread_info.h

Merge ppc32 and ppc64 versions of thread_info.h.  They were pretty
similar already, the chief changes are:

- Instead of inline asm to implement current_thread_info(),
which needs to be different for ppc32 and ppc64, we use C with an
asm("r1") register variable.  gcc turns it into the same asm as we
used to have for both platforms.
- We replace ppc32's 'local_flags' with the ppc64
'syscall_noerror' field.  The noerror flag was in fact the only thing
in the local_flags field anyway, so the ppc64 approach is simpler, and
means we only need a load-immediate/store instead of load/mask/store
when clearing the flag.
- In readiness for 64k pages, when THREAD_SIZE will be less
than a page, ppc64 used kmalloc() rather than get_free_pages() to
allocate the kernel stack.  With this patch we do the same for ppc32,
since there's no strong reason not to.
- For ppc64, we no longer export THREAD_SHIFT and THREAD_SIZE
via asm-offsets, thread_info.h can now be safely included in asm, as
on ppc32.

Built and booted on G4 Powerbook (ARCH=ppc and ARCH=powerpc) and
Power5 (ARCH=ppc64 and ARCH=powerpc).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
13 files changed:
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/head_64.S
arch/powerpc/kernel/misc_64.S
arch/ppc/kernel/asm-offsets.c
arch/ppc/kernel/entry.S
arch/ppc64/kernel/asm-offsets.c
arch/ppc64/kernel/head.S
arch/ppc64/kernel/misc.S
include/asm-powerpc/thread_info.h [new file with mode: 0644]
include/asm-ppc/ptrace.h
include/asm-ppc/thread_info.h [deleted file]
include/asm-ppc64/thread_info.h [deleted file]