From: Christian Borntrdger <cborntra@de.ibm.com>
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
From: Thomas Spatzier <tspat@de.ibm.com>

s390 core changes:
 - Add default storage key and introduce page_{set,get}_storage_key.
 - Fix access to siginfo in copy_siginfo_from_user32.
 - Regenerate default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This one removes the other occurences of "°C"; fixes displayed fan speed so
that it uses the same scale than other occurences of this parameter instead
of RPM only; fixes the RPM reading of the fan so that it shows zero instead
of 82 when it is effectively stopped.
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

hugetblfs appears not to support the creation of files larger than 2GB. 
hugetlbfs_vmtruncate() checks against the s_maxbytes member of the super
block and returns EFBIG if the requested file size is too large.
Signed-off-by: Guy Cardwell <gcardwel@motorola.com>
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix warnings in kernel/power/console.c by only declaring orig_fgconsole
and orig_kmsg when required by SUSPEND_CONSOLE. Restore kmsg_redirect on
resume.
Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

request_region() returns NULL if failed.  The driver gets it wrong.
Signed-off-by: Li Shaohua <shaoh.li@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	i2o.h uses stuff defined in linux/dma-mapping.h but includes
asm/dma-mapping.h instead.  It works by accident on some platforms
(they end up pulling linux/dma-mapping.h from asm-generic/pci-dma-compat.h
before it hits the fan), but breaks on e.g. alpha.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch just cleans up the fact that all drm drivers include a
bunch of header files, it places them into one place (drm_core.h)
and uses that.

From: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

These are unused since the gamma driver was dropped, they 
cause problems with the via driver (coming soon).
Signed-off-by: Dave Airlie <airlied@linux.ie>

into intel.com:/home/lenb/src/26-latest-dev

This cleans the code up a bit, but mainly allows most functions
to be called externally when need (read: video driver) arises.

Signed-off-by: Karol Kozimor <sziwan@hell.org.pl

Signed-off-by: Karol Kozimor <sziwan@hell.org.pl

Signed-off-by: Karol Kozimor <sziwan@hell.org.pl>

Signed-off-by: Karol Kozimor <sziwan@hell.org.pl>

into intel.com:/home/lenb/src/26-latest-dev

http://bugzilla.kernel.org/show_bug.cgi?id=3231

by Christian Lupien
http://bugzilla.kernel.org/show_bug.cgi?id=3242

into intel.com:/home/lenb/src/26-latest-dev

into intel.com:/home/lenb/src/26-latest-dev

Signed-off-by: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>

into intel.com:/home/lenb/src/26-latest-dev

This adds iomem annotations, cleans up the code, fixes
an oops at unload time, and builds in the wireless
extensions that were not getting enabled due to an
obsolete CONFIG_NET_PCMCIA_RADIO test.

Tested by Jean Tourrilhes, who pointed out the wireless
extensions problem.

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

Start ecard_task at initialisation time.
Statically initialise ecard wait queue head.

We do not need to check which type of cache we have before
using using the Harvard or von Neumann cache instructions -
the unimplemented instructions are defined to be NOPs.

On Fri, 2004-10-08 at 15:37 +1000, Paul Mackerras wrote:
> This patch replaces cmp{,l}{,i} with cmp{,l}[wd]{,i} as appropriate.
> The original patch was from Segher Boessenkool, slightly modified by
> me. 

And also for ppc32 and arch/ppc64/kernel/ItLpQueue.c...
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There were a few places in assembly code in the ppc64 part of the
kernel where we were using the old forms of the compare instruction
(cmp, cmpi, cmpl, cmpli) which don't specify the operand size (word or
doubleword).  These have been accepted for a long time for backward
compatibility with the old POWER architecture (and defaulted to a
32-bit comparison) but are now being rejected by the latest versions
of binutils.  Some of them were actual bugs in that they were on
things which were actually 64-bit values such as pointers (not that
any of them actually caused a problem in practice).

This patch replaces cmp{,l}{,i} with cmp{,l}[wd]{,i} as appropriate.
The original patch was from Segher Boessenkool, slightly modified by
me.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alan Cox pointed out that the degree symbol in the thermal sensor proc
files that we have on ppc64 cause problems for people using other
locales or UTF-8.  This patch makes them disappear.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some stuffs in ppc_ksyms.c where still #ifdef CONFIG_PPC_PSERIES, which
is no longer set for PowerMac-only configs. Change them to depend on
CONFIG_PPC_MULTIPLATFORM for now. Later on, a bunch of these will be
just gone since those are mostly deprecated functions and I'll move the
exports close to the actual functions.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Currently hostfs passes the rdev value from stat() on the host as rdev
value to return to stat() on the guest; but we cannot pass rdev as is
because glibc and the kernel disagree about its definition.  So we must
decode it in a major/minor couple with glibc macros and re-encode it in
kernelspace code.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On 2.4 we used force_delete() to make sure inode were not cached, and we then
close the host file when the inode is cleared; when porting to 2.6 the
"force_delete" thing was dropped, and this patch adds a fix for this (by
setting drop_inode = generic_delete_inode).

Search for drop_inode in the 2.6 Documentation/filesystems/vfs.txt for info
about this.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Avoid compile failure due to the addition of sys_timer_create to
linux/syscalls.h
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Adds some more parenthesis for a macro arg to fix a warning (which was in
kernel/uid16.c).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When we don't know how to handle ptrace(2) calls, call the arch-independent
ptrace_request like i386 (and I guess other archs) do, instead of returning
-EIO.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Now that the PPC64 code supports more platforms than just pSeries and
iSeries, some p/i specific Kconfig options need to be updated accordingly.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>