Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>

Move struct ptregs32 into asm-ppc64/ppc32.h
Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>

This moves rtas-proc.c and rtas_flash.c into arch/powerpc/kernel, since
cell wants them as well as pseries (and chrp can use rtas-proc.c too,
at least in principle).  rtas_fw.c is gone, with its bits moved into
rtas_flash.c and rtas.c.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Include asm/rtas.h for prototype for rtas_call etc., and make the
`done' variable unsigned int since that's what rtas_call wants.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NPaul Mackerras <paulus@samba.org>

since it uses the lmb stuff in one place.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

These days, the NACA only exists on iSeries.  Therefore, this patch
moves naca.h from include/asm-ppc64 to arch/powerpc/platforms/iseries.
There was one file including naca.h outside of platforms/iseries -
arch/ppc64/kernel/udbg_scc.c.  However, that's obviously a hangover
from older days.  The include is not necessary, so this patch simply
removes it.

Built and booted on iSeries, built for G5 (which uses udbg_scc.o).
Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

asm-ppc64/dart.h is included in exactly one place -
arch/powerpc/sysdev/u3_iommu.c.  This patch, therefore, moves it into
arch/powerpc/sysdev.  While we're at it, update the #ifndef/#define
protecting the include, and the filename in the comments of
u3_iommu.c.

Built and booted on pSeries and G5, built for ppc32 powermac.
Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

The ppc64 versions of numnodes.h and sparsemem.h can be safely moved
to asm-powerpc with no changes apart from changing the #define to the
standard _ASM_POWERPC_ form.  There are no ppc32 versions of these
files, because they only have any effect if CONFIG_SPARSEMEM is
enabled, which it never can be on ppc32.

Built and booted on pSeries (POWER5), built for 32-bit powermac.
Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

This simplifies the macros which are different between 32-bit and
64-bit.  It also fixes a couple of printks on the bug->line element,
which is now a long.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

We were getting powerbook sleep code included, and giving compile
errors, with CONFIG_PM=y on a 64-bit build.  This excludes that code
so the kernel will compile.  One day BenH will implement on sleep on
the G5...
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

A couple of instances of "i" that needed to be changed to "cpu_id"
got missed in the merge, because they were in CONFIG_TAU code.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

The nvram driver imported from the ppc code uses call_rtas, but
rtas_call is the name we are using in merged code (since ppc64 used
that name, and it uses far more RTAS calls than ppc32).
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

DATA_TYPE is really not a good thing to put into header that
gets included all over the tree...

Just make the cast always (long) and get rid of DATA_TYPE altogether.
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

This patch merges the ppc32 and ppc64 versions of futex.h, essentially
by taking the ppc64 version as the powerpc version.  The old ppc32
version did not implement the futex_atomic_op_inuser() callback (it
always returned -ENOSYS), so FUTEX_WAKE_OP would not work on ppc32.
In fact the ppc64 version of this function is almost suitable for
ppc32 as well - the only change needed is to extend ppc_asm.h with a
macro expanding to to the right pseudo-op to store a pointer (either
".long" or ".llong").

Built and booted on pSeries.  Built for 32-bit powermac.
Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Oops, when merging ipcbuf.h, I forgot that 'u64' can't be used in
user-visible headers.  This patch corrects the problem, replacing the
unused fields with an array of four __u32s.
Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NKelly Daly <kelly@au.ibm.com>

Signed-off-by: NAnton Altaparmakov <aia21@cantab.net>