Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Liam Girdwood

This patch allows the PXA SSP port configuration to be changed without
the need to close the port.

Signed-off-by: Liam Girdwood
Signed-off-by: Russell King

This changes kernel domains to use domain 0 rather than domain 1,
in preparation to supporting supersection mappings.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Liam Girdwood

This patch adds the PXA27x SSP port 3 configuration register space (Phys
0x41900000) to the kernel memory table.

Signed-off-by: Liam Girdwood
Signed-off-by: Russell King

Fix a 4-level page table bug that slipped through (introduced by me,
not Andi).

Compiles and boots on ia64 and 2-level i386.
Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Pretty much all the TF-related comments were stale, and
had been for a long time. Fix them up, clean up code.

PT_DTRACE without PT_PTRACED.

Long ago, the "D" in PT_DTRACE meant "Delayed", and it was used
as a flag to mark that we had ptrace'd the process but no longer
did so. That hasn't been true in a while now, and the flag should
probably be renamed, but in the meantime the test for PT_PTRACED
being cleared had been corrupted into something totally nonsensical.

Pointed out by Andi Kleen.

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

Quieten down compiler warnings, and fix an off-by-one bug when
deciding whether to include the next word.

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

It didn't allocate space for the final terminating entry,
which caused it to overwrite the next slab entry, which in turn
sometimes ended up being a slab array cache pointer. End result:
total slab cache corruption at a random time afterwards. Very
nasty.

some trivial iomem annotations were still missing
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

local variable used to store flags after spin_lock_irqsave() should be
unsigned long, not u32.  That should complete the 64bit cleanups in
there.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - get_user() __gu_val should be unsigned long (same as with i386 patch)
 - __copy_to_user() et.al. didn't have proper type checking
 - documented the casts in __copy_tofrom_user() calls with __force.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

nfsim gains sysctl support, and sure enough, --failtest uncovered an
unregister when the registration had failed.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Someone thought it would be clever if proc code ignores removal of
non-existent entries.  Hence, we missed that /proc/net/stat/ip_conntrack
is never removed on module removal or init failure.

Found by nfsim.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Somehow parport_pc.c ended up with mixed old-style and new-style module
parameters, but mixing them is not allowed.

Use module_param() instead of MODULE_PARM() -- cannot be mixed.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Although the CG6 framebuffer is detected and initialized, without this
patch all it displays is a blank screen. Tested on an Ultra 1 with a
TGX+.

Originally from Bob Breuer for the CG14.
Signed-off-by: Adam Kropelin <akropel1@rochester.rr.com>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

sparc32 had a conflicting _exit, removed the line from asm-
sparc/unistd.h. This is the same change that DaveM made to sparc64 here:
http://linux.bkbits.net:8080/linux-2.6/diffs/include/asm-
sparc64/unistd.h@1.33

Warning was:
In file included from include/linux/unistd.h:9,
                 from init/main.c:45:
include/asm/unistd.h:489: warning: conflicting types for built-in
function '_exit'
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Squelch the floppy compile warning:

include/asm/floppy.h: In function `sun_fd_request_irq':
include/asm/floppy.h:276: warning: passing arg 2 of `request_fast_irq'
from incompatible pointer type
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix missing cases for vm fault codes in sparc32 fault handling, and
convert the entire file to using symbolic fault codes. This fixes a
latent bug where an allocation failure returns to the kernel instead of
delivering an error as expected.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add a sparc #ifdef to drivers/char/rtc.c and iomem annotations to
drivers/sbus/char/rtc.c
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

serio is unused except in the #ifdef CONFIG_SERIO paths. To kill the
warning, make the declaration conditional on the same.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/sparc/kernel/pcic.c trips numerous warnings due to iomem
annotations. This patch adds various needed iomem annotations.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

sparc32 svr4_setcontext() needs to return a value in the SIGSEGV path.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The latter hunk of the forwarded patch has already been applied, so
please apply the patch as it appears in the un-forwarded part. I've
taken some liberties in adding the Acked/Signed-off lines in what I
hope is an agreeable way.

On Sun, Nov 14, 2004 at 11:16:40PM -0500, Jurij Smakov wrote:
> As a followup: I have tried fiddling more with the memcpy() routine.
> Insight from Rob Radez and comments in arch/sparc/lib/blockops.S suggest,
> that __copy_1page assumes that the memory regions copied are aligned on a
> double-word boundary. I have checked, that in the cramfs case it wasn't
> true, the destination was not aligned on the double-word boundary. So, I
> have implemented a simple workaround (see patch below), which together
> with Bob Breuer's iommu.c fix [0] made 2.6.8 kernel to boot on my
> machine (SS10 with Ross Hypersparc CPU)! I also confirm, that adding the
> suggested fix to the srmmu.c also [1] breaks sunlance on my machine. With
> that "fix" the line 'eth0: Memory error, status 88c3, addr 3713ba' is
> displayed continuously during boot, when it comes to configuring network
> interfaces. The successful patch for me is:
Acked-by: William Irwin  <wli@holomorphy.com>
Acked-by: Dave Miller  <davem@davemloft.net>
Signed-off-by: Jurij Smakov <jurij@wooyd.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Chris Newport and Thomas Bogendoerfer have been working to get the
sun4d port functional again. This patch updates 2.6.10-rc3 to a current
snapshot of their work. It does the following 3 things:

(1) add sun4d hook to sbus_bus_ranges_init()
(2) fix up pgd_offset() call in sun4d iommu code
(3) fix up sun4d's definition of current
Signed-off-by: Chris Newport <crn@netunix.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

DVMA is having aliasing problems. Bob originally sent in the following
description:

At some point in the past, Bob Breuer wrote:
> Here's the preliminary patch.  This time around, both the hme
> and esp drivers are working for me.  This replaces my previous
> patch and is against the vanilla 2.6.9 kernel.  I've tried to
> reduce the amount of unnecessary cache flushing, therefore this
> will need some testing on non-hypersparc cpus also.  It needs
> some cleanup yet, and will be rediffed against a later kernel.
> I'm looking for comments and feedback.

This patch represents one of those subsequent rediffings.
Signed-off-by: Bob Breuer <breuerr@mc.net>
Acked-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/block/floppy.c: In function `init_module':
drivers/block/floppy.c:4598: error: parse error before "UTS_RELEASE"

Not sure what went wrong here - just kill the thing.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The recent ipv6 "fix" broke the build:

security/selinux/avc.c: In function `avc_audit':
security/selinux/avc.c:581: warning: implicit declaration of function `inet6_sk'
security/selinux/avc.c:581: warning: initialization makes pointer from integer without a cast
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

This patch contains two fixes for VIA PadLock compilation with GCC 2.95.3
and GCC 3.4.3 (original patch was tested with 3.3.4 only).
Signed-off-by: Michal Ludvig <michal@logix.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

mm/memory.c:1944:6: missing binary operator before token "long"

The preprocessor doesn't like the typecast....

PTRS_PER_PGD isn't used in assembly code, so this looks to be safe enough..

This patch helps, but the ia64 build is still broken.  There is no
implementation of __pmd_alloc().

Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

mm/memory.c: In function `zeromap_pud_range':
mm/memory.c:1053: warning: suggest parentheses around + or - inside shift
mm/memory.c: In function `remap_pud_range':
mm/memory.c:1170: warning: suggest parentheses around + or - inside shift

Parenthesize this macro arg.

Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On sparc64:

drivers/ide/setup-pci.c:310: error: `DMA_32BIT_MASK' undeclared (first use in this function)
drivers/ide/setup-pci.c:310: error: (Each undeclared identifier is reported only once
drivers/ide/setup-pci.c:310: error: for each function it appears in.)
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Nasty bug, caught while writing the ECN target test.  Corrupts
checksums of packets when target is used on them.

Let this be a warning on the evils of casts.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This updates the Integrator RTC driver to use the ARM common RTC
interface, and converts the driver to behave as a standard AMBA
peripheral driver.

Patch from Deepak Saxena

Update IXP4xx header files with new registers for IXP46x CPU family.

Replaces 2306/1

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King