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

Patch from Robin Farine

Fix the xscale cache handling routines that were invalidating a D 
cache line instead of draining the write & fill buffer as intended.

Patch from Catalin Marinas

Unlike the v5 architecture, the ARM1136 requires that BIT4 is 0 in
the first level page descriptor (ARM1136 TRM, page 6-39). It works
at the moment but it might break future v6 cores.

Patch from Catalin Marinas

The v6_dma_invalidate_range - the "mcr" instruction for draining

the write buffer requires r0 == 0. A "cmp" instruction for

testing the end address is missing in the v6_dma_flush_range

function.

Patch from Catalin Marinas

The _raw_write_(try)lock functions in include/asm-arm/spinlock.h

should use the early clobber modifier (&) for the "tmp" register.

A newer compiler (gcc-3.4.0) generates an "strexeq %0, %1, [%2]"

instruction where %0 is the same as %2, which is illegal.

Patch from Catalin Marinas

In the blockops_check() function, cache_type is uninitialised

because an "mcr" instruction is used instead of "mrc".

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

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

This fixes the problem with recursion into filesystem when inode of
quota file needs a page + some other allocation problems.  I hope I got
the GFP mask setting right..

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

* now that ATAPI is close to working, making ATAPI DMA interrupts
  in ata_host_intr
* remove unnecessary space character in printk() output (oh, the horror)

Remove unused 'done_late' arg to ata_qc_complete(), which was never
useful in 2.4, and never used at all in 2.6.

This allows us to eliminate the same arg from ata_dma_complete(),
and also make it more correct by passing the command rather than
the ATA port structure as arg0.

into redhat.com:/spare/repo/libata-2.6

We need to always allocate at least one indirect block
pointer, since we always fill out blocks[0] even if
we don't have any groups.

Trivia.

CMD640 driver doesn't use generic IDE PCI code (it doesn't even include
this header).

- many Maxtor disks incorrectly claim CACHE FLUSH EXT command support,
  fix it by checking both CACHE FLUSH EXT command and LBA48 support
  (thanks to Eric D. Mudama for help in fixing this)

- write_cache() was called with 'drive->id->cfs_enable_2 & 0x3000' as 'int arg'
  argument which was always truncated to zero due to 'u8 drive->wcache = arg'
  assignment so write cache was indeed enabled but drive->wcache was zero
  (thanks to Rene Herman for help in debugging this)

- flush cache in idedisk_start_power_step() only if ATA-6 CACHE FLUSH (EXT)
  bits are present in disk's identify data (prevents sending unknown commands)

- set drive->wcache in idedisk_setup() not idedisk_attach() (no need to check
  id->command_set_2 - we check id->cfs_enable_2 instead in write_cache() call)

- use ide_cacheflush_p() in idedisk_setup()

- minor cleanups

This code is shared between i386 and x86-64, and x86-64 needs to check
for empty nodes here.  Otherwise you can get oopses at boot in some
circumstances. 

This handles empty nodes != 0; empty node zero are still broken in other
ways.

This changes the /dev/mem caching behaviour on x86-64 to be compatible
with i386.

By default everything is set cached.

This actually makes WC MTRRs on AMD systems work, which would get
overriden by the UC PAT bits that were set earlier.  This can make DVD
decoding with hardware support a lot faster. 

It also supports O_SYNC now, like i386, although that is not really
safe, because it allows the user to create undefined cache attribute
conflicts that can corrupt caches in some circumstances.  I kept it for
now.  Better would to disallow it, until Terrence Ripperda's PAT
framework is getting merged, that can avoid these problems. 

Actually it would be probably a good idea to add a printk here to catch
broken programs for i386 and x86-64, but that is for another patch.

Various accumulated x86-64 patches and bug fixes.

It fixes one nasty bug that has been there since NX is used by 
default in the kernel. With heavy AGP memory allocation it would
set NX on parts of the kernel mapping in some corner cases, which gave
endless crash loops. Thanks goes to some wizards in AMD debug labs
for getting a trace out of this.

Also various other fixes. This patches only changes x86-64 specific
files, i have some changes outside too that I am sending separately.

 - Fix help test for CONFIG_NUMA
 - Don't enable SMT nice on CMP
 - Move HT and MWAIT checks up to generic code
 - Update defconfig
 - Remove duplicated includes (Arthur Othieno)
 - Set up GSI entry for ACPI SCI correctly (from i386)
 - Fix some comments
 - Fix threadinfo printing in oopses
 - Set task alignment to 16 bytes
 - Handle NX bit for code pages correctly in change_page_attr()
 - Use generic nops for non amd specific kernel
 - Add __KERNEL__ checks in unistd.h (David Lee)

Uncovered by recent cleanup of "dev_dbg()".

Stomp a C99ism.

Initialise the semaphore even if !MODULE

These (unused) arrays are causing huge stack utilisation when instantiated in
an auto variable.  Remove them for now.

From: Michael Buesch <mbuesch@freenet.de>

- BUG_ON() conversion

- Remove redundant dump_stack() (BUG already does that)

From: Olaf Kirch <okir@suse.de>

Authentication code in net/sunrpc makes frequent use of groups_alloc(0),
which seems to clobber memory past the end of what it allocated.

If called with gidsetsize == 0, groups_alloc will set nblocks = 0,
but still does a

	group_info->blocks[0] = group_info->small_block;

From: "Uwe Bugla" <uwe.bugla@gmx.de>

Fix up a mistake in the 2.4->2.6 forward-port of this driver.

From: Bart Samwel <bart@samwel.tk>

The attached patch is the outcome of a discussion with Nathan.

When laptop mode is active, there is no need for XFS to wake up xfsbufd (the
daemon that flushes buffers that are too old) too often.  The default is once
every second, this patch makes laptop mode do it once every 30 seconds.

From: Bart Samwel <bart@samwel.tk>

XFS now uses
	/proc/sys/fs/xfs/xfssyncd_centisecs
	/proc/sys/fs/xfs/xfsbufd_centisecs
	/proc/sys/fs/xfs/age_buffer_centisecs

Here's a patch to support these values in the laptop mode control script.

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

Now that everybody has acpi_gsi_to_irq(), we can nuke the deprecated
acpi_irq_to_vector().  No references remain.

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

floppy_debugt.patch: better use of the debugt functions.

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

Adds a better audit for floppy_init().  Fixes one real bug (in calling
blk_queue_max_sectors()).

From: <bart@samwel.tk>

XFS needs `laptop_mode'.

From: Paul Mundt <lethal@linux-sh.org>

The old drivers/char sh-sci driver is no long used by anyone, both sh and
h8300 are using the drivers/serial version at this point, so we can get rid
of the old one entirely.

From: Andi Kleen <ak@muc.de>

*** Warning: "memcmp" [drivers/atm/zatm.ko] undefined!

gcc 3.4 specific problem.  This patch should fix it.  Actually it would be
better to move all these EXPORT_SYMBOLs into lib/string.c, it is silly that
each arch has to duplicate all that.

From: Christoph Hellwig <hch@lst.de>

Someone blindly added sysfs support to the driver long time ago without
understanding the implications (and if they were understood the driver
would need half a rewrite for it).  Herber Xu recently noticed the problems
this causes on unload, so let's if 0 out all that code and get the driver
working again.

It's silly that writing to /proc/sysrq-trigger does nothing if you haven't
enabled /proc/sys/kernel/sysrq.  So provide a new __handle_sysrq() which
ignores the sysrq_enabled check.

The patch also withdraws __handle_sysrq_nolock() from the kernel API.  It had
no callers.

arch/x86_64/kernel/msr.c:1:10: warning: extra tokens at end of #ident directive

From: Adrian Bunk <bunk@fs.tum.de>

drivers/scsi/aic7xxx_old.c: In function `aic7xxx_release':
drivers/scsi/aic7xxx_old.c:10971: warning: implicit declaration of function `pci_release_regions'

From: Adrian Bunk <bunk@fs.tum.de>

drivers/net/tlan.c: In function `tlan_remove_one':
drivers/net/tlan.c:449: warning: implicit declaration of function `pci_release_regions'