OSDN Git Service
David S. Miller [Wed, 8 Feb 2006 02:11:24 +0000 (18:11 -0800)]
[SPARC]: Wire up sys_unshare().
Also, the Solaris syscall table is sized differrently,
and does not go beyond entry 255, so trim off the excess
entries.
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Wed, 8 Feb 2006 00:29:55 +0000 (16:29 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6
Linus Torvalds [Wed, 8 Feb 2006 00:29:27 +0000 (16:29 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
Linus Torvalds [Wed, 8 Feb 2006 00:28:26 +0000 (16:28 -0800)]
Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
Greg Ungerer [Tue, 7 Feb 2006 23:19:17 +0000 (09:19 +1000)]
[PATCH] m68knommu: use tty_schedule_flip() in 68328serial.c
Use the new tty_schedule_flip() instead of the original direct
schedule_work of the flip buffer.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Ungerer [Tue, 7 Feb 2006 23:19:17 +0000 (09:19 +1000)]
[PATCH] m68knommu: use tty_schedule_flip() in 68360serial.c
Use the new tty_schedule_flip() instead of the original direct
schedule_work of the flip buffer.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Ungerer [Tue, 7 Feb 2006 23:19:17 +0000 (09:19 +1000)]
[PATCH] m68knommu: hardirq.h needs definition of NR_IRQS
Need to include the local asm/irq.h to get the NR_IRQS definition.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Ungerer [Tue, 7 Feb 2006 23:19:17 +0000 (09:19 +1000)]
[PATCH] m68knommu: need pm_power_off in m68knommu
Need place holders for the power management power off and idle functions.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Ungerer [Tue, 7 Feb 2006 23:19:17 +0000 (09:19 +1000)]
[PATCH] m68knommu: compile fixes for mcfserial.c
Re-organize the default CONSOLE baud rate define setting so that
it is only set once.
Use the new tty_schedule_flip() instead of the original direct
schedule_work of the flip buffer.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
JANAK DESAI [Tue, 7 Feb 2006 20:59:03 +0000 (12:59 -0800)]
[PATCH] unshare system call -v5: system call registration for i386
Registers system call for the i386 architecture.
Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
JANAK DESAI [Tue, 7 Feb 2006 20:59:02 +0000 (12:59 -0800)]
[PATCH] unshare system call -v5: unshare files
If the file descriptor structure is being shared, allocate a new one and copy
information from the current, shared, structure.
Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
JANAK DESAI [Tue, 7 Feb 2006 20:59:01 +0000 (12:59 -0800)]
[PATCH] unshare system call -v5: unshare vm
If vm structure is being shared, allocate a new one and copy information from
the current, shared, structure.
Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
JANAK DESAI [Tue, 7 Feb 2006 20:59:00 +0000 (12:59 -0800)]
[PATCH] unshare system call -v5: unshare namespace
If the namespace structure is being shared, allocate a new one and copy
information from the current, shared, structure.
Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
JANAK DESAI [Tue, 7 Feb 2006 20:58:59 +0000 (12:58 -0800)]
[PATCH] unshare system call -v5: unshare filesystem info
If filesystem structure is being shared, allocate a new one and copy
information from the current, shared, structure.
Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
JANAK DESAI [Tue, 7 Feb 2006 20:58:58 +0000 (12:58 -0800)]
[PATCH] unshare system call -v5: system call handler function
sys_unshare system call handler function accepts the same flags as clone
system call, checks constraints on each of the flags and invokes corresponding
unshare functions to disassociate respective process context if it was being
shared with another task.
Here is the link to a program for testing unshare system call.
http://prdownloads.sourceforge.net/audit/unshare_test.c?download
Please note that because of a problem in rmdir associated with bind mounts and
clone with CLONE_NEWNS, the test fails while trying to remove temporary test
directory. You can remove that temporary directory by doing rmdir, twice,
from the command line. The first will fail with EBUSY, but the second will
succeed. I have reported the problem to Ram Pai and Al Viro with a small
program which reproduces the problem. Al told us yesterday that he will be
looking at the problem soon. I have tried multiple rmdirs from the
unshare_test program itself, but for some reason that is not working. Doing
two rmdirs from command line does seem to remove the directory.
Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
JANAK DESAI [Tue, 7 Feb 2006 20:58:56 +0000 (12:58 -0800)]
[PATCH] unshare system call -v5: Documentation file
Documents the new feature, why it is needed, it's cost, design,
implementation, and test plan.
Signed-off-by: Janak Desai <janak@us.ibm.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Tue, 7 Feb 2006 20:58:54 +0000 (12:58 -0800)]
[PATCH] Fix spinlock debugging delays to not time out too early
The spinlock-debug wait-loop was using loops_per_jiffy to detect too long
spinlock waits - but on fast CPUs this led to a way too fast timeout and false
messages.
The fix is to include a __delay(1) call in the loop, to correctly approximate
the intended delay timeout of 1 second. The code assumes that every
architecture implements __delay(1) to last around 1/(loops_per_jiffy*HZ)
seconds.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Nick Piggin [Tue, 7 Feb 2006 20:58:52 +0000 (12:58 -0800)]
[PATCH] mm: compound release fix
Compound pages on SMP systems can now often be freed from pagetables via
the release_pages path. This uses put_page_testzero which does not handle
compound pages at all. Releasing constituent pages from process mappings
decrements their count to a large negative number and leaks the reference
at the head page - net result is a memory leak.
The problem was hidden because the debug check in put_page_testzero itself
actually did take compound pages into consideration.
Fix the bug and the debug check.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Stephen Smalley [Tue, 7 Feb 2006 20:58:51 +0000 (12:58 -0800)]
[PATCH] selinux: require AUDIT
Make SELinux depend on AUDIT as it requires the basic audit support to log
permission denials at all. Note that AUDITSYSCALL remains optional for
SELinux, although it can be useful in providing further information upon
denials.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Rafael J. Wysocki [Tue, 7 Feb 2006 20:58:50 +0000 (12:58 -0800)]
[PATCH] Fix build failure in recent pm_prepare_* changes.
Fix compilation problem in PM headers.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dave Jones [Tue, 7 Feb 2006 20:58:48 +0000 (12:58 -0800)]
[PATCH] More informative message on umount failure
We had a user trigger this message on a box that had a lot of different
mounts, all with different options. It might help narrow down wtf happened
if we print out which device failed.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Kyle McMartin [Tue, 7 Feb 2006 20:58:47 +0000 (12:58 -0800)]
[PATCH] sys_hpux: fix strlen_user() race
Userspace can alter the string after the kernel has run strlen_user().
Also: the strlen_user() return value includes the \0, so fix that.
Also: handle EFAULT from strlen_user().
It's unlikely anyone is using this code. Very, very unlikely. If I
remember correctly, CONFIG_HPUX turns this code on, but one would actually
need CONFIG_BINFMT_SOM to load a binary that could cause a problem, and
BINFMT_SOM has had an #error in it for quite some time.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Robert Love [Tue, 7 Feb 2006 20:58:45 +0000 (12:58 -0800)]
[PATCH] inotify: fix one-shot support
Fix one-shot support in inotify. We currently drop the IN_ONESHOT flag
during watch addition. Fix is to not do that.
Signed-off-by: Robert Love <rml@novell.com>
Cc: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton [Tue, 7 Feb 2006 20:58:45 +0000 (12:58 -0800)]
[PATCH] module: strlen_user() race fix
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Tue, 7 Feb 2006 20:58:44 +0000 (12:58 -0800)]
[PATCH] uml: remove a dead file
A previous patch removed a file from the build without removing it from the
tree.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Tue, 7 Feb 2006 20:58:43 +0000 (12:58 -0800)]
[PATCH] uml: initialize process FP registers properly
We weren't making sure that we initialized the FP registers of new processes
to sane values.
This patch also moves some defines in the affected area closer to where they
are used.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Tue, 7 Feb 2006 20:58:42 +0000 (12:58 -0800)]
[PATCH] uml: block SIGWINCH in ptrace tester child
The process that UML uses to probe the host's ptrace capabilities can (rarely)
receive a SIGWINCH, confusing the parent. This fixes that by blocking
SIGWINCH.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Tue, 7 Feb 2006 20:58:42 +0000 (12:58 -0800)]
[PATCH] uml: balance list_add and list_del in the network driver
The network driver added an interface to the "opened" list when it was
configured, not when it was brought up, and removed it when it was taken down.
A sequence of ifconfig up, ifconfig down, ... caused it to be removed
multiple times from the list without being added in between, resulting in a
crash. This patch moves the add to when the interface is brought up.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Tue, 7 Feb 2006 20:58:41 +0000 (12:58 -0800)]
[PATCH] uml: close TUN/TAP file descriptors
When UML opens a TUN/TAP device, the file descriptor could be copied into
later, long-lived threads, holding the device open even after the interface is
taken down, preventing it from being brought up again. This patch makes these
descriptors close-on-exec so that they disappear from helper processes, and
adds CLONE_FILES to a UML helper thread so that the descriptors are closed in
the thread when they are closed elsewhere in UML.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Tue, 7 Feb 2006 20:58:40 +0000 (12:58 -0800)]
[PATCH] uml: add debug switch for skas mode
It doesn't do anything but emit a warning, but there's a user population
that's used to adding 'debug' to the UML command line in order to gdb it.
With skas0 mode, that's not necessary, but these users need some indication
that 'debug' doesn't do what they want.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Suzuki [Tue, 7 Feb 2006 20:58:36 +0000 (12:58 -0800)]
[PATCH] Fix do_path_lookup() to add the check for error in link_path_walk()
Fix do_path_lookup() to avoid accessing invalid dentry or inode when the
link_path_walk() has failed. This should fix Bugme #5897.
Signed-off-by: Suzuki K P <suzuki@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Steve Langasek [Tue, 7 Feb 2006 20:58:35 +0000 (12:58 -0800)]
[PATCH] __cmpxchg() must really always be inlined on alpha
With the latest 2.6.15 kernel builds for alpha on Debian, we ran into a
problem with undefined references to __cmpxchg_called_with_bad_pointer() in
a couple of kernel modules (xfs.ko and drm.ko; see
http://bugs.debian.org/347556).
It looks like people have been trying to out-clever each other wrt the
definition of "inline" on this architecture :), with the result that
__cmpxchg(), which must be inlined so the compiler can see its argument is
const, is not guaranteed to be inlined. Indeed, it was not being inlined
when building with -Os.
The attached patch fixes the issue by adding an
__attribute__((always_inline)) explicitly to the definition of __cmpxchg()
instead of relying on redefines of "inline" elsewhere to make this happen.
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Richardson [Tue, 7 Feb 2006 20:58:33 +0000 (12:58 -0800)]
[PATCH] ide: cast arguments to pr_debug() properly
This does not show up unless you #define DEBUG in the file, which most
people wouldn't do. On PPC405, at least, "sector_t" is unsigned long,
which doesn't match %llx/%llu. Since sector# may well be >32 bits, promote
the value to match the format.
Signed-off-by: Michael Richardson <mcr@xelerance.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
J. Bruce Fields [Tue, 7 Feb 2006 20:58:32 +0000 (12:58 -0800)]
[PATCH] knfsd: fix nfs4_open lock leak
I just noticed that my patch "don't create on open that fails due to
ERR_GRACE" (recently commited as
fb553c0f17444e090db951b96df4d2d71b4f4b6b)
had an obvious problem that causes a deadlock on reboot recovery. Sending
in this now since it seems like a clear 2.6.16 candidate.--b.
We're returning with a lock held in some error cases.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Christoph Lameter [Tue, 7 Feb 2006 20:58:30 +0000 (12:58 -0800)]
[PATCH] hugetlbpage: return VM_FAULT_OOM on oom
Remove wrong and misleading comments.
Return VM_FAULT_OOM if the hugetlbpage fault handler cannot allocate a
page. do_no_page will end up doing do_exit(SIGKILL).
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Gibson [Tue, 7 Feb 2006 20:58:25 +0000 (12:58 -0800)]
[PATCH] Hugepages need clear_user_highpage() not clear_highpage()
When hugepages are newly allocated to a file in mm/hugetlb.c, we clear them
with a call to clear_highpage() on each of the subpages. We should be
using clear_user_highpage(): on powerpc, at least, clear_highpage() doesn't
correctly mark the page as icache dirty so if the page is executed shortly
after it's possible to get strange results.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: William Lee Irwin III <wli@holomorphy.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ravikiran G Thirumalai [Tue, 7 Feb 2006 20:58:23 +0000 (12:58 -0800)]
[PATCH] x86_64: Fix the node cpumask of a cpu going down
Currently, x86_64 and ia64 arches do not clear the corresponding bits in
the node's cpumask when a cpu goes down or cpu bring up is cancelled. This
is buggy since there are pieces of common code where the cpumask is checked
in the cpu down code path to decide on things (like in the slab down path).
PPC does the right thing, but x86_64 and ia64 don't (This was the reason
Sonny hit upon a slab bug during cpu offline on ppc and could not reproduce
on other arches). This patch fixes it for x86_64. I won't attempt ia64 as
I cannot test it.
Credit for spotting this should go to Alok.
(akpm: this was applied, then reverted. But it's OK now because we now use
for_each_cpu() in the right places).
Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Shai Fultheim <shai@scalex86.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pavel Machek [Tue, 7 Feb 2006 20:58:22 +0000 (12:58 -0800)]
[PATCH] swsusp: kill unneeded/unbalanced bio_get
- Remove unneeded bio_get() which would cause a bio leak
- Writing doesn't dirty pages. Reading dirties pages.
- We should dirty the pages after the IO completion, not before
(Busy-waiting for disk I/O completion isn't very polite.)
Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Russell King [Tue, 7 Feb 2006 20:58:20 +0000 (12:58 -0800)]
[PATCH] drivers/base/bus.c warning fixes
drivers/base/bus.c:166: warning: `driver_attr_unbind' defined but not used
drivers/base/bus.c:194: warning: `driver_attr_bind' defined but not used
Looks like these two attributes and supporting functions want to be
#ifdef HOTPLUG'd
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 7 Feb 2006 18:13:39 +0000 (10:13 -0800)]
Merge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
Jens Axboe [Tue, 7 Feb 2006 14:00:01 +0000 (15:00 +0100)]
[PATCH] cciss: softirq handler needs to save interrupt flags
The softirq rq completion handler needs to save/restore interrupt flags
appropriately.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 7 Feb 2006 18:10:09 +0000 (10:10 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
Andi Kleen [Tue, 7 Feb 2006 11:48:00 +0000 (12:48 +0100)]
[PATCH] Fix bad apic fix on i386
Fix wrong '!' in bad apic fix
I forgot to remove the ! when moving the code from x86-64 to i386 x86-64
tested !disable_apic, but of course for cpu_has_apic it shouldn't be
negated.
Credit goes to Jan Beulich for spotting it with eagle eyes.
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 7 Feb 2006 18:04:04 +0000 (10:04 -0800)]
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6
Linus Torvalds [Tue, 7 Feb 2006 18:01:43 +0000 (10:01 -0800)]
Merge git://git./linux/kernel/git/sam/kbuild-bugfix
Ralf Baechle [Tue, 7 Feb 2006 01:20:43 +0000 (01:20 +0000)]
[MIPS] Clear ST0_RE on bootup.
The reset state is undefined and some firmware doesn't clear this bit
possibly resulting in crashes on entry into userland.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Sergei Shtylylov [Sat, 4 Feb 2006 12:11:14 +0000 (15:11 +0300)]
[MIPS] TX49x7: Fix reporting of the CPU name and PCI clock
I've noticed that PCI clock was incorrectly reported as 66 MHz while being
mere 33 MHz on RBTX4937 board -- this was due to the different encoding of
the PCI divisor field in CCFG register between TX4927 and TX4937 chips...
Also, RBTX49x7 was printed out as a CPU name (e.g., "CPU is RBTX4937");
and some debug printk() were duplicating each other...
Signed-off-by: Konstantin Baydarov <kbaidarov@ru.mvista.com>
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Thu, 2 Feb 2006 16:34:01 +0000 (01:34 +0900)]
[MIPS] TX49 MFC0 bug workaround
If mfc0 $12 follows store and the mfc0 is last instruction of a
page and fetching the next instruction causes TLB miss, the result
of the mfc0 might wrongly contain EXL bit.
ERT-TX49H2-027, ERT-TX49H3-012, ERT-TX49HL3-006, ERT-TX49H4-008
Workaround: mask EXL bit of the result or place a nop before mfc0. It
doesn't harm to always clear those bits, so we change the code to do so.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 2 Feb 2006 14:31:16 +0000 (14:31 +0000)]
[MIPS] Fix linker script to work for non-4K page size.
Very much to my surprise Fuxin Zhang reports this is all it takes to get
the kernel to work for page sizes larger than 4kB. This also paves the
way for support for the R6000 and R8000 which don't support 4kB page size.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 1 Feb 2006 17:54:30 +0000 (17:54 +0000)]
[MIPS] Oprofile: Support for 34K UP kernels.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Wed, 1 Feb 2006 16:29:14 +0000 (01:29 +0900)]
[MIPS] Fix dump_tlb.c warning and cleanup.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Wed, 1 Feb 2006 16:26:34 +0000 (01:26 +0900)]
[MIPS] Fix minor sparse warnings
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 1 Feb 2006 15:29:21 +0000 (15:29 +0000)]
[MIPS] MIPS R2 optimized endianess swapping.
From Franck Bui-Huu <vagabon.xyz@gmail.com> with modifications by me.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Tue, 31 Jan 2006 17:07:53 +0000 (17:07 +0000)]
[MIPS] Remove buggy inline version of memscan.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Tue, 31 Jan 2006 16:41:09 +0000 (01:41 +0900)]
[MIPS] Sparse: Add some __user tags to signal functions.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Tue, 31 Jan 2006 01:40:55 +0000 (01:40 +0000)]
[MIPS] Shrink Qemu configuration to the bare minimum that is need and tested.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Daniel Jacobowitz [Fri, 21 Jan 2005 00:59:54 +0000 (19:59 -0500)]
[MIPS] Support /proc/kcore for MIPS
I'm pretty sure that the CKSEG0 bits are wrong, but I did need to
cover that region - because the SB-1 kernel links at 0xffffffff80100000
or so, disassembly and printing static variables don't work unless the
debugger can read that region.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 30 Jan 2006 17:48:27 +0000 (17:48 +0000)]
[MIPS] IP22: Fix serial console detection
From: Kaj-Michael Lang <milang@tal.org>
In ip22-setup.c the checks for serial/graphics console logic does
not check if ARCS console=g but the machine is using serial console, as
it does if no keyboard is attached.
This patch adds a check if ConsoleOut is serial. There might also be
support for other graphics than Newport soon...
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Mon, 2 Jan 2006 12:59:49 +0000 (21:59 +0900)]
[MIPS] ieee754[sd]p_neg workaround
It looks glibc's pow() assumes an unary '-' operation for any number
(including NaNs) always inverts its sign bit (though IEEE754 does not
specify the sign bit for NaNs). This patch make the kernel math-emu
emulates real MIPS neg.[ds] instruction.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Sat, 28 Jan 2006 17:27:51 +0000 (02:27 +0900)]
[MIPS] Remove wrong __user tags.
This fixes sparse warnings 'dereference of noderef expression'.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 30 Jan 2006 17:14:41 +0000 (17:14 +0000)]
[MIPS] Cleanup fls implementation.
fls was the only called of flz, so fold flz into fls, same for the
__ilog2 call. Delete the now unused flz function.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 30 Jan 2006 16:48:26 +0000 (16:48 +0000)]
[MIPS] local_irq_restore wasn't safe to be used in other macros mode.
It always left the assembler in reorder mode possibly causing disaster.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 30 Jan 2006 04:07:39 +0000 (04:07 +0000)]
[MIPS] Remove commented out code to add -mmad for Nevada.
Adding -mmad is not usable since over half a decade in gcc and when
fixed the proper -march option values should enable the use of the
mad, madu and mul instructions of the R5500, RM5200, RM7000 and RM9000
families.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Peter Horton [Sun, 29 Jan 2006 21:33:48 +0000 (21:33 +0000)]
[MIPS] Fix Cobalt PCI cache line sizes
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Sat, 28 Jan 2006 17:31:17 +0000 (02:31 +0900)]
[MIPS] Sparse: Add _MIPS_SZINT and _MIPS_ISA to CHECKFLAGS to fix sparse warnings.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Sat, 28 Jan 2006 17:30:55 +0000 (02:30 +0900)]
[MIPS] Build blast_cache routines from template
Build blast_xxx, blast_xxx_page, blast_xxx_page_indexed from template.
Easier to maintaina and saves 300 lines. Generated code should be
unchanged.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Sun, 29 Jan 2006 13:34:32 +0000 (22:34 +0900)]
[MIPS] Sparse: Fix some compiler/sparse warnings in ptrace32.c
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 29 Jan 2006 21:01:42 +0000 (21:01 +0000)]
[MIPS] Reformat to 80 columns.
Patch courtesy of Emily Postnews ;-)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 29 Jan 2006 20:56:43 +0000 (20:56 +0000)]
[MIPS] Sibyte: Make all setup functions __init.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 29 Jan 2006 18:42:08 +0000 (18:42 +0000)]
[MIPS] Get rid of CONFIG_SB1_PASS_1_WORKAROUNDS #ifdef crapola.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Sergei Shtylylov [Thu, 26 Jan 2006 01:36:25 +0000 (04:36 +0300)]
[MIPS] Au1200: Make KGDB compile
AMD Au1200 SOC just doesn't have UART3, so KGDB won't even compile for it
as is, here's the fix to make KGDB use UART1.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Sergei Shtylylov [Wed, 25 Jan 2006 18:27:10 +0000 (21:27 +0300)]
[MIPS] Au1xx0: really set KSEG0 to uncached on reboot
Fix a really old buglet in AMD Au1xx0 restart code: instead of
modifying the whole CP0 Config.K0 field to 010b (meaning KSEG0 uncached)
before flushing the caches and resetting a board, it only sets bit 1 of that
reg. which is effectively a NOP since Config.K0 == 011b as the kernel sets it
up (which is also its default value for Au1xx0).
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Sergei Shtylylov [Wed, 25 Jan 2006 18:24:57 +0000 (21:24 +0300)]
[MIPS] TX49x7: Fix timer register #define's
Fix the #define's for TX4927/37 timer reg's to match the datasheets (those
Signed-off-by: Konstantin Baydarov <kbaidarov@mvista.com>
Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 23 Jan 2006 16:15:30 +0000 (16:15 +0000)]
[MIPS] Bullet proof uaccess.h against 4.0.1 miss-compilation.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Mark Mason [Tue, 17 Jan 2006 20:06:32 +0000 (12:06 -0800)]
[MIPS] SB1: Add oprofile support.
Signed-off-by: Mark Mason <mason@broadcom.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Mark Mason [Tue, 17 Jan 2006 20:02:17 +0000 (12:02 -0800)]
[MIPS] BCM1480: Cleanup debug code left behind in the PCI driver.
Signed-off-by: Mark Mason <mason@broadcom.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Mark Mason [Tue, 17 Jan 2006 19:55:52 +0000 (11:55 -0800)]
[MIPS] BCM1125 PCI fixes
Make BCM1125 targets to link again.
Signed-off-by: Mark Mason <mason@broadcom.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 19 Jan 2006 14:55:42 +0000 (14:55 +0000)]
[MIPS] Nevada support for SGI O2.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 19 Jan 2006 00:49:32 +0000 (00:49 +0000)]
[MIPS] CPU definitions for Cobalt.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 18 Jan 2006 23:26:43 +0000 (23:26 +0000)]
[MIPS] Rename include/asm-mips/cobalt to include/asm-mips/mach-cobalt.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 18 Jan 2006 17:37:07 +0000 (17:37 +0000)]
[MIPS] Rename _machine_power_off to pm_power_off so the kernel builds again.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Tue, 17 Jan 2006 21:14:01 +0000 (21:14 +0000)]
[MIPS] Check function pointers are non-zero before calling.
Several boards don't initialize the pointers, so let's play safe.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 3 Feb 2006 16:47:44 +0000 (16:47 +0000)]
[MIPS] Revert "mips: add pm_power_off"
pm_power_off duplicates the functionality of _machine_restart.
This reverts
b142159fa5ffbad73b6927fafa5440148030f3f1 commit.
Ralf Baechle [Sun, 15 Jan 2006 18:11:28 +0000 (18:11 +0000)]
[MIPS] RTLX compile fixes.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sun, 15 Jan 2006 18:10:39 +0000 (18:10 +0000)]
[MIPS] Get rid of unnecessary prototypes. Fixes and optimizations for HZ > 100.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 11 Jan 2006 18:23:00 +0000 (18:23 +0000)]
[MIPS] Fix C version of ssnop to use the right opcode.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Mon, 9 Jan 2006 20:09:36 +0000 (20:09 +0000)]
[MIPS] Remove stray .set mips3 resulting in 64-bit instruction in 32-bit kernels.
Only the NMI handler was affected so this is a low impact bug.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Mauro Carvalho Chehab [Tue, 7 Feb 2006 10:11:31 +0000 (08:11 -0200)]
Merge branch 'work-fixes'
Mauro Carvalho Chehab [Tue, 7 Feb 2006 10:11:05 +0000 (08:11 -0200)]
Merge branch 'origin'
Markus Rechberger [Tue, 7 Feb 2006 03:01:19 +0000 (04:01 +0100)]
V4L/DVB (3325): Disabled debug on by default in tvp5150
disabled debug on by default in tvp5150
Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Nathan Scott [Tue, 7 Feb 2006 09:27:44 +0000 (20:27 +1100)]
[XFS] Fix missing inode atime update from the utime syscall.
SGI-PV: 949214
SGI-Modid: xfs-linux-melb:xfs-kern:25136a
Signed-off-by: Nathan Scott <nathans@sgi.com>
David Chinner [Tue, 7 Feb 2006 09:27:24 +0000 (20:27 +1100)]
[XFS] Account for the page we just wrote when we detect congestion during
the clustering of extra pages in a buffered write.
SGI-PV: 949210
SGI-Modid: xfs-linux-melb:xfs-kern:25130a
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Adrian Bunk [Tue, 7 Feb 2006 08:49:15 +0000 (06:49 -0200)]
V4L/DVB (3318e): DVB: remove the at76c651/tda80xx frontends
The at76c651 and tda80xx frontends are currently completely unused, IOW
their only effect is making the kernel larger for people accitentially
enabling them.
The current in-kernel drivers differ from the drivers at cvs.tuxbox.org,
and re-adding them when parts of the dbox2 project get merged should be
trivial.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Dave Jones [Tue, 7 Feb 2006 08:49:15 +0000 (06:49 -0200)]
V4L/DVB (3318c): fix saa7146 kobject register failure
Whoops.
kobject_register failed for hexium HV-PCI6/Orion (-13)
[<
c01d3eb6>] kobject_register+0x31/0x47
[<
c023a996>] bus_add_driver+0x4a/0xfd
[<
c01de3c1>] __pci_register_driver+0x82/0xa4
[<
d083400a>] hexium_init_module+0xa/0x47 [hexium_orion]
[<
c013bdae>] sys_init_module+0x167b/0x1822
[<
c01633f7>] do_sync_read+0xb8/0xf3
[<
c0133fa3>] autoremove_wake_function+0x0/0x2d
[<
c0145390>] audit_syscall_entry+0x118/0x13f
[<
c0106ae2>] do_syscall_trace+0x104/0x14a
[<
c0103d21>] syscall_call+0x7/0xb
slashes in kobject names aren't allowed.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Tue, 7 Feb 2006 08:49:14 +0000 (06:49 -0200)]
V4L/DVB (3318a): Makes Some symbols static.
Some symbols at cx88-alsa were global. Making those static.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 7 Feb 2006 08:49:12 +0000 (06:49 -0200)]
V4L/DVB (3313): FIX: Check if FW was downloaded or not + new firmware file
- When a firmware was downloaded dvb_usb_device_init returns NULL for the
dvb_usb_device, then nothing should be done with that pointer and device,
because it will re-enumerate.
- A new firmware should be used with digitv devices.
- It should make "slave"-devices work and others, too.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 7 Feb 2006 08:49:12 +0000 (06:49 -0200)]
V4L/DVB (3312): FIX: Multiple usage of VP7045-based devices
Reassigning function pointers in a static led to infinite loops when using
multiple VP7045-based device at the same time on one system. Using kmalloc'd
copies for reassignments is better.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Tue, 7 Feb 2006 08:49:12 +0000 (06:49 -0200)]
V4L/DVB (3310): Use MT352 parallel transport function for all Bluebird FusionHDTV DVB-T boxes.
Use the parallel transport function of the MT352 demodulator in
TH7579 and LGZ201 -based FusionHDTV Bluebird usb boxes.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Chris Pascoe [Tue, 7 Feb 2006 08:49:11 +0000 (06:49 -0200)]
V4L/DVB (3308): Use parallel transport for FusionHDTV Dual Digital USB
Use the parallel transport function of the MT352 in USB demodulator of the
Dual Digital board.
Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Oliver Endriss [Tue, 7 Feb 2006 08:49:11 +0000 (06:49 -0200)]
V4L/DVB (3307): Support for Galaxis DVB-S rev1.3
support for Galaxis DVB-S rev1.3 (subsystem 13c2:0004)
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>