This avoids warnings about unused variables.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into redhat.com:/spare/repo/i810-audio-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

x86_64 has an incorrect ffs() implementation.  The asm uses "g" instead
of "rm" for the bsfl instruction.  (This was spotted by Yuri Per.)

bsfl does not accept constant values but only memory or register ones.
On i386 the correct "rm" is used.

This causes NTFS build to fail as gcc optimizes a variable into a
constant and ffs() then fails to assemble.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into kernel.bkbits.net:/home/davem/net-2.6

this trivial fix makes the AVM B1 PCMCIA cards work with 2.6

This adds links to the driver and device inside /sys/class/net/ethX for
PowerPC Virtual Ethernet devices.

This fixes a bug where different partitions were assigned the same MAC
address.  Also, according to Anton, gcc 3.5 didn't like our mac_addr_p
gymnastics, so this ends up fixing that as well.

This patch fixes SMP boot on Apple Xserve G5

From: Stephen Rothwell <sfr@canb.auug.org.au>

It is possible to attach a virtual disk to a logical partition on an iSeries
machine so that it is read only to the partition.  This patch allows Linux to
use such virtual disks.

From: Paul Mackerras <paulus@samba.org>

After I sent the recent patch to include/asm-ppc64/io.h which put stronger
barriers in the I/O accessor macros, Paul McKenney pointed out to me that a
writex/outx could still slide out from inside a spinlocked region.  This patch
makes the barriers a bit stronger so that this can't happen.  It means that we
need to use a sync instruction for wmb (a full "heavyweight" sync), since
drivers rely on wmb for ordering between writes to system memory and writes to
a device.

I have left smb_wmb() as a lighter-weight barrier that orders stores, and
doesn't impose an ordering between cacheable and non-cacheable accesses (the
amusingly-named eieio instruction).  I am assuming here that smp_wmb is only
used for ordering stores to system memory so that another cpu will see them in
order.  It can't be used for enforcing any ordering that a device will see,
because it is just a gcc barrier on UP.

This also changes the spinlock/rwlock unlock code to use lwsync ("light-weight
sync") rather than eieio, since eieio doesn't order loads, and we need to
ensure that loads stay inside the spinlocked region.

From: Paul Mackerras <paulus@samba.org>

When I sent the patch to uninline the spinlocks, I inadvertently left out
the change to arch/ppc64/Kconfig which defines the config symbol for
inlining the locks (CONFIG_SPINLINE now).  This patch adds it.  It also
adds a symbol CONFIG_PPC_SPLPAR which enables the code for calling the
hypervisor on shared-processor logically-partitioned system to yield the
physical processor to the lock holder when spinning.  (The code that
depends on this symbol is already present in arch/ppc64/lib/locks.c.)

From: Anton Blanchard <anton@samba.org>

It turns out we do avoid irq recursion on iseries so remove the workaround.

From: Anton Blanchard <anton@samba.org>

We check nvram_fetch/nvram_store against -1, so better not make these
unsigned.

From: Anton Blanchard <anton@samba.org>

Based on feedback from the hardware guys align jiffies and tb_last_stamp.
We update both regularly and there are other read only, heavily accessed
things that share those cachelines.

From: Anton Blanchard <anton@samba.org>

We need to set MSR_RI in iseries exception prolog.

From: Anton Blanchard <anton@samba.org>

We were allocating radix tree nodes in the interrupt code with GFP_KERNEL
under a spinlock.  Change it to GFP_ATOMIC.

From: Paul Mackerras <paulus@samba.org>

The patch below moves some declarations from C files into the appropriate
header file in include/asm-ppc (and removes an unused local variable in a
function).

From: Paul Mackerras <paulus@samba.org>

Matt Porter's recent changes broke the compile for non-4xx ppc32 systems,
unfortunately.  I get an error that mfdcr is not defined in
include/asm-ppc/ocp.h when compiling for powermac (reasonable, since the
mfdcr instruction only exists on 4xx processors).  The patch below fixes
it.

From: Matt Porter <mporter@kernel.crashing.org>

Merge all current PPC44x ports against new OCP.

From: Matt Porter <mporter@kernel.crashing.org>

Merge all current PPC40x ports against new OCP.

From: Matt Porter <mporter@kernel.crashing.org>

Update all current 4xx defconfigs for new OCP.

From: Matt Porter <mporter@kernel.crashing.org>

Merge misc.  4xx core fixes and support for the new cascade scheme in the
440gx.

From: Matt Porter <mporter@kernel.crashing.org>

Merge PPC4xx-specific OCP support for new OCP core.

From: Matt Porter <mporter@kernel.crashing.org>

Merge PPC44x library support against new OCP.

From: Matt Porter <mporter@kernel.crashing.org>

Merge Bubinga/405EP support against new OCP.

From: Matt Porter <mporter@kernel.crashing.org>

New OCP infrastructure ported from 2.4 along with several enhancements. 
Updated patch with comments from hch and Valdis.

From: Matt Porter <mporter@kernel.crashing.org>

Adds general Book E machine check exception support and PPC44x-specific
machine check exception implementation.

From: Matt Porter <mporter@kernel.crashing.org>

Adds general Book E debug exception support and PPC44x-specific debug
exception implementation.

From: Matt Porter <mporter@kernel.crashing.org>

This patch fixes the condition where prefetching cache lines beyond a
buffer can cause data corruption on non cache coherent PPCs.  It is a port
of the version that went into 2.4.  From Eugene Surovegin
<ebs@ebshome.net>.

From: Matt Porter <mporter@kernel.crashing.org>

This patch implements/uses __flush_dcache_icache_page() which kmaps on a
Book E part, but keeps the existing behavior on other PowerPCs which can
disable the MMU.

From: Olaf Hering <olh@suse.de>

ext3 as module is not possible in 2.6.6, clear_pages, called from clear_page,
is not exported.

Also, unexport clear_page(), which is an inline.

Jorn Engel <joern@wohnheim.fh-wedel.de>

inode->i_flags should never contain fs-specific flags.  In fact, it doesn't;
the checks against it cause "chattr +T" to be useless for ext[23].  Same bug
was in befs as well.

From: "Sergey S. Kostyliov" <rathamahata@php4.ru>

Acked by Will Dyson.