From: Dave Boutcher <sleddog@us.ibm.com>

fix naming collision with asm-ppc64/vio.h. The define would be set there and
this file would not get pulled in.

From: Olaf Hering <olh@suse.de>

Fix for valid nvram rtas tokens.

From: Jake Moilanen <moilanen@austin.ibm.com>

Add 970FX entry into the cputable.

From: Anton Blanchard <anton@samba.org>

Be like x86 and enable -funit-at-a-time.
Use the check_gcc hook when enabling -mcpu=power4/-mtune=power4.

From: Anton Blanchard <anton@samba.org>

Add DEBUG_STACK_USAGE to ppc64

From: Anton Blanchard <anton@samba.org

print useful flags in oops, like x86

From: Jeremy Kerr <jk@ozlabs.org>

Add a ppc64 archhelp.

From: Dave Hansen <haveblue@us.ibm.com>

Allow CROSS32_COMPILE to be set via environment variable

From: Nathan Fontenot <nfont@austin.ibm.com>

Add log_rtas_error(), to be called in the event that a rtas call
returns a hardware error (-1) so we can log additional information
about the hardware error.

From: Nathan Fontenot <nfont@austin.ibm.com>

Add call to rtas to retrieve slot-error-detail information and
log this data to nvram in an EEH event.

From: Anton Blanchard <anton@samba.org>

Fix for ppc64 SMT enablement bug provided by Jimi Xenidis and Michael Day

From: Anton Blanchard <anton@samba.org>

Remove duplicate pcibios_scan_all_fns definition

From: Anton Blanchard <anton@samba.org>

This appeared in the ia64 port and sounds like a good idea. Potentially
avoid an atomic operation in switch_mm.

From: Anton Blanchard <anton@samba.org>

- remove LMB_MEMORY_AREA, LMB_IO_AREA, we only allocate/reserve memory
  areas now
- remove lmb_property->type, lmb_region->iosize, lmb_region->lcd_size,
  no longer used
- bump number of regions to 128, we'll hit this limit sooner or later
  with our big boxes (if we have more than 64 PCI host bridges the
  reserved array will fill up for example)
- make all the lmb stuff __init
- no need to explicitly zero struct lmb lmb now we zero the BSS early
- we had two functions to dump the lmb array, kill one of them
- move the inline functions into lmb.c, they are only ever called from
  there

From: Anton Blanchard <anton@samba.org>

There is a prototype for dump_regs on ppc32 and ppc64 but its never
defined.  Remove it since it conflicts with something in
drivers/atm/horizon.c.

Also clean up ppc64 system.h a bit to match the ppc32 version.

This sounds like a good moment to come with this patch.

This is essentially a five-year-old patch by Bruno Haible.  It
introduces utf8 mode, and the effect it has on erasing input characters.

(Side note - without stty support, this is not very useful, but now
the infrastructure is in place)

	We never use CONFIG_BINFTM_ELF and CONFIG_BINFMT_ELF_MODULE
anywhere in the source (they are used in makefiles, obviously).
32bit-emulation binfmt_elf_... in arch/* still define those guys
even though it hadn't been needed for years.

	Junk removed.

PS: BTW, CONFIG_BINFMT_ELF32 _is_ used in several places in arch/mips and it
looks like they really want
#if defined(CONFIG_BINFMT_ELF32) || defined(CONFIG_BINFMT_ELF32_MODULE)
in these ifdefs, but that's a separate story...

I was modifying mkfs.xfs to use O_EXCL for 2.6, and hit a snag.
It seems that once I've opened a block dev with O_EXCL I can no
longer issue the BLKBSZSET ioctl to it.

Making this change, the ioctl succeeds cos the original filp bdev owner
from open now matches with the owner in the ioctl call.

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

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

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

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

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

- The do_shmat() stub needs `static inline', not `inline'

- We need errno.h for ENOSYS.

1) Take into account the fact that struct sk_buff, which counts towards
   socket buffer limits, changes across different platforms.
2) Give ipv4/ipv6 ICMP sockets more accurately the wmem limits they
   want.

This renames sys_shmat to do_shmat.  Additionally, I've replaced the
cond_syscall with a conditional inline function.

It touches all archs - only i386 is tested.

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

into nuts.davemloft.net:/disk1/BK/sparc-2.6

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