提交 · bccfd588423bb610fb1fde987da3ad23af1c46d7 · openanolis / cloud-kernel

02 11月, 2005 5 次提交

powerpc: Fix compile error with CONFIG_TAU=y · bccfd588

由 Paul Mackerras 提交于 11月 02, 2005

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>

bccfd588

powerpc: Use rtas_call not call_rtas in CHRP code · 19fa17e5

由 Paul Mackerras 提交于 11月 02, 2005

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>

19fa17e5

[PATCH] ppc bug.h namespace pollution · f2cad7a8

由 Al Viro 提交于 11月 02, 2005

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>

f2cad7a8

[PATCH] powerpc: Merge futex.h · 2ff2ae7a

由 David Gibson 提交于 11月 02, 2005

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>

2ff2ae7a

[PATCH] powerpc: Fix merged ipcbuf.h · 847aeb6b

由 David Gibson 提交于 11月 02, 2005

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>

847aeb6b

01 11月, 2005 14 次提交

powerpc: Fix pseries (64-bit) build · a39dbcf7

由 Paul Mackerras 提交于 11月 01, 2005

A recent commit that removed rtas-fw.h and moved its contents to
include/asm-powerpc/rtas.h forgot to also remove the inclusion of
it in arch/powerpc/platforms/pseries/setup.c.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

a39dbcf7

powerpc: Fix BUG/WARN macros for 64-bit · 89003ebf

由 Paul Mackerras 提交于 11月 01, 2005

The bug_entry struct had an int in the middle of pointers and unsigned
longs, and the inline asm that generated the bug table entries didn't
insert the necessary padding, so the fields following it didn't get
initialized properly and an oops resulted.  This changes the int field
(the line number) to a long so that all the fields are the same size
and no padding is required.
Signed-off-by: NPaul Mackerras <paulus@samba.org>

89003ebf

[PATCH] powerpc: Merge bitops.h · a0e60b20

由 David Gibson 提交于 11月 01, 2005

Here's a revised version.  This re-introduces the set_bits() function
from ppc64, which I removed because I thought it was unused (it exists
on no other arch).  In fact it is used in the powermac interrupt code
(but not on pSeries).

- We use LARXL/STCXL macros to generate the right (32 or 64 bit)
  instructions, similar to LDL/STL from ppc_asm.h, used in fpu.S

- ppc32 previously used a full "sync" barrier at the end of
  test_and_*_bit(), whereas ppc64 used an "isync".  The merged version
  uses "isync", since I believe that's sufficient.

- The ppc64 versions of then minix_*() bitmap functions have changed
  semantics.  Previously on ppc64, these functions were big-endian
  (that is bit 0 was the LSB in the first 64-bit, big-endian word).
  On ppc32 (and x86, for that matter, they were little-endian.  As far
  as I can tell, the big-endian usage was simply wrong - I guess
  no-one ever tried to use minixfs on ppc64.

- On ppc32 find_next_bit() and find_next_zero_bit() are no longer
  inline (they were already out-of-line on ppc64).

- For ppc64, sched_find_first_bit() has moved from mmu_context.h to
  the merged bitops.  What it was doing in mmu_context.h in the first
  place, I have no idea.

- The fls() function is now implemented using the cntlzw instruction
  on ppc64, instead of generic_fls(), as it already was on ppc32.

- For ARCH=ppc, this patch requires adding arch/powerpc/lib to the
  arch/ppc/Makefile.  This in turn requires some changes to
  arch/powerpc/lib/Makefile which didn't correctly handle ARCH=ppc.

Built and running on G5.
Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

a0e60b20

[PATCH] powerpc: Merge ipcbuf.h · 031ef0a7

由 David Gibson 提交于 11月 01, 2005

This patch merges ppc32 and ppc64 versions of ipcbuf.h.  The merge is
essentially trivial, since the structure defined in each version was
already identical.  Only wrinkle is that the merged version now
includes linux/types.h in order to get the fixed width integer types.
In fact, the old versions probably should have been including that
anyway, since the file uses various __kernel_*_t types.

Built and booted on G5, built for 32-bit pmac, but not booted, since
the merge tree currently doesn't boot there.
Signed-off-by: NDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

031ef0a7

[PATCH] powerpc: move arch/ppc64/kernel/bpa* to arch/powerpc/platforms/cell · 811d4176