From: James Bottomley <James.Bottomley@SteelEye.com>

pci_dev.consistent_dma_mask was introduced to get around problems in the
IA64 Altix machine.

Now, we have a use for it in x86: the aacraid needs coherent memory in a
31 bit address range (2GB).  Unfortunately, x86 is converted to the dma
model, so it can't see the pci_dev by the time coherent memory is
allocated.

The solution to all of this is to move pci_dev.consistent_dma_mask to
dev.coherent_dma_mask and make x86 use it in the dma_alloc_coherent()
calls.

This should allow me to make the aacraid set the coherent mask instead
of using it's current dma_mask juggling.

Updates for 2.6.4 for PARISC:

 - defconfigs (Randolph Chung)
 - copyright updates (Grant Grundler)
 - Fix DOS hole in sys_clone (James Bottomley)
 - missing hardware ID (Andy Walker)
 - disable interrupts during cache-flushes (LaMont Jones)
 - Fix crash on machines with <256MB ram (Randolph Chung)
 - Make SuckyIO IDE work better (Randolph Chung)
 - Align data_start so the extable is writable (Randolph Chung)
 - Extensive rewrite of virtual merging code (James Bottomley)
 - Fix EISA, non-PCI module builds (Matthew Wilcox)
 - Fix Elroy PCI config space byte & word writes (Grant Grundler)
 - Eliminate a warning in parport_gsc (Helge Deller)
 - Fix endian problem with ide mmio macros (Randolph Chung)
 - Delete asm/keyboard.h (Matthew Wilcox)
 - Delete asm/md.h (Grant Grundler)
 - Eliminate a warning in ALSA harmony (Matthew Wilcox)

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

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

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

drivers/scsi/sata_vsc.c: In function `vsc_sata_interrupt':
include/linux/libata.h:414: sorry, unimplemented: inlining failed in call to 'ata_host_intr': function body not available
drivers/scsi/sata_vsc.c:187: sorry, unimplemented: called from here

From: Rusty Russell <rusty@rustcorp.com.au>

From: Andrea Arcangeli <andrea@suse.de>

We should drop module sem before calling mod->exit, for practical reasons:
too many module exit functions oops or hang, resulting in a permenantly held
module sem, which blocks all module ops including lsmod.

From: "David S. Miller" <davem@redhat.com>

Currently, for an existing DMA mapping, there is a way to transfer buffer
ownership back to the cpu, yet there is no way to give it back to the device
again explicitly.  The latter really is needed on platforms where the PCI
subsystem does not snoop the cpu caches, MIPS is one example.

Many drivers were expecting the existing DMA sync interface to handle both
directions, which was wrong.

Now, with this change, we have explicit interfaces for DMA syncing to/from
the device and the cpu.

This simply throws out the 53c700 driver's optimistic setting of the
best possible transport parameters and replaces it with DV
determination.  It also adds a missing report_bus_reset() callback and
finally does a delayed DV on device errors.

ALSA Core
fixed the wrong release of id proc file.

ALSA Core
added the new magic numbers for atiixp and au88x0 drivers.

Documentation,PCI drivers,Intel8x0-modem driver
added Intel-compatible onboard MC97 modem driver
by Sasha Khapyorsky <sashak@smlink.com>

Documentation,PCI drivers,ATIIXP driver
added snd-atiixp driver for the ATI IXP150/200/250 AC97 controllers.

MIXART driver
fixed the compile warning.

EMU10K1/EMU10K2 driver
disabled Dell OEM Emu10k1x from the pci id list.
the board isn't compatible with the normal emu10k1.

au88x0 driver
removed EXPORT_NO_SYMBOLS.

PPC Tumbler driver
fixed the info callback of mixer input source (for enum type).

USB generic driver
added fix and workaround for the mixer problem on SB Extigy.

Documentation
fixed the files to include.

Documentation
changed the description of the buffer allocation routines
for the new designed functions.

PPC Tumbler driver
added input source switch to select mic/line-in.

Documentation,PCI drivers,au88x0 driver
added the au88x0 drivers for Aureal soundcards by Manuel Jander <mjander@embedded.cl>

VIA82xx driver
patch was applied wrongly.  fixed the rate restriction of spdif output
again.

DT019x driver
Fixed warnings

VIA82xx driver
restrict the PCM sample rates to 32, 44.1 and 48kHz when the SPDIF
switch is on.

USB generic driver
prevent twenty-seconds wait when unplugging USB MIDI device with a port subscription

USB generic driver
show one decimal place of momentary frequency in proc file

USB generic driver
use MIN_PACKS_URB as lower bound for nrpacks parameter

ALSA sequencer,ALSA<-OSS sequencer
use wrapper function for DELETE_PORT ioctl calls

ALSA sequencer
remove superfluous call to snd_seq_event_port_detach

into suse.cz:/home/perex/bk/linux-sound/linux-sound

From: Andi Kleen <ak@suse.de>

This patch has been in the SuSE 2.4 kernel forever, but for some reason
never made it mainline.

It works around the infamous "only works stable when a mouse is plugged in"
problem some AMD 768MPX Dual Athlon chipsets have.  The problem happens
because the chipset can hang when PCI prefetch strides from a RAM page into
the VGA text buffer.  When a PS2 mouse is plugged in the BIOS reserves a
page before the VGA text buffer, which stops the prefetch early.

This patch always reserves this page when the chipset could be AMD768MPX.
This can be only done early in bootmem setup.  Because it's difficult to
scan the PCI bus that early it just always reserves this page when the CPU
is an Athlon.  Normally it should not make a difference because the BIOS
will have reserved that page anyways when a PS/2 mouse is plugged in.

From: NeilBrown <neilb@cse.unsw.edu.au>

kernel parameters:

   raid=partitionable
     will make all auto-detected md arrays partitionable

   md=d....
     will assemble an array as a partitionable array.

From: NeilBrown <neilb@cse.unsw.edu.au>

Use "shedule_timeout()" instead of yield() as it seems to wait for less
time.

From: Rusty Russell <rusty@rustcorp.com.au>

Make it clear that the reason we do wait_task_inactive is because
kthread_bind frobs with k->thread_info->cpu, which is only legal because
the task is definitely not running.

We can't use the normal migration thread code here, because it doesn't let
us bind to cpus which are offline yet, and also because we use this to
start the migration threads themselves.

From: Arnd Bergmann <arnd@arndb.de>

Dave Jones already removed some of the useless __KERNEL_SYSCALLS__ defines
in various files, this gets rid of almost all the others.  Replacing
execve() is nontrivial, so I left those in for now.

For all the other system calls that are currently used from inside the
kernel, calling the sys_* function directly should always have an identical
effect.

From: Anton Blanchard <anton@samba.org>

Distribute boot time memory allocations across all nodes, from Manfred
Spraul.

We want to spread memory across nodes to avoid all allocations ending
up on node 0.

Spreading boot time allocations around also helps us to avoid node 0
becoming the hot node.

I took it for a spin:

buddyinfo before:
Node 7, 0    2    1    1    0    2    1    2    1    2    1    2    741
Node 6, 0    0    0    2    0    2    1    1    2    2    2    2   1002
Node 5, 0    0    0    2    0    2    1    2    1    2    2    2   2006
Node 4, 0    0    0    2    0    2    1    2    1    2    2    2   2006
Node 3, 0    0    0    2    0    2    1    2    1    2    2    2   2006
Node 2, 0    0    0    2    0    2    1    2    1    2    2    2   2006
Node 1, 0    0    0    2    0    2    1    1    2    2    2    2   1002
Node 0, 0    0   38    7    0    1    1    1    0    0    0    0   1998

buddyinfo after:
Node 7, 0    1    0    1    1    1    1    0    0    0    1    2    738
Node 6, 0    1    0    1    1    1    0    1    0    0    2    2   1002
Node 5, 0    0    0    1    1    1    1    0    0    0    2    2   2006
Node 4, 0    1    0    1    0    1    1    0    0    0    2    2   2006
Node 3, 0    0    0    1    0    1    1    0    0    0    2    2   2005
Node 2, 0    1    0    0    0    0    0    1    0    0    2    2   2006
Node 1, 0    2    1    1    0    1    1    1    0    0    2    2   1002
Node 0, 0   20   45    8    3    0    1    1    1    1    0    1   2004

Change in free memory due to patch:

Node 7 -54.08 MB
Node 6  -6.33 MB
Node 5  -6.09 MB
Node 4  -6.14 MB
Node 3 -22.15 MB
Node 2  -6.05 MB
Node 1  -6.12 MB
Node 0 107.35 MB

As you can see we gained over 100MB on node 0.

From: Kingsley Cheung <kingsley@aurema.com>

A number of scheduler counters wrap around after 47 days.  The context-switch
counter can wrap around after considerably less time.

Convert them to 64-bit values.

From: Anton Blanchard <anton@samba.org>

The recent NUMA changes fail to compile with large cpumasks, we need to use
a temporary to get around the type checking.

Remove unnecessary initialization in notifier_block