]> err.no Git - linux-2.6/log
linux-2.6
18 years ago[PATCH] orinoco_nortel: Add Symbol LA-4123 ID
Pavel Roskin [Fri, 16 Dec 2005 23:57:10 +0000 (18:57 -0500)]
[PATCH] orinoco_nortel: Add Symbol LA-4123 ID

Add ID for Symbol LA-4123.  Reported by Tomas Novak <tap@post.cz>

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] orinoco_nortel: Fix incorrect PCI resource use
Pavel Roskin [Fri, 16 Dec 2005 23:49:53 +0000 (18:49 -0500)]
[PATCH] orinoco_nortel: Fix incorrect PCI resource use

orinoco_nortel was broken during conversion to iomem API.  Wrong PCI BAR
is used for chipset registers.  Reported by Tomas Novak <tap@post.cz>

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 22 Dec 2005 17:41:03 +0000 (09:41 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

18 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Thu, 22 Dec 2005 17:34:05 +0000 (09:34 -0800)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

18 years agoMerge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Linus Torvalds [Thu, 22 Dec 2005 17:33:04 +0000 (09:33 -0800)]
Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

18 years ago[PATCH] fix posix lock on NFS
ASANO Masahiro [Thu, 22 Dec 2005 04:24:54 +0000 (13:24 +0900)]
[PATCH] fix posix lock on NFS

NFS client prevents mandatory lock, but there is a flaw on it; Locks are
possibly left if the mode is changed while locking.

This permits unlocking even if the mandatory lock bits are set.

Signed-off-by: ASANO Masahiro <masano@tnes.nec.co.jp>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] fix race with preempt_enable()
Nicolas Pitre [Wed, 21 Dec 2005 17:26:25 +0000 (12:26 -0500)]
[PATCH] fix race with preempt_enable()

Currently a simple

void foo(void) { preempt_enable(); }

produces the following code on ARM:

foo:
bic r3, sp, #8128
bic r3, r3, #63
ldr r2, [r3, #4]
ldr r1, [r3, #0]
sub r2, r2, #1
tst r1, #4
str r2, [r3, #4]
blne preempt_schedule
mov pc, lr

The problem is that the TIF_NEED_RESCHED flag is loaded _before_ the
preemption count is stored back, hence any interrupt coming within that
3 instruction window causing TIF_NEED_RESCHED to be set won't be
seen and scheduling won't happen as it should.

Nothing currently prevents gcc from performing that reordering.  There
is already a barrier() before the decrement of the preemption count, but
another one is needed between this and the TIF_NEED_RESCHED flag test
for proper code ordering.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+git+ipv6-fix-20051221a
David S. Miller [Thu, 22 Dec 2005 15:41:27 +0000 (07:41 -0800)]
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+git+ipv6-fix-20051221a

18 years ago[IPSEC]: Fix policy updates missed by sockets
David S. Miller [Thu, 22 Dec 2005 15:39:48 +0000 (07:39 -0800)]
[IPSEC]: Fix policy updates missed by sockets

The problem is that when new policies are inserted, sockets do not see
the update (but all new route lookups do).

This bug is related to the SA insertion stale route issue solved
recently, and this policy visibility problem can be fixed in a similar
way.

The fix is to flush out the bundles of all policies deeper than the
policy being inserted.  Consider beginning state of "outgoing"
direction policy list:

policy A --> policy B --> policy C --> policy D

First, realize that inserting a policy into a list only potentially
changes IPSEC routes for that direction.  Therefore we need not bother
considering the policies for other directions.  We need only consider
the existing policies in the list we are doing the inserting.

Consider new policy "B'", inserted after B.

policy A --> policy B --> policy B' --> policy C --> policy D

Two rules:

1) If policy A or policy B matched before the insertion, they
   appear before B' and thus would still match after inserting
   B'

2) Policy C and D, now "shadowed" and after policy B', potentially
   contain stale routes because policy B' might be selected
   instead of them.

Therefore we only need flush routes assosciated with policies
appearing after a newly inserted policy, if any.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agopowerpc: Fix i8259 cascade on pSeries with XICS interrupt controller
Paul Mackerras [Thu, 22 Dec 2005 10:55:37 +0000 (21:55 +1100)]
powerpc: Fix i8259 cascade on pSeries with XICS interrupt controller

It turns out that commit f9bd170a87948a9e077149b70fb192c563770fdf
broke the cascade from XICS to i8259 on pSeries machines; specifically
we ended up not ever doing the EOI on the XICS for the cascade.  The
result was that interrupts from the serial ports (and presumably any
other devices using ISA interrupts) didn't get through.  This fixes
it and also simplifies the code, by doing the EOI on the XICS in the
xics_get_irq routine after reading and acking the interrupt on the
i8259.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoV4L/DVB (3191): Fix CC output
Hans Verkuil [Tue, 20 Dec 2005 11:48:29 +0000 (09:48 -0200)]
V4L/DVB (3191): Fix CC output

- CC data was swapped the wrong way around.
- Enabling CC disabled XDS and vice versa: these two should
be independent from one another.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
18 years agoV4L/DVB (3200): Fix saa7134 ALSA/OSS collisions
Ricardo Cerqueira [Tue, 20 Dec 2005 20:26:26 +0000 (18:26 -0200)]
V4L/DVB (3200): Fix saa7134 ALSA/OSS collisions

- When ALSA or OSS are loaded, check if the other is present
Fixed hotplug notifiers cleanup on module removal
- The saa7134 DMA sound modules now have their own Kconfig entries, and
if built statically enforce exclusivity
- SND_PCM_OSS isn't necessary for the OSS driver

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
18 years ago[DCCP]: Comment typo
Ian McDonald [Thu, 22 Dec 2005 03:02:39 +0000 (19:02 -0800)]
[DCCP]: Comment typo

I hope to actually change this behaviour shortly but this will help
anybody grepping code at present.

Signed-off-by: Ian McDonald <imcdnzl@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IPV6]: Fix address deletion
Kristian Slavov [Thu, 22 Dec 2005 02:47:24 +0000 (18:47 -0800)]
[IPV6]: Fix address deletion

If you add more than one IPv6 address belonging to the same prefix and
delete the address that was last added, routing table entry for that
prefix is also deleted.
Tested on 2.6.14.4

To reproduce:
ip addr add 3ffe::1/64 dev eth0
ip addr add 3ffe::2/64 dev eth0
/* wait DAD */
sleep 1
ip addr del 3ffe::2/64 dev eth0
ip -6 route

(route to 3ffe::/64 should be gone)

In ipv6_del_addr(), if ifa == ifp, we set ifa->if_next to NULL, and later
assign ifap = &ifa->if_next, effectively terminating the for-loop.
This prevents us from checking if there are other addresses using the same
prefix that are valid, and thus resulting in deletion of the prefix.
This applies only if the first entry in idev->addr_list is the address to
be deleted.

Signed-off-by: Kristian Slavov <kristian.slavov@nomadiclab.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[VLAN]: Add two missing checks to vlan_ioctl_handler()
Mika Kukkonen [Thu, 22 Dec 2005 02:39:49 +0000 (18:39 -0800)]
[VLAN]: Add two missing checks to vlan_ioctl_handler()

In vlan_ioctl_handler() the code misses couple checks for
error return values.

Signed-off-by: Mika Kukkonen <mikukkon@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETROM]: Fix three if-statements in nr_state1_machine()
Mika Kukkonen [Thu, 22 Dec 2005 02:38:26 +0000 (18:38 -0800)]
[NETROM]: Fix three if-statements in nr_state1_machine()

I found these while compiling with extra gcc warnings;
considering the indenting surely they are not intentional?

Signed-off-by: Mika Kukkonen <mikukkon@iki.fi>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Linus Torvalds [Wed, 21 Dec 2005 23:09:50 +0000 (15:09 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

18 years agoInitialize drivers/media/video/saa7134 late
Linus Torvalds [Wed, 21 Dec 2005 22:52:32 +0000 (14:52 -0800)]
Initialize drivers/media/video/saa7134 late

When compiled-in, make sure the sound system has initialized
before these drivers do.

Reported by Adrian Bunk <bunk@stusta.de>

(The right fix would be to make the sound core use "subsys_initcall()"
and thus initialize before all normal drivers, but this is the quick
and limited safe fix for 2.6.15).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] usbcore: allow suspend/resume even if drivers don't support it
Alan Stern [Wed, 21 Dec 2005 22:28:11 +0000 (14:28 -0800)]
[PATCH] usbcore: allow suspend/resume even if drivers don't support it

This patch (as618) changes usbcore to prevent derailing the
suspend/resume sequence when a USB driver doesn't include support for
it.  This is a workaround rather than a true fix; the core needs to be
changed so that URB submissions from suspended drivers can be refused
and outstanding URBs cancelled.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] USB Storage: Force starget->scsi_level in usb-storage scsiglue.c
Paul Walmsley [Wed, 21 Dec 2005 22:28:06 +0000 (14:28 -0800)]
[PATCH] USB Storage: Force starget->scsi_level in usb-storage scsiglue.c

When the usb-storage module forces sdev->scsi_level to SCSI_2, it should
also force starget->scsi_level to the same value.  Otherwise, the SCSI
layer may attempt to issue SCSI-3 commands to the device, such as REPORT
LUNS, which it cannot handle.  This can prevent the device from working
with Linux.

The AMS Venus DS3 DS2316SU2S SATA-to-SATA+USB enclosure, based on the
Oxford Semiconductor OXU921S chip, requires this patch to function
correctly on Linux.  The enclosure reports a SCSI-3 SPC-2 command set
level, but does not correctly handle the REPORT LUNS SCSI command -
probably due to a bug in its firmware.

It seems likely that other USB storage enclosures with similar bugs will
also benefit from this patch.

Tony Lindgren <tony@atomide.com> collaborated in the development of this
patch.

Signed-off-by: Paul Walmsley <paul@booyaka.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] include/linux/irq.h: #include <linux/smp.h>
Adrian Bunk [Wed, 21 Dec 2005 01:27:50 +0000 (02:27 +0100)]
[PATCH] include/linux/irq.h: #include <linux/smp.h>

Jan's crosscompile page [1] shows, that one regression in 2.6.15-rc is
that the v850 defconfig does no longer compile.

The compile error is:

<--  snip  -->

...
  CC      arch/v850/kernel/setup.o
In file included from /usr/src/ctest/rc/kernel/arch/v850/kernel/setup.c:17:
/usr/src/ctest/rc/kernel/include/linux/irq.h:13:43: asm/smp.h: No such file or directory
make[2]: *** [arch/v850/kernel/setup.o] Error 1

<--  snip  -->

The #include <asm/smp.h> in irq.h was intruduced in 2.6.15-rc.

Since include/linux/irq.h needs code from asm/smp.h only in the
CONFIG_SMP=y case and linux/smp.h #include's asm/smp.h only in the
CONFIG_SMP=y case, I'm suggesting this patch to #include <linux/smp.h>
in irq.h.

I've tested the compilation with both CONFIG_SMP=y and CONFIG_SMP=n
on i386.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Wed, 21 Dec 2005 19:05:15 +0000 (11:05 -0800)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

18 years ago[IPV6]: Don't select a tentative address as a source address.
YOSHIFUJI Hideaki [Wed, 21 Dec 2005 13:58:01 +0000 (22:58 +0900)]
[IPV6]: Don't select a tentative address as a source address.

A tentative address is not considered "assigned to an interface"
in the traditional sense (RFC2462 Section 4).
Don't try to select such an address for the source address.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18 years ago[IPV6]: Run DAD when the link becomes ready.
YOSHIFUJI Hideaki [Wed, 21 Dec 2005 13:57:44 +0000 (22:57 +0900)]
[IPV6]: Run DAD when the link becomes ready.

If the link was not available when the interface was created,
run DAD for pending tentative addresses when the link becomes ready.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18 years ago[IPV6]: Defer IPv6 device initialization until the link becomes ready.
YOSHIFUJI Hideaki [Wed, 21 Dec 2005 13:57:24 +0000 (22:57 +0900)]
[IPV6]: Defer IPv6 device initialization until the link becomes ready.

NETDEV_UP might be sent even if the link attached to the interface was
not ready.  DAD does not make sense in such case, so we won't do so.
After interface

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18 years ago[IPV6]: Try not to send icmp to anycast address.
YOSHIFUJI Hideaki [Wed, 21 Dec 2005 13:57:06 +0000 (22:57 +0900)]
[IPV6]: Try not to send icmp to anycast address.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18 years ago[IPV6]: Flag RTF_ANYCAST for anycast routes.
YOSHIFUJI Hideaki [Wed, 21 Dec 2005 13:56:42 +0000 (22:56 +0900)]
[IPV6]: Flag RTF_ANYCAST for anycast routes.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Wed, 21 Dec 2005 01:33:54 +0000 (17:33 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

18 years ago[PATCH] relayfs: remove warning printk() in relay_switch_subbuf()
Tom Zanussi [Tue, 20 Dec 2005 19:10:22 +0000 (13:10 -0600)]
[PATCH] relayfs: remove warning printk() in relay_switch_subbuf()

There's currently a diagnostic printk in relay_switch_subbuf() meant as
a warning if you accidentally try to log an event larger than the
sub-buffer size.

The problem is if this happens while logging from somewhere it's not
safe to be doing printks, such as in the scheduler, you can end up with
a deadlock.  This patch removes the warning from relay_switch_subbuf()
and instead prints some diagnostic info when the channel is closed.

Thanks to Mathieu Desnoyers for pointing out the problem and
suggesting a fix.

Signed-off-by: Tom Zanussi <zanussi@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[SPARC64]: Stop putting -finline-limit=XXX into CFLAGS
David S. Miller [Tue, 20 Dec 2005 22:53:05 +0000 (14:53 -0800)]
[SPARC64]: Stop putting -finline-limit=XXX into CFLAGS

It was a stupid workaround for the "static inline" vs.
"extern inline" issues of long ago, and it is what causes
schedule() to be inlined like crazy into kernel/sched.c
when -Os is specified.

MIPS and S390 should probably do the same.

Now CC_OPTIMIZE_FOR_SIZE can be safely used on sparc64
once more.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[PATCH] fix spinlock-debugging smp_processor_id() usage
Ingo Molnar [Tue, 20 Dec 2005 10:54:17 +0000 (11:54 +0100)]
[PATCH] fix spinlock-debugging smp_processor_id() usage

When a spinlock debugging check hits, we print the CPU number as an
informational thing - but there is no guarantee that preemption is off
at that point - hence we should use raw_smp_processor_id().  Otherwise
DEBUG_PREEMPT will print a warning.

With this fix the warning goes away and only the spinlock-debugging info
is printed.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix build with CONFIG_PCI_MMCONFIG
Andi Kleen [Tue, 20 Dec 2005 06:23:47 +0000 (07:23 +0100)]
[PATCH] Fix build with CONFIG_PCI_MMCONFIG

Now needs to include the type 1 functions ("direct") too.

Reported by Pavel Roskin <proski@gnu.org>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] nfsd: check for read-only exports before setting acls
Andreas Gruenbacher [Tue, 20 Dec 2005 15:29:05 +0000 (16:29 +0100)]
[PATCH] nfsd: check for read-only exports before setting acls

We must check for MAY_SATTR before setting acls, which includes checking
for read-only exports: the lower-level setxattr operation that
eventually sets the acl cannot check export-level restrictions.

Bug reported by Martin Walter <mawa@uni-freiburg.de>.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] kernel/params.c: fix sysfs access with CONFIG_MODULES=n
Jason Wessel [Tue, 20 Dec 2005 14:21:24 +0000 (15:21 +0100)]
[PATCH] kernel/params.c: fix sysfs access with CONFIG_MODULES=n

All the work was done to setup the file and maintain the file handles but
the access functions were zeroed out due to the #ifdef.  Removing the
#ifdef allows full access to all the parameters when CONFIG_MODULES=n.

akpm: put it back again, but use CONFIG_SYSFS instead.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix swiotlb pci_map_sg error handling
Andi Kleen [Tue, 20 Dec 2005 13:45:19 +0000 (14:45 +0100)]
[PATCH] Fix swiotlb pci_map_sg error handling

The overflow checking condition in lib/swiotlb.c was wrong.
It would first run a NULL pointer through virt_to_phys before
testing it. Since pci_map_sg overflow is not that uncommon
and causes data corruption (including broken file systems) when not
properly detected I think it's better to fix it in 2.6.15.

This affects x86-64 and IA64.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Fix framebuffer console upside-down ywrap scrolling
Knut Petersen [Tue, 20 Dec 2005 07:18:09 +0000 (08:18 +0100)]
[PATCH] Fix framebuffer console upside-down ywrap scrolling

Whenever ywrap scrolling is selected together with 180 degree screen
rotation, 2.6.15-rc6 and earlier versions are broken.  fb_pan_display()
expects non-negative yoffsets, but ud_update_start() calls it with
yoffsets down to -(yres - font height).  This patch transforms yoffset
to the correct range 0 ...  vyres-1.

Some obviously unneeded parentheses are removed, too.

Verified with cyblafb, should be applied before 2.6.15-final because it
does fix the framebuffer rotation code introduced early in the 2.6.15
release cycle.

Signed-off-by: Knut Petersen <Knut_Petersen@t-online.de>
Acked-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Tue, 20 Dec 2005 17:41:25 +0000 (09:41 -0800)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

18 years agoMerge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
Linus Torvalds [Tue, 20 Dec 2005 17:35:05 +0000 (09:35 -0800)]
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6

18 years ago[PATCH] intelfb: Fix oops when changing video mode
Antonino A. Daplas [Mon, 19 Dec 2005 07:11:49 +0000 (15:11 +0800)]
[PATCH] intelfb: Fix oops when changing video mode

Reported by: janis huang (Bugzilla Bug 5747)

Fix on oops in intelfb.  Not sure what's happening, looks like
dinfo->name pointer is invalidated after initialization.  Remove
intelfb_get_fix, it's not needed and move the majority of the code to
the initialization routine.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] intelfb: Fix freeing of nonexistent resource
Antonino A. Daplas [Mon, 19 Dec 2005 07:11:40 +0000 (15:11 +0800)]
[PATCH] intelfb: Fix freeing of nonexistent resource

Fix intelfb trying to free a non-existent resource in its error path.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] powerpc: g5 thermal overtemp bug
Benjamin Herrenschmidt [Mon, 19 Dec 2005 00:24:53 +0000 (11:24 +1100)]
[PATCH] powerpc: g5 thermal overtemp bug

The g5 thermal control for liquid cooled machines has a small bug, when
the temperatures gets too high, it boosts all fans to the max, but
incorrectly sets the liquids pump to the min instead of the max speed,
thus causing the overtemp condition not to clear and the machine to shut
down after a while. This fixes it to set the pumps to max speed instead.
This problem might explain some of the reports of random shutdowns that
some g5 users have been reporting in the past.

Many thanks to Marcus Rothe for spending a lot of time trying various
patches & sending log logs before I found out that typo. Note that
overtemp handling is still not perfect and the machine might still
shutdown, that patch should reduce if not eliminate such occcurences in
"normal" conditions with high load. I'll implement a better handling
with proper slowing down of the CPUs later.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agopowerpc: update defconfigs
Paul Mackerras [Tue, 20 Dec 2005 05:00:17 +0000 (16:00 +1100)]
powerpc: update defconfigs

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years ago[PATCH] powerpc: CPM2 interrupt handler failure after 100,000 interrupts
Edson Seabra [Mon, 19 Dec 2005 15:16:50 +0000 (09:16 -0600)]
[PATCH] powerpc: CPM2 interrupt handler failure after 100,000 interrupts

The CPM2 interrupt handler does not return success to the IRQ subsystem, which
causes it to kill the IRQ line after 100,000 interrupts.

Signed-off-by: Edson Seabra <Edson.Seabra@cyclades.com>
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agopowerpc: correct register usage in 64-bit syscall exit path
Paul Mackerras [Tue, 20 Dec 2005 04:38:47 +0000 (15:38 +1100)]
powerpc: correct register usage in 64-bit syscall exit path

Since we don't restore the volatile registers in the syscall exit
path, we need to make sure we don't leak any potentially interesting
values from the kernel to userspace.  This was already the case for
all except r11.  This makes it use r11 for an MSR value, so r11 will
have an (uninteresting) MSR value in it on return to userspace.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 years agoNLM: Fix Oops in nlmclnt_mark_reclaim()
Trond Myklebust [Mon, 19 Dec 2005 22:11:25 +0000 (17:11 -0500)]
NLM: Fix Oops in nlmclnt_mark_reclaim()

 When mixing -olock and -onolock mounts on the same client, we have to
 check that fl->fl_u.nfs_fl.owner is set before dereferencing it.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
18 years agoSUNRPC: Fix "EPIPE" error on mount of rpcsec_gss-protected partitions
Trond Myklebust [Mon, 19 Dec 2005 22:11:22 +0000 (17:11 -0500)]
SUNRPC: Fix "EPIPE" error on mount of rpcsec_gss-protected partitions

 gss_create_upcall() should not error just because rpc.gssd closed the
 pipe on its end. Instead, it should requeue the pending requests and then
 retry.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
18 years agoNFS: Fix another O_DIRECT race
Trond Myklebust [Tue, 13 Dec 2005 21:13:54 +0000 (16:13 -0500)]
NFS: Fix another O_DIRECT race

 Ensure we call unmap_mapping_range() and sync dirty pages to disk before
 doing an NFS direct write.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
18 years agoRPC: Do not block on skb allocation
Trond Myklebust [Tue, 13 Dec 2005 21:13:52 +0000 (16:13 -0500)]
RPC: Do not block on skb allocation

 If we get something like the following,
 [  125.300636]  [<c04086e1>] schedule_timeout+0x54/0xa5
 [  125.305931]  [<c040866e>] io_schedule_timeout+0x29/0x33
 [  125.311495]  [<c02880c4>] blk_congestion_wait+0x70/0x85
 [  125.317058]  [<c014136b>] throttle_vm_writeout+0x69/0x7d
 [  125.322720]  [<c014714d>] shrink_zone+0xe0/0xfa
 [  125.327560]  [<c01471d4>] shrink_caches+0x6d/0x6f
 [  125.332581]  [<c01472a6>] try_to_free_pages+0xd0/0x1b5
 [  125.338056]  [<c013fa4b>] __alloc_pages+0x135/0x2e8
 [  125.343258]  [<c03b74ad>] tcp_sendmsg+0xaa0/0xb78
 [  125.348281]  [<c03d4666>] inet_sendmsg+0x48/0x53
 [  125.353212]  [<c0388716>] sock_sendmsg+0xb8/0xd3
 [  125.358147]  [<c0388773>] kernel_sendmsg+0x42/0x4f
 [  125.363259]  [<c038bc00>] sock_no_sendpage+0x5e/0x77
 [  125.368556]  [<c03ee7af>] xs_tcp_send_request+0x2af/0x375
 then the socket is blocked until memory is reclaimed, and no
 progress can ever be made.

 Try to access the emergency pools by using GFP_ATOMIC.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
18 years agoMerge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Linus Torvalds [Tue, 20 Dec 2005 02:34:37 +0000 (18:34 -0800)]
Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

18 years ago[PATCH] md: Change case of raid level reported in sys/mdX/md/level
Neil Brown [Tue, 20 Dec 2005 00:07:00 +0000 (11:07 +1100)]
[PATCH] md: Change case of raid level reported in sys/mdX/md/level

I had thought that keeping the reported tail level clearly different
from the module name was a good idea, but I've changed my mind.

'raid5' is better and probably less confusing than 'RAID-5'.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] block: Cleanup CDROMEJECT ioctl
Ben Collins [Mon, 19 Dec 2005 19:49:24 +0000 (11:49 -0800)]
[PATCH] block: Cleanup CDROMEJECT ioctl

This is just a basic cleanup. No change in functionality.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6
Linus Torvalds [Tue, 20 Dec 2005 00:46:14 +0000 (16:46 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 20 Dec 2005 00:43:57 +0000 (16:43 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 20 Dec 2005 00:43:36 +0000 (16:43 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Tue, 20 Dec 2005 00:43:13 +0000 (16:43 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

18 years ago[TG3]: Fix ethtool memory test
Michael Chan [Tue, 20 Dec 2005 00:27:28 +0000 (16:27 -0800)]
[TG3]: Fix ethtool memory test

Skip the memory 0xb50 to 0x1000 during "ethtool -t" memory test.
Overwriting memory in this region can cause ASF problems.

Update version and release date.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[TG3]: Add tw32_wait_f() for some sensitive registers
Michael Chan [Tue, 20 Dec 2005 00:27:04 +0000 (16:27 -0800)]
[TG3]: Add tw32_wait_f() for some sensitive registers

The tw32_f() function (register write with immediate read flush) can
hang when used on some registers to switch clock frequencies and
power. A new tw32_wait_f() is added for such registers with the
delay before the read and after the read.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[TG3]: Some low power fixes
Michael Chan [Tue, 20 Dec 2005 00:26:28 +0000 (16:26 -0800)]
[TG3]: Some low power fixes

Add some missing workarounds in tg3_set_power_state():

1. Workaround to prevent overdrawing current on 5714.

2. Do not power down 5700's PHY because of hw limitation.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[TG3]: Fix peer device handling
Michael Chan [Tue, 20 Dec 2005 00:26:02 +0000 (16:26 -0800)]
[TG3]: Fix peer device handling

Locate the pdev_peer for dual port 5714 NIC devices in addition to
5704 devices. The name is also changed to tg3_find_peer() from
tg3_find_5704_peer(). It is also necessary to call netdev_priv() to
get to the peer's private tg3 structure.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SPARC]: Fix RTC build failure.
Adrian Bunk [Mon, 19 Dec 2005 22:52:24 +0000 (14:52 -0800)]
[SPARC]: Fix RTC build failure.

On sparc and sparc64, the rtc driver doesn't compile with PCI support
disabled.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SCTP]: Fix sctp to not return erroneous POLLOUT events.
Neil Horman [Mon, 19 Dec 2005 22:24:40 +0000 (14:24 -0800)]
[SCTP]: Fix sctp to not return erroneous POLLOUT events.

Make sctp_writeable() use sk_wmem_alloc rather than sk_wmem_queued to
determine the sndbuf space available. It also removes all the modifications
to sk_wmem_queued as it is not currently used in SCTP.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IPSEC]: Perform SA switchover immediately.
David S. Miller [Mon, 19 Dec 2005 22:23:23 +0000 (14:23 -0800)]
[IPSEC]: Perform SA switchover immediately.

When we insert a new xfrm_state which potentially
subsumes an existing one, make sure all cached
bundles are flushed so that the new SA is used
immediately.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[ARM] 3210/1: add missing memory barrier helper for NPTL support
Nicolas Pitre [Mon, 19 Dec 2005 22:20:51 +0000 (22:20 +0000)]
[ARM] 3210/1: add missing memory barrier helper for NPTL support

Patch from Nicolas Pitre

Strictly speaking, the NPTL kernel helpers are required for pre ARMv6
only.  They are available on ARMv6+ as well for obvious compatibility
reasons.  However there are cases where extra memory barriers are needed
when using an SMP ARMv6 machine but not on pre-ARMv6.

This patch adds a memory barrier kernel helper that glibc can use as
needed for pre-ARMv6 binaries to be forward compatible with an SMP
kernel on ARMv6, as well as the necessary dmb instructions to the
cmpxchg helper.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[XFRM]: Handle DCCP in xfrm{4,6}_decode_session
Patrick McHardy [Mon, 19 Dec 2005 22:03:46 +0000 (14:03 -0800)]
[XFRM]: Handle DCCP in xfrm{4,6}_decode_session

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IPV6]: Fix route lifetime.
YOSHIFUJI Hideaki [Mon, 19 Dec 2005 22:02:45 +0000 (14:02 -0800)]
[IPV6]: Fix route lifetime.

The route expiration time is stored in rt6i_expires in jiffies.
The argument of rt6_route_add() for adding a route is not the
expiration time in jiffies nor in clock_t, but the lifetime
(or time left before expiration) in clock_t.

Because of the confusion, we sometimes saw several strange errors
(FAILs) in TAHI IPv6 Ready Logo Phase-2 Self Test.
The symptoms were analyzed by Mitsuru Chinen <CHINEN@jp.ibm.com>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[BRIDGE-NF]: Fix bridge-nf ipv6 length check
Bart De Schuymer [Mon, 19 Dec 2005 22:00:08 +0000 (14:00 -0800)]
[BRIDGE-NF]: Fix bridge-nf ipv6 length check

A typo caused some bridged IPv6 packets to get dropped randomly,
as reported by Sebastien Chaumontet. The patch below fixes this
(using skb->nh.raw instead of raw) and also makes the jumbo packet
length checking up-to-date with the code in
net/ipv6/exthdrs.c::ipv6_hop_jumbo.

Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h
Kristian Slavov [Mon, 19 Dec 2005 21:54:44 +0000 (13:54 -0800)]
[RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h

I reported a problem and gave hints to the solution, but nobody seemed
to react. So I prepared a patch against 2.6.14.4.

Tested on 2.6.14.4 with "ip monitor addr" and with the program
attached, while adding and removing IPv6 address. Both programs didn't
receive any messages.  Tested 2.6.14.4 + this patch, and both programs
received add and remove messages.

Signed-off-by: Kristian Slavov <kristian.slavov@nomadiclab.com>
Acked-by: Jamal Hadi salim <hadi@cyberus.ca>
ACKed-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE
Patrick McHardy [Mon, 19 Dec 2005 21:53:26 +0000 (13:53 -0800)]
[NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE

IP6_NF_TARGET_NFQUEUE depends on IP6_NF_IPTABLES, not IP_NF_IPTABLES.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETFILTER]: Fix NAT init order
Patrick McHardy [Mon, 19 Dec 2005 21:53:09 +0000 (13:53 -0800)]
[NETFILTER]: Fix NAT init order

As noticed by Phil Oester, the GRE NAT protocol helper is initialized
before the NAT core, which makes registration fail.

Change the linking order to make NAT be initialized first.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[PATCH] V4L/DVB SCM Maintainers Update
Mauro Carvalho Chehab [Mon, 19 Dec 2005 11:15:13 +0000 (09:15 -0200)]
[PATCH] V4L/DVB SCM Maintainers Update

- This patch updates MAINTAINERS file by replacing quilt to git SCM

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
18 years ago[PATCH] V4L/DVB (3189): Fix a broken logic that didn't cover all standards.
Mauro Carvalho Chehab [Mon, 19 Dec 2005 10:54:11 +0000 (08:54 -0200)]
[PATCH] V4L/DVB (3189): Fix a broken logic that didn't cover all standards.

- Fix a broken logic that didn't cover all standards.
- Fix compilation failure with gcc 2.95.3.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
18 years ago[PATCH] V4L/DVB (3181): Enable SPDIF output for DVB-S rev 2.3
Oliver Endriss [Mon, 19 Dec 2005 10:54:11 +0000 (08:54 -0200)]
[PATCH] V4L/DVB (3181): Enable SPDIF output for DVB-S rev 2.3

- Enable SPDIF output for DVB-S rev 2.3. Firmware 2623 or higher required.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
18 years ago[PATCH] V4L/DVB (3180): Fix tuner 100 definition for hauppauge eeprom
Ricardo Cerqueira [Mon, 19 Dec 2005 10:54:11 +0000 (08:54 -0200)]
[PATCH] V4L/DVB (3180): Fix tuner 100 definition for hauppauge eeprom

- Tuner 100 is the TUNER_PHILIPS_FMD1216ME_MK3, not TUNER_ABSENT. This
was causing the tuner module to be skipped, and rendered boards with this
value in the eeprom (like the HVR1100) unable to tune

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
18 years ago[PATCH] V4L/DVB (3188): Fix compilation failure with gcc 2.95.3.
Jean Delvare [Mon, 19 Dec 2005 10:53:59 +0000 (08:53 -0200)]
[PATCH] V4L/DVB (3188): Fix compilation failure with gcc 2.95.3.

- Fix compilation failure with gcc 2.95.3.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
18 years agoLinux v2.6.15-rc6 v2.6.15-rc6
Linus Torvalds [Mon, 19 Dec 2005 00:36:54 +0000 (16:36 -0800)]
Linux v2.6.15-rc6

Also renamed in honor of Portland being snowed in and everybody sliding
around on the highways like greased pumpkins.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
Linus Torvalds [Mon, 19 Dec 2005 00:31:56 +0000 (16:31 -0800)]
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394

18 years ago[PATCH] mtd onenand driver: use platform_device.h instead device.h
Kyungmin Park [Fri, 16 Dec 2005 02:17:29 +0000 (11:17 +0900)]
[PATCH] mtd onenand driver: use platform_device.h instead device.h

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] mtd onenand driver: reduce stack usage
Kyungmin Park [Fri, 16 Dec 2005 02:17:29 +0000 (11:17 +0900)]
[PATCH] mtd onenand driver: reduce stack usage

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] mtd onenand driver: fix unlock problem in DDP
Kyungmin Park [Fri, 16 Dec 2005 02:17:29 +0000 (11:17 +0900)]
[PATCH] mtd onenand driver: fix unlock problem in DDP

18 years ago[PATCH] mtd onenand driver: check correct manufacturer
Kyungmin Park [Fri, 16 Dec 2005 02:17:29 +0000 (11:17 +0900)]
[PATCH] mtd onenand driver: check correct manufacturer

This (and the three subsequent patches) is working well on OMAP H4 with
2.6.15-rc4 kernel and passes the LTP fs test.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] radeon drm: fix compilation breakage with gcc 2.95.3
Jean Delvare [Sat, 17 Dec 2005 22:20:55 +0000 (23:20 +0100)]
[PATCH] radeon drm: fix compilation breakage with gcc 2.95.3

Fix a typo which breaks radeon drm compilation with gcc 2.95.3.

The offending line was added back in 2.6.11-rc3, but was harmless
back then. A recent addition nearby changed it into a compilation
breaker: commit 281ab031a8c9e5b593142eb4ec59a87faae8676a.

The doubled semi-colon ends up being an empty instruction, and the
variable declaration thus ends up being in the middle of "code".

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Input: fix an OOPS in HID driver
Dmitry Torokhov [Sat, 17 Dec 2005 16:42:54 +0000 (11:42 -0500)]
[PATCH] Input: fix an OOPS in HID driver

This patch fixes an OOPS in HID driver when connecting simulation
devices generating unknown simulation events.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml skas0: stop gcc's insanity
Jeff Dike [Sun, 18 Dec 2005 16:50:39 +0000 (17:50 +0100)]
[PATCH] uml skas0: stop gcc's insanity

With Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

UML skas0 stub has been miscompiling for many people (incidentally not
the authors), depending on the used GCC versions.

I think (and testing on some GCC versions shows) this patch avoids the
fundamental issue which is behind this, namely gcc using the stack when
we have just replaced it, behind gcc's back.  The remapping and storage
of the return value is hidden in a blob of asm, hopefully giving gcc no
room for creativity.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml - fix some funkiness in Kconfig
Paolo 'Blaisorblade' Giarrusso [Sun, 18 Dec 2005 16:50:37 +0000 (17:50 +0100)]
[PATCH] uml - fix some funkiness in Kconfig

So you may have seen the miniconfig stuff wander by, which means that my
build script exits if there's a .config error, and we have this:

  fs/Kconfig:1749:warning: 'select' used by config symbol 'CIFS_UPCALL'
refer to undefined symbol 'CONNECTOR'

This makes it shut up.

Signed-off-by: Rob Landley <rob@landley.net>
[ Verified it makes sense. ]
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: fix dynamic linking on some 64-bit distros
Rob Landley [Sun, 18 Dec 2005 16:50:35 +0000 (17:50 +0100)]
[PATCH] uml: fix dynamic linking on some 64-bit distros

With Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

The current UML build assumes that on x86-64 systems, /lib is a symlink
to /lib64, but in some distributions (like PLD and CentOS) they are
separate directories, so the 64 bit library loader isn't found.  This
patch inserts /lib64 at the start of the rpath on x86-64 UML builds.

Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: arch/um/scripts/Makefile.rules - remove duplicated code
Paolo 'Blaisorblade' Giarrusso [Sun, 18 Dec 2005 16:50:32 +0000 (17:50 +0100)]
[PATCH] uml: arch/um/scripts/Makefile.rules - remove duplicated code

Duplicated code - the patch adding it was probably applied twice without
enough care.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] dpt_i2o fix for deadlock condition
Salyzyn, Mark [Sun, 18 Dec 2005 03:26:30 +0000 (19:26 -0800)]
[PATCH] dpt_i2o fix for deadlock condition

Miquel van Smoorenburg <miquels@cistron.nl> forwarded me this fix to
resolve a deadlock condition that occurs due to the API change in
2.6.13+ kernels dropping the host locking when entering the error
handling.  They all end up calling adpt_i2o_post_wait(), which if you
call it unlocked, might return with host_lock locked anyway and that
causes a deadlock.

Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] i2o: Do not disable pci device when it's in use
Ben Collins [Sun, 18 Dec 2005 02:39:23 +0000 (18:39 -0800)]
[PATCH] i2o: Do not disable pci device when it's in use

When dpt_i2o is loaded first, i2o being loaded would cause it to call
pci_device_disable, thus breaking dpt_i2o's use of the device.  Based on
similar usage of pci_disable_device in other drivers.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[SCSI] fix scsi_reap_target() device_del from atomic context
James Bottomley [Fri, 16 Dec 2005 04:01:43 +0000 (20:01 -0800)]
[SCSI] fix scsi_reap_target() device_del from atomic context

scsi_reap_target() was desgined to be called from any context.
However it must do a device_del() of the target device, which may only
be called from user context.  Thus we have to reimplement
scsi_reap_target() via a workqueue.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[ARM] Fix sys_sendto and sys_recvfrom 6-arg syscalls
Russell King [Sat, 17 Dec 2005 15:25:42 +0000 (15:25 +0000)]
[ARM] Fix sys_sendto and sys_recvfrom 6-arg syscalls

Rather than providing more wrappers for 6-arg syscalls, arrange for
them to be supported as standard.  This just means that we always
store the 6th argument on the stack, rather than in the wrappers.

This means we eliminate the wrappers for:
* sys_futex
* sys_arm_fadvise64_64
* sys_mbind
* sys_ipc

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 16 Dec 2005 22:43:57 +0000 (14:43 -0800)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

18 years ago[PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix
Al Viro [Fri, 16 Dec 2005 22:35:23 +0000 (22:35 +0000)]
[PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix

DMA_MODE_{READ,WRITE} are declared in asm-powerpc/dma.h and their
declarations there match the definitions.  Old declarations in
ppc4xx_dma.h are not right anymore (wrong type, to start with).
Killed them, added include of asm/dma.h where needed.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] ppc: booke_wdt compile fix
Al Viro [Fri, 16 Dec 2005 22:35:28 +0000 (22:35 +0000)]
[PATCH] ppc: booke_wdt compile fix

booke_wdt.c had been missed in cpu_specs[] removal sweep

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Jody McIntyre [Fri, 16 Dec 2005 22:10:35 +0000 (17:10 -0500)]
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

18 years ago[PATCH] UHCI: add missing memory barriers
Alan Stern [Fri, 16 Dec 2005 19:09:01 +0000 (11:09 -0800)]
[PATCH] UHCI: add missing memory barriers

This patch (as617) adds a couple of memory barriers that Ben H. forgot in
his recent suspend/resume fix.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] PCI: Fix dumb bug in mmconfig fix
Andi Kleen [Fri, 16 Dec 2005 19:08:55 +0000 (11:08 -0800)]
[PATCH] PCI: Fix dumb bug in mmconfig fix

Use correct address when referencing mmconfig aperture while checking
for broken MCFG.  This was a typo when porting the code from 64bit to
32bit.  It caused oopses at boot on some ThinkPads.

Should definitely go into 2.6.15.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] PCI express must be initialized before PCI hotplug
Milton Miller [Fri, 16 Dec 2005 19:08:48 +0000 (11:08 -0800)]
[PATCH] PCI express must be initialized before PCI hotplug

PCI express hotplug uses the pcieportbus driver so pcie must be
initialized before hotplug/.  This patch changes the link order.

Signed-Off-By: Milton Miller <miltonm@bga.com>
Acked-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] i2c: Fix i2c-mv64xxx compilation error
Mark A. Greer [Fri, 16 Dec 2005 19:08:43 +0000 (11:08 -0800)]
[PATCH] i2c: Fix i2c-mv64xxx compilation error

The busses/i2c-mv64xxx.c driver doesn't currently compile because of an
incorrect argument to dev_err().  This patch fixes that.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[IA64] Add __read_mostly support for IA64
Christoph Lameter [Mon, 12 Dec 2005 17:34:32 +0000 (09:34 -0800)]
[IA64] Add __read_mostly support for IA64

sparc64, i386 and x86_64 have support for a special data section dedicated
to rarely updated data that is frequently read. The section was created to
avoid false sharing of those rarely read data with frequently written kernel
data.

This patch creates such a data section for ia64 and will group rarely written
data into this section.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years ago[IA64-SGI] change default_sn2 to NR_CPUS==1024
hawkes@sgi.com [Tue, 13 Dec 2005 21:45:44 +0000 (13:45 -0800)]
[IA64-SGI] change default_sn2 to NR_CPUS==1024

Change the NR_CPUS default for ia64/sn up to 1024.

Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: John Hesterberg <jh@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>