please pull ppc64-2.6.git
Paul Mackerras
paulus at samba.org
Tue Aug 30 14:33:13 EST 2005
Linus Torvalds writes:
> I get tons of warnings like
>
> include/linux/hugetlb.h:104:1: warning: "hugetlb_free_pgd_range" redefined
> In file included from include/linux/mm.h:36,
> from drivers/base/node.c:8:
> include/asm/pgtable.h:492:1: warning: this is the location of the previous definition
>
> after merging this. The generic code expects ARCH_HAS_HUGEPAGE_ONLY_RANGE
> to go hand-in-hand with hugetlb_free_pgd_range().
Fixed, plus some more patches checked in. Please do another pull from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6.git
Notably, this starts the merge process between ppc32 and ppc64 by
creating an include/asm-powerpc directory and starting to move common
header files into there. We plan to create an arch/powerpc for the
common architecture and remove arch/ppc and arch/ppc64 (and
include/asm-ppc and include/asm-ppc64) once the merge is done.
Diffstat and log follow. (I don't know why diffstat does the b/ thing
some times and not other times; I guess it's to do with the moved
files. Is there a git command to get the diffstat other than doing
git-diff-tree -p OLD_HEAD HEAD | diffstat ?)
Paul.
b/arch/ppc/Makefile | 11 ++
b/arch/ppc64/Makefile | 9 ++
b/arch/ppc64/configs/g5_defconfig | 6 -
b/arch/ppc64/configs/iSeries_defconfig | 6 -
b/arch/ppc64/configs/maple_defconfig | 6 -
b/arch/ppc64/configs/pSeries_defconfig | 6 -
b/arch/ppc64/defconfig | 6 -
b/arch/ppc64/kernel/head.S | 16 +++-
b/arch/ppc64/kernel/iSeries_vio.c | 21 ++++-
b/arch/ppc64/kernel/lparcfg.c | 1
b/arch/ppc64/kernel/of_device.c | 2
b/arch/ppc64/kernel/pSeries_vio.c | 19 +++--
b/arch/ppc64/kernel/prom_init.c | 5 +
b/arch/ppc64/kernel/vio.c | 75 +++++++------------
b/arch/ppc64/mm/hash_low.S | 4 -
b/arch/ppc64/oprofile/common.c | 1
b/drivers/block/viodasd.c | 2
b/drivers/cdrom/viocd.c | 2
b/drivers/char/hvc_vio.c | 2
b/drivers/char/hvcs.c | 2
b/drivers/char/viotape.c | 2
b/drivers/net/ibmveth.c | 2
b/drivers/net/iseries_veth.c | 2
b/drivers/scsi/ibmvscsi/ibmvscsi.c | 2
b/drivers/scsi/ibmvscsi/rpa_vscsi.c | 1
b/include/asm-powerpc/8253pit.h | 10 ++
b/include/asm-powerpc/agp.h | 23 ++++++
b/include/asm-powerpc/cputime.h | 1
b/include/asm-powerpc/div64.h | 1
b/include/asm-powerpc/emergency-restart.h | 1
b/include/asm-powerpc/errno.h | 11 ++
b/include/asm-powerpc/ioctl.h | 69 ++++++++++++++++++
b/include/asm-powerpc/ioctls.h | 107 ++++++++++++++++++++++++++++
b/include/asm-powerpc/ipc.h | 1
b/include/asm-powerpc/linkage.h | 6 +
b/include/asm-powerpc/local.h | 1
b/include/asm-powerpc/namei.h | 20 +++++
b/include/asm-powerpc/percpu.h | 1
b/include/asm-powerpc/poll.h | 23 ++++++
b/include/asm-powerpc/resource.h | 1
b/include/asm-powerpc/shmparam.h | 6 +
b/include/asm-powerpc/string.h | 32 ++++++++
b/include/asm-powerpc/unaligned.h | 18 ++++
b/include/asm-powerpc/xor.h | 1
b/include/asm-ppc64/param.h | 4 -
b/include/asm-ppc64/pgtable.h | 2
b/include/asm-ppc64/processor.h | 1
b/include/asm-ppc64/vio.h | 101 ++++++++++++--------------
b/include/linux/mod_devicetable.h | 7 +
b/scripts/mod/file2alias.c | 19 +++++
include/asm-ppc/8253pit.h | 10 --
include/asm-ppc/agp.h | 23 ------
include/asm-ppc/cputime.h | 6 -
include/asm-ppc/div64.h | 1
include/asm-ppc/emergency-restart.h | 6 -
include/asm-ppc/errno.h | 11 --
include/asm-ppc/hdreg.h | 1
include/asm-ppc/ioctl.h | 69 ------------------
include/asm-ppc/ioctls.h | 107 ----------------------------
include/asm-ppc/ipc.h | 1
include/asm-ppc/linkage.h | 6 -
include/asm-ppc/local.h | 6 -
include/asm-ppc/namei.h | 20 -----
include/asm-ppc/percpu.h | 6 -
include/asm-ppc/poll.h | 23 ------
include/asm-ppc/resource.h | 6 -
include/asm-ppc/shmparam.h | 6 -
include/asm-ppc/string.h | 32 --------
include/asm-ppc/unaligned.h | 18 ----
include/asm-ppc/xor.h | 1
include/asm-ppc64/8253pit.h | 10 --
include/asm-ppc64/agp.h | 23 ------
include/asm-ppc64/cputime.h | 6 -
include/asm-ppc64/div64.h | 1
include/asm-ppc64/emergency-restart.h | 6 -
include/asm-ppc64/errno.h | 18 ----
include/asm-ppc64/hdreg.h | 1
include/asm-ppc64/ioctl.h | 74 -------------------
include/asm-ppc64/ioctls.h | 114 ------------------------------
include/asm-ppc64/ipc.h | 1
include/asm-ppc64/linkage.h | 6 -
include/asm-ppc64/local.h | 1
include/asm-ppc64/namei.h | 23 ------
include/asm-ppc64/percpu.h | 6 -
include/asm-ppc64/poll.h | 32 --------
include/asm-ppc64/resource.h | 6 -
include/asm-ppc64/shmparam.h | 13 ---
include/asm-ppc64/string.h | 35 ---------
include/asm-ppc64/unaligned.h | 21 -----
include/asm-ppc64/xor.h | 1
90 files changed, 533 insertions(+), 902 deletions(-)
commit 8913ca1c9ccb5eb6471afd419159729eef6e2730
Author: David Gibson <david at gibson.dropbear.id.au>
Date: Wed Jul 27 15:47:23 2005 +1000
[PATCH] Remove nested feature sections
The {BEGIN,END}_FTR_SECTION asm macros used in ppc64 to nop out
sections of code at runtime cannot be nested. However, we do nest
them in hash_low.S. We get away with it there, because there is
nothing between the BEGIN markers for each section. However, that's
confusing to someone reading the code.
This patch removes the nested ifset and ifclr feature sections,
replacing them with a single feature section in the full mask/value
form.
Signed-off-by: David Gibson <dwg at au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 597f95e2bfbe9b83ed8b0761ebf4e7d55fd4df17
Author: Joel Schopp <jschopp at austin.ibm.com>
Date: Fri Aug 12 14:34:58 2005 -0500
[PATCH] ppc64: lparconfig.c memory leak
This patch fixes a rare memory leak found by Coverity.
Signed-off-by: Joel Schopp <jschopp at austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5ff98ae18bec792d77bfea801aa4b3385b98b355
Author: Joel Schopp <jschopp at austin.ibm.com>
Date: Thu Aug 11 17:39:28 2005 -0500
[PATCH] ppc64: of_device.c remove useless code
Coverity found more unused code.
Signed-off-by: Joel Schopp <jschopp at austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 717522ff44f1fbee5ea09e83d7cd4b5c956e30f9
Author: Anton Blanchard <anton at samba.org>
Date: Wed Aug 24 08:53:03 2005 +1000
[PATCH] ppc64: Add CONFIG_HZ
While ppc64 has the CONFIG_HZ Kconfig option, it wasnt actually being
used. Connect it up and set all platforms to 250Hz.
Signed-off-by: Anton Blanchard <anton at samba.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 04ed65190a5d1562220dd3a7fc9eac2402c7104c
Author: Jake Moilanen <moilanen at austin.ibm.com>
Date: Wed Aug 24 15:22:12 2005 -0500
[PATCH] oprofile PVR 970MP
Here's the 970MP's PVR (processor version register) entry for oprofile.
Signed-off-by: Jake Moilanen <moilanen at austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 7fea82ab1a74030f79a2adfac1af3d93b8638fc3
Author: Olof Johansson <olof at lixom.net>
Date: Sun Aug 28 21:42:10 2005 -0500
[PATCH] PPC64: Don't try to claim memory from OF at 1GB mark
Some RS64-based machines (p620, F80, others) have problems with firmware
returning 0xdeadbeef instead of failure to allocations that end at the
1GB mark.
We have two options:
1. Detect the undocumented 0xdeadbeef return value and interpret it as
a failure.
2. Avoid allocating that high.
(2) is really the cleaner solution here. 768MB is plenty of room so use
that as the max alloc_top instead of 1GB.
Signed-off-by: Olof Johansson <olof at lixom.net>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 6f9aa727433fe7647869c9b64ce2f7b5feac0052
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon Aug 29 14:08:11 2005 +1000
[PATCH] Move all the very similar files to asm-powerpc
They differed in either simple comments or in the protecting ifdefs.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 88999ceb55bf959e63df0c911915166b005977fc
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon Aug 29 14:06:56 2005 +1000
[PATCH] Move the identical files from include/asm-ppc{,64}
Move the identical files from include/asm-ppc{,64}/ to
include/asm-powerpc/. Remove hdreg.h completely as it is unused in
the tree.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 45e2a6e4e5e22acd4321f69e84b726c2a568dacf
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon Aug 29 13:15:50 2005 +1000
[PATCH] Create include/asm-powerpc
The ppc and ppc64 trees are hopefully going to merge over time, so this
patch begins the process by creating a place for the merging of the
header files.
Create include/asm-powerpc (and move linkage.h into it from
asm-{ppc,ppc64} since we don't like empty directories). Modify the
ppc and ppc64 Makefiles to cope.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit fb120da678c517f72d4b39932062c2191827b331
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed Aug 17 16:42:59 2005 +1000
[PATCH] Make MODULE_DEVICE_TABLE work for vio devices
Make MODULE_DEVICE_TABLE work for vio devices.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 71d276d751ff5ddba28312aecefb174b20a5b970
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed Aug 17 16:41:44 2005 +1000
[PATCH] Create vio_bus_ops
Create vio_bus_ops so that we just pass a structure to vio_bus_init
instead of three separate function pointers.
Rearrange vio.h to avoid forward references. vio.h only needs
struct device_node from prom.h so remove the include and just
declare it.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit b877b90f227fb9698d99fb70492d432362584082
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed Aug 17 16:40:12 2005 +1000
[PATCH] Create vio_register_device
Take some assignments out of vio_register_device_common and
rename it to vio_register_device.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5c0b4b8759f78c31172088a91e10733fc014ccee
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed Aug 17 16:37:35 2005 +1000
[PATCH] Formatting changes to vio.c
Formatting changes to vio.c to bring it closer to the
kernel coding standard.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 1e4a79e0458beca871c662028610ae3a88e3f1bf
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon Aug 29 18:26:01 2005 +1000
[PATCH] fix iSeries build for gcc-3.4
gcc 3.4 (at least the build we are using) puts the gcc generated .ident
string into a .note section at the end of the files it compiles (gcc
3.3.3-hammer and gcc 4.0.2 Debian puts it in the .text section). This
means that the lparmap.s file we produce in the iSeries build may end with
a .note section. When we include it into head.S, the assembler can no
longer resolve some of the conditional branches since the target label
ends up too far away. This patch just forces us back to the .text section
after including lparmap.s.
The breakage was caused by my patch "iSeries build with newer assemblers
and compilers" (sha1-id: 2ad56496627630ebc99f06af5f81ca23e17e014e).
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 2739e8cf113ce6e931608986a28bab5a42c0acd9
Author: David Gibson <david at gibson.dropbear.id.au>
Date: Tue Aug 30 12:54:07 2005 +1000
[PATCH] Restore lparmap.s include for iSeries
A mistake rebasing the series of ppc64 head.S cleanup patches meant
the #include of lparmap.s, needed for iSeries was lost. This patch
puts it back again.
Signed-off-by: David Gibson <dwg at au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit b74d0bd53406c23636707565d87ddaa55d315b26
Author: Andrew Morton <akpm at osdl.org>
Date: Wed Aug 10 13:53:41 2005 +1000
[PATCH] ppc64: four level pagetables fix
With CONFIG_HUGETLB_PAGE=n:
In file included from kernel/sysctl.c:37:
include/linux/hugetlb.h:104:1: warning: "hugetlb_free_pgd_range" redefined
In file included from include/linux/mm.h:36,
from kernel/sysctl.c:23:
include/asm/pgtable.h:492:1: warning: this is the location of the previous definition
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: David Gibson <dwg at au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
More information about the Linuxppc64-dev
mailing list