* isp16_init() should be an initcall in non-modular case - it's not
   called directly anymore (not since 2.5.1-pre2). 
 * isp16_init() and isp16_exit() made static, while we are at it.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We need delay.h there - on a lot of platforms it doesn't get pulled
indirectly and since we use udelay() now...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

openpromfs property_read() is slightly abused by property_write() - the
latter calls property_read(file, NULL, 0, NULL) if we still hadn't done
any IO on that file; property_read() will do setup work and, since it's
called with count equal to 0, do nothing else.

That stopped working - now we check if *ppos is sane before doing
anything else and that, of course, oopses.  Trivial fix is to move the
check past that for count == 0...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

I must be crazy, but it looked obvious enough. Check with rmk.

Patch from Dave Jiang

This cleans up the PCI mem and I/O resources assignments for all IOP
platforms. All addresses should be cleanly defined and correctly
assigned now.

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

Patch from Michael Opdenacker

"GPIO23_SCLK_md" renamed to "GPIO23_SCLK_MD" (uppercase)
in include/asm-arm/arch-pxa/pxa-regs.h.
Done for consistency with all other GPIO_*_MD settings.
No other file impacted in mainstream kernel sources.
Reported by Nicolas Pouillon.

Signed-off-by: Michael Opdenacker
Signed-off-by: Russell King

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

Jan points out that this should have been -ENOSPC.

Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add a backlight driver for the Sharp Corgi PDAs (SL-C7xx series) using the
backlight class.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

edid_checksum always return success (1) although it can fail.  Fix.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make use of the new preempt_schedule_irq function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make use of the new preempt_schedule_irq function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The idle-thread-preemption-fix.patch introduced a race, which is not
critical, but might give us an extra turn through the scheduler.  When
interrupts are reenabled in entry.c and an interrupt occures before we
reach the add_preempt_schedule() in preempt_schedule we get rescheduled
again in the return from interrupt path.

The patch prevents this by leaving interrupts disabled and calling a a
seperate function preempt_schedule_irq().

This split adds different plausibility checks for irq context calls and
kernel calls.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- frontends: sp887x: improve confusing firmware loading messages
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- core: add support for up to six DVB cards by using 32bit dev_t
  capabilities
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- core: fix access to freed memory when unloading frontend drivers (fix by
  Gerd Knorr)
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- dibusb: follow USB changes (idVendor, idProduct, bcdDevice and bcdUSB
  fields are now __le16)
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Yes, me too.  generic_shutdown_super() takes lock_super().  And udf uses
lock_super for protecting its block allocation data strutures.  Trivial
deadlock on unmount.

Below is a fix to switch udf to it's own private locking.  It's safe
because it doesn't intefere with VFS lock_super usage anywhere.

udf_free_inode has some more updates than simply switching the used
lock:

 - clear_inode() call moved outside locked section to avoid another
   deadlock
 - unused variable ino killed
 - is_directory moved into the conditional it's actually used in
Signed-off-by: Christoph Hellwig <hch@lst.de>

(note that I see memory corruption in UDF_I_DATA(inode), but I've
reproduced that with a kernel without all recent udf changes.  I'll
debug that one further)
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The following processor was marked as unsupported, there are no documented
changes in the performance counter interface for this processor.

Hardware courtesy of Intel Corporation

processor       : 0
vendor_id       : GenuineIntel
cpu family      : 15
model           : 4
model name      : Genuine Intel(R) CPU 3.60GHz
stepping        : 1
cpu MHz         : 3600.761
cache size      : 1024 KB
physical id     : 0
siblings        : 2
fdiv_bug        : no
hlt_bug         : no
f00f_bug        : no
coma_bug        : no
fpu             : yes
fpu_exception   : yes
cpuid level     : 5
wp              : yes
flags           : fpu vme de tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx lm pni
monitor ds_cpl tm2 cid cx16 xtpr
bogomips        : 7110.65

CPU: P4 / Xeon with 2 hyper-threads, speed 3601.79 MHz (estimated)
Counted GLOBAL_POWER_EVENTS events (time during which processor is not
stopped) with a unit mask of 0x01 (count cycles when processor is active)
count 10000
Signed-off-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We should be using profile_pc in oprofile_add_sample so that lock
contention is attibuted to the correct function in profile output.  Also
fix SH7750 support.
Signed-off-by: Zwane Mwaikambo <zwane@fsmlabs.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The audit subsystem uses netlink messages to request loginuid changes.  Due
to the sensitivity of loginuid, netlink appears to be insufficient.  For
instance, it is not easy to guarantee that the loginuid message will be
handled before any other auditable actions, and there is even the remote
possibility of the process terminating and another process with the same
pid being created before the message is handled.  Finally, other kernel
code, in particular selinux, is interested in easily querying the loginuid
for inclusion in its own messages.

The following patch moves loginuid handling from netlink to the
/proc/$$/loginuid file, and adds a audit_get_loginuid() function.  It also
includes Stephen Smalley's patch to correctly inherit the loginuid on fork.
 It has been actively discussed on the linux-audit mailing list.
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Update the ib_umad module to use major 231 instead of a dynamic major, as
assigned in the LANANA Linux 2.6+ Device List
(http://lanana.org/docs/device-list/devices-2.6+.txt).
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Consolidate the various private implementations of this into a kernel-wide
implementation.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This got caught by gcc on 64bit boxen - IMGSIZE is size_t and that means
range not covered by that of signed 64bit, so we get an unsigned type for
IMGSIZE-*ppos.  On 32bit boxen IMGSIZE-*ppos ends up being loff_t, so the
warning gets silenced.  
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

No need to waste 128B of kmem.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add a usecs_to_jiffies() function.  This will be used in one of my
subsequent patches.  With the potential for dynamic HZ values much higher
than 1000, we may need to consider times as small as usecs in terms of
jiffies.  We have msecs_to_jiffies(), jiffies_to_msecs() and
jiffies_to_usecs(), but no usecs_to_jiffies().
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We introduced exports for register_cpu and unregister_cpu right after
2.6.10.  As far as I can tell these are not called from any code which can
be built as a module, and I can't think of a good reason why any out of
tree code would use them.
Signed-off-by: Nathan Lynch <nathanl@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch:
- replaces several macros with the actual code
- change the type of pointer variables from u32 to void *
- removes unecessary casts
- puts the contents of mpsc_defs.h into mpsc.h and removes the mpsc_defs.h
- reflects the new names of some structs
- cleans up some whitespace
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The cputime_to_secs and secs_to_cputime primitives in
include/asm-generic/cputime.h can be simplified since the default cputime
implementation assumes that cputime is measured in jiffies.  The
intermediate conversion to milliseconds is superflous.
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>

Attached is diff for bringing devices.txt uptodate with lanana.

Please note: The devices.txt file in your tree will now be for 2.6+ kernels
only.  2.6 specific allocations will now be given out more freely, and some
of the stuff marked for obsolete for 2.6 has been removed.  I put a note in
the file to let people know its for 2.6+ kernels only.

I wanted to rename the new file to devices-2.6+.txt and then make a link
from the old devices.txt to this new file, but diffing it became too ugly.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Finally located that a problem seems to be a simple typo.
Acked-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch adds iomap functions to MIPS system.

Some MIPS systems are unable to define PIO space by PIO_MASK/PIO_RESERVED. 
This is the reason that I didn't use the general iomap implementation.
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ask for SERIAL_TXX9 only on those devices that actually have one.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Minor update to the code for the Lasat, a Cobalt-like server.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Updates kernel and CPU configuration Momentum systems.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

SMP support for the PMC-Sierra Yosemite evaluation board.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Minor updates for the evaluation boards made by Galileo Technologies.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>