commit eb35cf60e462491249166182e3e755d3d5d91a28
tree b945656354b88e632716fa82572e4e6c732a5fd7
parent 8ab8fca2071cec559e4b77212cccffd150ce5ce7
author Stephen Hemminger <shemminger@osdl.org> Tue, 13 Jun 2006 17:17:31 +0900
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 13 Jun 2006 13:16:41 -0700
[PATCH] sky2: stop/start hardware idle timer on suspend/resume
The resume bug was caused not by an early interrupt but because the idle
timeout was not being stopped on suspend. Also disable hardware IRQ's
on suspend. Will need to revisit this with hotplug?
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8ab8fca2071cec559e4b77212cccffd150ce5ce7
tree c2eca699cd1c1ec57c19d1f89f77c6365724ced6
parent 26ec43f132d1cf282124a020b2bb5310496c9132
author Stephen Hemminger <shemminger@osdl.org> Tue, 13 Jun 2006 17:17:30 +0900
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 13 Jun 2006 13:16:41 -0700
[PATCH] sky2: save/restore base hardware irq during suspend/resume
The hardware should be fully shut off during suspend, and the base
irq mask restored during resume.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 26ec43f132d1cf282124a020b2bb5310496c9132
tree df15d8e8be20cde5f02db5546affb77fdd0cfbc4
parent f05267e7dee58741a4feb20d0351706ec64bb0b5
author Stephen Hemminger <shemminger@osdl.org> Tue, 13 Jun 2006 17:17:29 +0900
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 13 Jun 2006 13:16:41 -0700
[PATCH] sky2: fix hotplug detect during poll
If the poll routine detects no hardware available, it needs to dequeue
it self from the network poll list. Linus didn't understand NAPI.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f05267e7dee58741a4feb20d0351706ec64bb0b5
tree b99907cae2801309761a1c89bbd57e642c3aff24
parent 2ccc99b7b71976d15822ae7c41cd2ccda66d5076
author Stephen Hemminger <shemminger@osdl.org> Tue, 13 Jun 2006 17:17:28 +0900
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 13 Jun 2006 13:16:41 -0700
[PATCH] sky2: don't hard code number of ports
It is cleaner, to not loop over both ports if only one exists.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2ccc99b7b71976d15822ae7c41cd2ccda66d5076
tree 5dfe324f77344a8404333c986338abe93cb6c6bb
parent 5e625b0844435e0333670d9da633304169896740
author Stephen Hemminger <shemminger@osdl.org> Tue, 13 Jun 2006 17:17:27 +0900
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 13 Jun 2006 13:16:40 -0700
[PATCH] sky2: set_power_state should be void
The set power state function is cleaner if it doesn't return anything.
The only caller that could fail is in suspend() and it can check the argument
there.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5e625b0844435e0333670d9da633304169896740
tree 412a0f29ee143394bc4325dfb75fb70b082d9b03
parent 86bc843a268058df558844b6bf64531617fbc698
author Randy Dunlap <rdunlap@xenotime.net> Mon, 12 Jun 2006 15:13:40 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 15:17:53 -0700
[PATCH] alpha: generic hweight build fix
From: Randy Dunlap <rdunlap@xenotime.net>
According to include/asm-alpha/bitops.h, only ALPHA_EV67 has hardware
hweight support, so ALPHA_EV6 needs to use GENERIC_HWEIGHT.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Ernst Herzberg <earny@net4u.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 86bc843a268058df558844b6bf64531617fbc698
tree 159a320d16495b1328aa6c7822ebbb79c5375da7
parent cfd95a9cf58cd9e92d4c23b5ee20b07a3d121477
author Sergey Vlasov <vsu@altlinux.ru> Mon, 12 Jun 2006 21:53:23 +0100
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 14:29:04 -0700
[PATCH] tmpfs: Decrement i_nlink correctly in shmem_rmdir()
shmem_rmdir() must undo the increment of i_nlink done in
shmem_get_inode() for directories, otherwise at least
IN_DELETE_SELF inotify event generation is broken.
Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cfd95a9cf58cd9e92d4c23b5ee20b07a3d121477
tree 446977d54fcf1f9e3a5c3c2f6aea1f1b1ac2f806
parent 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6
author Robin H. Johnson <robbat2@gentoo.org> Mon, 12 Jun 2006 21:50:25 +0100
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 13:55:52 -0700
[PATCH] tmpfs: time granularity fix for [acm]time going backwards
I noticed a strange behavior in a tmpfs file system the other day, while
building packages - occasionally, and seemingly at random, make decided to
rebuild a target. However, only on tmpfs.
A file would be created, and if checked, it had a sub-second timestamp.
However, after an utimes related call where sub-seconds should be set, they
were zeroed instead. In the case that a file was created, and utimes(...,NULL)
was used on it in the same second, the timestamp on the file moved backwards.
After some digging, I found that this was being caused by tmpfs not having a
time granularity set, thus inheriting the default 1 second granularity.
Hugh adds: yes, we missed tmpfs when the s_time_gran mods went into 2.6.11.
Unfortunately, the granularity of CURRENT_TIME, often used in filesystems,
does not match the default granularity set by alloc_super. A few more such
discrepancies have been found, but this is the most important to fix now.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6
tree a64105f06bfdd583f2c58d225255769f50d18b62
parent a3b5960ebd660c9ab92fce9a01d1905ff9b981cb
parent ccefb5f3f60cd116d9a8ce2fa9e82e67206e49e5
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 13:46:43 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 13:46:43 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Do not double-export sys_close() when CONFIG_SOLARIS_EMUL_MODULE
commit a3b5960ebd660c9ab92fce9a01d1905ff9b981cb
tree f636ecb2ff88ae724243445b6eef2e6b2d773200
parent 37b0d1dedcedf555e2940bc7702c11e2b572299f
parent 42d1d52e695d87475846e9a09964cae1209eeecb
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 13:46:27 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 13:46:27 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4]: Increment ipInHdrErrors when TTL expires.
[TCP]: continued: reno sacked_out count fix
[DCCP] Ackvec: fix soft lockup in ackvec handling code
commit 37b0d1dedcedf555e2940bc7702c11e2b572299f
tree ce0b69ccd8f147d5eb7c4d75d45dbb67b4a4ff0a
parent d374c1c1281d6188a0d0676172b1c0e3de35c6e7
parent 56f1319e877a969b814b3805c77ea9c31d849f54
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 13:45:41 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 13:45:41 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix Integrator and Versatile interrupt initialisation
[ARM] 3546/1: PATCH: subtle lost interrupts bug on i.MX
[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
[ARM] Fix Neponset IRQ handling
commit 42d1d52e695d87475846e9a09964cae1209eeecb
tree 714c004023472c0858d047e9c918a189af5e77f8
parent 79320d7e14900c549c3520791a297328f53ff71e
author Weidong <weid@nanjing-fnst.com> Mon, 12 Jun 2006 13:09:59 -0700
committer David S. Miller <davem@davemloft.net> Mon, 12 Jun 2006 13:09:59 -0700
[IPV4]: Increment ipInHdrErrors when TTL expires.
Signed-off-by: Weidong <weid@nanjing-fnst.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d374c1c1281d6188a0d0676172b1c0e3de35c6e7
tree aeae46b8a329faa0ad7e51b8a1900c1d937f9836
parent 0e838b72d54ed189033939258a961f2a0cd59647
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 12:53:27 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 12:53:27 -0700
[sky2] Fix sky2 network driver suspend/resume
This fixes two independent problems: it would not save the PCI state on
suspend (and thus try to resume a nonexistent state on resume), and
while shut off, if an interrupt happened on the same shared irq, the irq
handler would react very badly to the interrupt status being an invalid
all-ones state.
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0e838b72d54ed189033939258a961f2a0cd59647
tree 461db801b2188e43f871c15804ea6d04d08f8327
parent 289a1e995e74734b5ec76ca8a5490058f4fecc24
parent 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 07:47:04 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 12 Jun 2006 07:47:04 -0700
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] sata_mv: grab host lock inside eng_timeout
commit 79320d7e14900c549c3520791a297328f53ff71e
tree bd2c9cc7f2d4b7790ad1e18fb9a00aad621c0354
parent afec35e3fee900b3016519d0b5512064e4625b2c
author Aki M Nyrhinen <anyrhine@cs.helsinki.fi> Sun, 11 Jun 2006 21:18:56 -0700
committer David S. Miller <davem@davemloft.net> Sun, 11 Jun 2006 21:18:56 -0700
[TCP]: continued: reno sacked_out count fix
From: Aki M Nyrhinen <anyrhine@cs.helsinki.fi>
IMHO the current fix to the problem (in_flight underflow in reno)
is incorrect. it treats the symptons but ignores the problem. the
problem is timing out packets other than the head packet when we
don't have sack. i try to explain (sorry if explaining the obvious).
with sack, scanning the retransmit queue for timed out packets is
fine because we know which packets in our retransmit queue have been
acked by the receiver.
without sack, we know only how many packets in our retransmit queue the
receiver has acknowledged, but no idea which packets.
think of a "typical" slow-start overshoot case, where for example
every third packet in a window get lost because a router buffer gets
full.
with sack, we check for timeouts on those every third packet (as the
rest have been sacked). the packet counting works out and if there
is no reordering, we'll retransmit exactly the packets that were
lost.
without sack, however, we check for timeout on every packet and end up
retransmitting consecutive packets in the retransmit queue. in our
slow-start example, 2/3 of those retransmissions are unnecessary. these
unnecessary retransmissions eat the congestion window and evetually
prevent fast recovery from continuing, if enough packets were lost.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit afec35e3fee900b3016519d0b5512064e4625b2c
tree 78e1fac9fe42700dd3d4a69aa219fdd0e0378f4d
parent 289a1e995e74734b5ec76ca8a5490058f4fecc24
author Andrea Bittau <a.bittau@cs.ucl.ac.uk> Sun, 11 Jun 2006 20:58:33 -0700
committer David S. Miller <davem@sunset.davemloft.net> Sun, 11 Jun 2006 21:08:03 -0700
[DCCP] Ackvec: fix soft lockup in ackvec handling code
A soft lockup existed in the handling of ack vector records.
Specifically, when a tail of the list of ack vector records was
removed, it was possible to end up iterating infinitely on an element
of the tail.
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ccefb5f3f60cd116d9a8ce2fa9e82e67206e49e5
tree 892103dc875cffcded5e10761b717660f500a71e
parent 289a1e995e74734b5ec76ca8a5490058f4fecc24
author David S. Miller <davem@sunset.davemloft.net> Sun, 11 Jun 2006 21:00:46 -0700
committer David S. Miller <davem@sunset.davemloft.net> Sun, 11 Jun 2006 21:05:25 -0700
[SPARC64]: Do not double-export sys_close() when CONFIG_SOLARIS_EMUL_MODULE
It is already exported by fs/open.c
Noticed by Ben Collins.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 289a1e995e74734b5ec76ca8a5490058f4fecc24
tree ada89355755d9ff4f5f3b77ced8483643a52e8b6
parent dc4967e756021f318d125c9f4fa98b958ae9f2de
author Paul Mackerras <paulus@samba.org> Mon, 12 Jun 2006 12:16:26 +1000
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 11 Jun 2006 20:40:39 -0700
[PATCH] Fix for the PPTP hangs that have been reported
People have been reporting that PPP connections over ptys, such as
used with PPTP, will hang randomly when transferring large amounts of
data, for instance in http://bugzilla.kernel.org/show_bug.cgi?id=6530.
I have managed to reproduce the problem, and the patch below fixes the
actual cause.
The problem is not in fact in ppp_async.c but in n_tty.c. What
happens is that when pptp reads from the pty, we call read_chan() in
drivers/char/n_tty.c on the master side of the pty. That copies all
the characters out of its buffer to userspace and then calls
check_unthrottle(), which calls the pty unthrottle routine, which
calls tty_wakeup on the slave side, which calls ppp_asynctty_wakeup,
which calls tasklet_schedule. So far so good. Since we are in
process context, the tasklet runs immediately and calls
ppp_async_process(), which calls ppp_async_push, which calls the
tty->driver->write function to send some more output.
However, tty->driver->write() returns zero, because the master
tty->receive_room is still zero. We haven't returned from
check_unthrottle() yet, and read_chan() only updates tty->receive_room
_after_ calling check_unthrottle. That means that the driver->write
call in ppp_async_process() returns 0. That would be fine if we were
going to get a subsequent wakeup call, but we aren't (we just had it,
and the buffer is now empty).
The solution is for n_tty.c to update tty->receive_room _before_
calling the driver unthrottle routine. The patch below does this.
With this patch I was able to transfer a 900MB file over a PPTP
connection (taking about 25 minutes), whereas without the patch the
connection would always stall in under a minute.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320
tree 1d2f66dcd86d4d7bf65f6628edd0e57cf3f35440
parent 650fb8382287f7990d5127a82a54295139224606
author Mark Lord <liml@rtr.ca> Wed, 07 Jun 2006 12:53:29 -0400
committer Jeff Garzik <jeff@garzik.org> Sun, 11 Jun 2006 23:03:18 -0400
[PATCH] sata_mv: grab host lock inside eng_timeout
Bug fix: mv_eng_timeout() calls mv_err_intr() without first grabbing the host lock,
which can lead to all sorts of interesting scenarios.
This whole error-handling portion of sata_mv is nasty (and will get fixed for
the new EH stuff), but for now this patch will help keep it on life-support.
Signed-off-by: Mark Lord <liml@rtr.ca>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
commit dc4967e756021f318d125c9f4fa98b958ae9f2de
tree 05f6a50d69356ead5e988b214ab5f664389010bd
parent c0bbbc73d58f1b774cd987b5687a478a027f137c
parent 8b8c8d280ab2d18fe6e42d671f60d4ffed451cdc
author Linus Torvalds <torvalds@g5.osdl.org> Sun, 11 Jun 2006 15:28:04 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 11 Jun 2006 15:28:04 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
[PATCH] PCI: reverse pci config space restore order
[PATCH] PCI: Improve PCI config space writeback
[PATCH] PCI: Error handling on PCI device resume
[PATCH] PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled
commit c0bbbc73d58f1b774cd987b5687a478a027f137c
tree b07538753116e6e4792e2a283318694e3cbbc614
parent 650fb8382287f7990d5127a82a54295139224606
author Christoph Lameter <clameter@sgi.com> Sun, 11 Jun 2006 15:22:26 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 11 Jun 2006 15:27:37 -0700
[PATCH] typo in vmscan.c
From: Christoph Lameter <clameter@sgi.com>
Looks like a comma was left from the conversion from a struct to an
assignment.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8b8c8d280ab2d18fe6e42d671f60d4ffed451cdc
tree 83702395aa09b3a4497758e3cf0e5c52761c798a
parent 04d9c1a1100b6bdeffa7e1bfc30080bdac28e183
author Yu, Luming <luming.yu@intel.com> Tue, 25 Apr 2006 00:00:34 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Sun, 11 Jun 2006 14:02:27 -0700
[PATCH] PCI: reverse pci config space restore order
According to Intel ICH spec, there are several rules that Base Address
should be programmed before IOSE (PCICMD register ) enabled.
For example ICH7:
12.1.3 SATA : the base address register for the bus master register
should be programmed before this bit is set.
11.1.3: PCICMD (USB): The base address register for USB should be
programmed before this bit is set.
....
To make sure kernel code follow this rule , and prevent unnecessary
confusion. I proposal this patch.
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 04d9c1a1100b6bdeffa7e1bfc30080bdac28e183
tree e061dccae70aa1f2faec0171d8e23d56ad2b9a80
parent 8d92bc2270d67a43b1d7e94a8cb6f81f1435fe9a
author Dave Jones <davej@redhat.com> Tue, 18 Apr 2006 21:06:51 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Sun, 11 Jun 2006 14:02:27 -0700
[PATCH] PCI: Improve PCI config space writeback
At least one laptop blew up on resume from suspend with a black screen due
to a lack of this patch. By only writing back config space that is
different, we minimise the possibility of accidents like this.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8d92bc2270d67a43b1d7e94a8cb6f81f1435fe9a
tree 62e1d36d17e7b20bf6530104059807242c91f96a
parent 0ce030395b92270567423d57d9d432eb77df32f2
author Jean Delvare <khali@linux-fr.org> Tue, 18 Apr 2006 14:49:56 +0200
committer Greg Kroah-Hartman <gregkh@suse.de> Sun, 11 Jun 2006 14:02:27 -0700
[PATCH] PCI: Error handling on PCI device resume
We currently don't handle errors properly when resuming a PCI device:
* In pci_default_resume() we capture the error code returned by
pci_enable_device() but don't pass it up to the caller.
Introduced by commit 95a629657dbe28e44a312c47815b3dc3f1ce0970
* In pci_resume_device(), the errors possibly returned by the driver's
.resume method or by the generic pci_default_resume() function are
ignored.
This patch fixes both issues.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0ce030395b92270567423d57d9d432eb77df32f2
tree 429e8fa32b90ebf0b801846b6945480fb950572c
parent 650fb8382287f7990d5127a82a54295139224606
author akpm@osdl.org <akpm@osdl.org> Sat, 13 May 2006 08:30:52 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Sun, 11 Jun 2006 14:02:27 -0700
[PATCH] PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled
Fix build error when CONFIG_ACPI not defined
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 650fb8382287f7990d5127a82a54295139224606
tree 81080f0fc0857524c0c22699d8c1160faf94ed14
parent 9145bcf63575a8b78590a5beaf604001e9c8d2ef
author Krzysztof Helt <krzysztof.h1@wp.pl> Sat, 10 Jun 2006 22:03:43 -0700
committer David S. Miller <davem@davemloft.net> Sat, 10 Jun 2006 22:03:43 -0700
[SPARC]: Migration cost tune up in sparc smp.
This patch sets the max_cache_size value required to tune up
scheduler in SMP systems. Otherwise, the calculated
migration_cost is too high and task scheduling may lock up.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9145bcf63575a8b78590a5beaf604001e9c8d2ef
tree 386b8c3cdea8cb0d3909e6bf7f30750ae0864ac6
parent 1f4d4a7e8f5a46929a987ec17987dbbdd73029d4
author David S. Miller <davem@sunset.davemloft.net> Sat, 10 Jun 2006 22:02:17 -0700
committer David S. Miller <davem@sunset.davemloft.net> Sat, 10 Jun 2006 22:02:17 -0700
[SPARC64]: Set appropriate max_cache_size.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1f4d4a7e8f5a46929a987ec17987dbbdd73029d4
tree 7925980f6295e6f3aba704f08837b03bf3578838
parent 938473b24636d77dc5e9c3f41090d071b6cf4389
parent 46b304934de417a2238d659ef6459a74cb3f5e6b
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 11:03:51 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 11:03:51 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Avoid JBUS errors on some Niagara systems.
[FUSION]: Fix mptspi.c build with CONFIG_PM not set.
[TG3]: Handle Sun onboard tg3 chips more correctly.
[SPARC64]: Dump local cpu registers in sun4v_log_error()
commit 938473b24636d77dc5e9c3f41090d071b6cf4389
tree 0a4146d723f52a87b7ec296227748da2ee1b677a
parent 57a62fed871eb2a95f296fe6c5c250ce21b81a79
author Milton Miller <miltonm@bga.com> Sat, 10 Jun 2006 09:54:16 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 11:02:05 -0700
[PATCH] powerpc: console_initcall ordering issues
From: Milton Miller <miltonm@bga.com>
The add_preferred_console call in rtas_console.c was not causing the
console to be selected. It turns out that the add_preferred_console was
being called after the hvc_console driver was registered. It only works
when it is called before the console driver is registered.
Reorder hvc_console.o after the hvc_console drivers to allow the selection
during console_initcall processing.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 57a62fed871eb2a95f296fe6c5c250ce21b81a79
tree 0e399966d58f7177e1c34a765e768e0865fc5813
parent a913f50706b21c7933f53cec678bb9a1c2383499
author Markus Lidel <Markus.Lidel@shadowconnect.com> Sat, 10 Jun 2006 09:54:14 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 11:02:05 -0700
[PATCH] I2O: Bugfixes to get I2O working again
From: Markus Lidel <Markus.Lidel@shadowconnect.com>
- Fixed locking of struct i2o_exec_wait in Executive-OSM
- Removed LCT Notify in i2o_exec_probe() which caused freeing memory and
accessing freed memory during first enumeration of I2O devices
- Added missing locking in i2o_exec_lct_notify()
- removed put_device() of I2O controller in i2o_iop_remove() which caused
the controller structure get freed to early
- Fixed size of mempool in i2o_iop_alloc()
- Fixed access to freed memory in i2o_msg_get()
See http://bugzilla.kernel.org/show_bug.cgi?id=6561
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a913f50706b21c7933f53cec678bb9a1c2383499
tree 4899980dac61984ea659eb878304a10868aa1b8f
parent 670bd95e0413c43f878b73a4a3919d1f452a4157
author Andrew Morton <akpm@osdl.org> Sat, 10 Jun 2006 09:54:13 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 11:02:05 -0700
[PATCH] powernow-k8 crash workaround
From: Andrew Morton <akpm@osdl.org>
Work around the oops reported in
http://bugzilla.kernel.org/show_bug.cgi?id=6478.
Thanks to Ralf Hildebrandt <ralf.hildebrandt@charite.de> for testing and
reporting.
Acked-by: Dave Jones <davej@codemonkey.org.uk>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 670bd95e0413c43f878b73a4a3919d1f452a4157
tree db7b05810c5cc61c89b856996174e31147611cba
parent d90d2c385d4d832428d1e51c2a7edeef39c822f5
author David Howells <dhowells@redhat.com> Sat, 10 Jun 2006 09:54:12 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 11:02:05 -0700
[PATCH] Further alterations for memory barrier document
From: David Howells <dhowells@redhat.com>
Apply some alterations to the memory barrier document that I worked out
with Paul McKenney of IBM, plus some of the alterations suggested by Alan
Stern.
The following changes were made:
(*) One of the examples given for what can happen with overlapping memory
barriers was wrong.
(*) The description of general memory barriers said that a general barrier is
a combination of a read barrier and a write barrier. This isn't entirely
true: it implies both, but is more than a combination of both.
(*) The first example in the "SMP Barrier Pairing" section was wrong: the
loads around the read barrier need to touch the memory locations in the
opposite order to the stores around the write barrier.
(*) Added a note to make explicit that the loads should be in reverse order to
the stores.
(*) Adjusted the diagrams in the "Examples Of Memory Barrier Sequences"
section to make them clearer. Added a couple of diagrams to make it more
clear as to how it could go wrong without the barrier.
(*) Added a section on memory speculation.
(*) Dropped any references to memory allocation routines doing memory
barriers. They may do sometimes, but it can't be relied on. This may be
worthy of further documentation later.
(*) Made the fact that a LOCK followed by an UNLOCK should not be considered a
full memory barrier more explicit and gave an example.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d90d2c385d4d832428d1e51c2a7edeef39c822f5
tree 979edd96372170564f8b0f9b2e230dc0cde85794
parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560
parent 133dda1e4f757e036fa838cba6804d0344931c4a
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 10:59:39 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 10 Jun 2006 10:59:39 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[PATCH] powerpc: Fix cell blade detection
[PATCH] powerpc: Fix call to ibm,client-architecture-support
powerpc: Fix machine check problem on 32-bit kernels
commit 56f1319e877a969b814b3805c77ea9c31d849f54
tree a7a03703cf04fae3db12b7b444ca9847f04618e3
parent e2f04e18941dbd3826901540a0be03f1728f8822
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sat, 10 Jun 2006 12:42:12 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat, 10 Jun 2006 12:42:12 +0100
[ARM] Fix Integrator and Versatile interrupt initialisation
Both Integrator and Versatile were using set_irq_handler() and
enable_irq(), and working around the initialisation of the
chained interrupt, instead of the more correct
set_irq_chained_handler() function. Fix Integrator and
Versatile to use the right function, and remove these work-arounds.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 46b304934de417a2238d659ef6459a74cb3f5e6b
tree 770b99e2723170f237d9159541484bba7dec21e8
parent c29ca9d1812f2abacaefa7daa31e085600128938
author David S. Miller <davem@sunset.davemloft.net> Sat, 10 Jun 2006 01:06:25 -0700
committer David S. Miller <davem@sunset.davemloft.net> Sat, 10 Jun 2006 01:06:25 -0700
[SPARC64]: Avoid JBUS errors on some Niagara systems.
Doing PCI config space accesses to non-present PCI slots
can result in fatal JBUS errors if the PCI config access
hypervisor call is performed on cpus other than the boot
cpu.
PCI config space accesses to present PCI slots works just
fine.
Recursively traverse the OBP device tree under the PCI
controller node and record all present device IDs into
a small hash table.
Avoid the hypervisor call for any PCI config space access
attempt for a device not recorded in the hash table.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c29ca9d1812f2abacaefa7daa31e085600128938
tree 31a68e2ee2c831d7fa098db0495ac19d6a7b38a9
parent f49639e643e69ff233b14966b8d48541d2e17517
author Tom "spot" Callaway <tcallawa@redhat.com> Fri, 09 Jun 2006 17:01:48 -0700
committer David S. Miller <davem@davemloft.net> Fri, 09 Jun 2006 17:01:48 -0700
[FUSION]: Fix mptspi.c build with CONFIG_PM not set.
Signed-off-by: Tom "spot" Callaway <tcallawa@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f49639e643e69ff233b14966b8d48541d2e17517
tree 8faeabd3bfc855f0a0a5a5a37d9fdbeed27a3f20
parent 5224e6cc3ab5ae03895bbb67f4a26ce72e62ce58
author David S. Miller <davem@sunset.davemloft.net> Fri, 09 Jun 2006 11:58:36 -0700
committer David S. Miller <davem@sunset.davemloft.net> Fri, 09 Jun 2006 12:03:51 -0700
[TG3]: Handle Sun onboard tg3 chips more correctly.
Get rid of all the SUN_570X logic and instead:
1) Make sure MEMARB_ENABLE is set when we probe the SRAM
for config information. If that is off we will get
timeouts.
2) Always try to sync with the firmware, if there is no
firmware running do not treat it as an error and instead
just report it the first time we notice this condition.
3) If there is no valid SRAM signature, assume the device
is onboard by setting TG3_FLAG_EEPROM_WRITE_PROT.
Update driver version and release date.
With help from Michael Chan and Fabio Massimo Di Nitto.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5224e6cc3ab5ae03895bbb67f4a26ce72e62ce58
tree a2e2ba48895d6f5dc36c9fa7317042c31b5b15e0
parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560
author David S. Miller <davem@sunset.davemloft.net> Tue, 06 Jun 2006 17:37:41 -0700
committer David S. Miller <davem@sunset.davemloft.net> Fri, 09 Jun 2006 12:03:49 -0700
[SPARC64]: Dump local cpu registers in sun4v_log_error()
This makes the debugging information more usable.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 133dda1e4f757e036fa838cba6804d0344931c4a
tree 1ca77025cb56fcacaee6f50501642784b568430e
parent 33b7497794424181dca87f18e43ecbc07f86bba5
author Arnd Bergmann <arnd@arndb.de> Wed, 07 Jun 2006 12:04:18 +1000
committer Paul Mackerras <paulus@samba.org> Fri, 09 Jun 2006 13:06:00 +1000
[PATCH] powerpc: Fix cell blade detection
The IBM Cell blade firmware might confuse the kernel to think it's a
pSeries machine. This fixes it for now. With a bit of luck, the firmware
will be updated to avoid that in the future but currently that patch is
needed.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 33b7497794424181dca87f18e43ecbc07f86bba5
tree bfcd314e42da1ef4098d272a7ab3f2f49da429a9
parent 7c85d1f9d358b24c5b05c3a2783a78423775a080
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Wed, 07 Jun 2006 12:01:32 +1000
committer Paul Mackerras <paulus@samba.org> Fri, 09 Jun 2006 13:05:51 +1000
[PATCH] powerpc: Fix call to ibm,client-architecture-support
The code in prom_init.c calling the firmware
ibm,client-architecture-support method on pSeries has a bug where it
fails to properly pass the instance handle of the firmware object when
trying to call a method. Result ranges from the call doing nothing to
the firmware crashing. (Found by Segher, thanks !)
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 7c85d1f9d358b24c5b05c3a2783a78423775a080
tree 71f92966cba279120cb81965cb3a5294295413ba
parent 1def630a6a49dda5bc89dfbd86656293640456f0
author Paul Mackerras <paulus@samba.org> Fri, 09 Jun 2006 13:02:59 +1000
committer Paul Mackerras <paulus@samba.org> Fri, 09 Jun 2006 13:02:59 +1000
powerpc: Fix machine check problem on 32-bit kernels
This fixes a bug found by Dave Jones that means that it is possible
for userspace to provoke a machine check on 32-bit kernels. This
also fixes a couple of other places where I found similar problems
by inspection.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 128e6ced247cda88f96fa9f2e4ba8b2c4a681560
tree 431e59010f5b22cf26eb5db29136dfeaba2fe0fa
parent bafe00cc9297ca77b66e5c83e5e65e17c0c997c8
parent cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a
author Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:16:35 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:16:35 -0700
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
e1000: remove risky prefetch on next_skb->data
e1000: fix ethtool test irq alloc as "probe"
[PATCH] bcm43xx: add DMA rx poll workaround to DMA4
commit bafe00cc9297ca77b66e5c83e5e65e17c0c997c8
tree c0478b45a084464c515a3201b109d7589773670b
parent 71601e2b33dad9acb8d7844f7321f90ed9d1bce8
author Martin Schwidefsky <schwidefsky@de.ibm.com> Thu, 08 Jun 2006 01:36:20 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:15:30 -0700
[PATCH] s390: fix in-user atomic futex operation.
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
__futex_atomic_op needs to do an atomic operation in the user address space,
not the kernel address space. Add the missing sacf 256/sacf 0 to switch to
the secondary mode before doing the compare-and-swap. In addition add
another fixup for catch specification exceptions if the compare-and-swap
address is not aligned.
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>
commit 71601e2b33dad9acb8d7844f7321f90ed9d1bce8
tree 5057391f7c99e207ca8a18c075bc2333b57d3e7f
parent bc1c116974a5c3f498112a6f175d3e4a8cd5bdbc
author Jens Axboe <axboe@suse.de> Thu, 08 Jun 2006 10:26:39 +0200
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:14:24 -0700
[PATCH] debugfs inode leak
Looking at the reiser4 crash, I found a leak in debugfs. In
debugfs_mknod(), we create the inode before checking if the dentry
already has one attached. We don't free it if that is the case.
These bugs happen quite often, I'm starting to think we should disallow
such coding in CodingStyle.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bc1c116974a5c3f498112a6f175d3e4a8cd5bdbc
tree 69ea68db91fb871cd24a0a5c5045abbe9c77bd3a
parent 26e780e8ef1cc3ef581a07aafe2346bb5a07b4f9
author Jens Axboe <axboe@suse.de> Thu, 08 Jun 2006 08:49:06 +0200
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:14:23 -0700
[PATCH] elevator switching race
There's a race between shutting down one io scheduler and firing up the
next, in which a new io could enter and cause the io scheduler to be
invoked with bad or NULL data.
To fix this, we need to maintain the queue lock for a bit longer.
Unfortunately we cannot do that, since the elevator init requires to be
run without the lock held. This isn't easily fixable, without also
changing the mempool API. So split the initialization into two parts,
and alloc-init operation and an attach operation. Then we can
preallocate the io scheduler and related structures, and run the attach
inside the lock after we detach the old one.
This patch has survived 30 minutes of 1 second io scheduler switching
with a very busy io load.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 26e780e8ef1cc3ef581a07aafe2346bb5a07b4f9
tree b62f2e5aceddd69e0671971bc84b709a5a9e3c26
parent 45b35a5ced474b9fbbbfcfd5cf346c432d28d9fd
author Malcom Parsons <malcolm.parsons@gmail.com> Thu, 08 Jun 2006 00:43:42 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:12:21 -0700
[PATCH] fbcon: fix limited scroll in SCROLL_PAN_REDRAW mode
From: Malcom Parsons <malcolm.parsons@gmail.com>
When scrolling up in SCROLL_PAN_REDRAW mode with a large limited scroll
region, the bottom few lines have to be redrawn. Without this patch, the
wrong text is drawn into these lines, corrupting the display.
Observed in 2.6.14 when running an IRC client in the Nintendo DS linux
port.
I haven't tested if scrolling down has the same problem.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 45b35a5ced474b9fbbbfcfd5cf346c432d28d9fd
tree a6570f00cb40b3e38c3db277e75547ed6f0e34d4
parent fd0a0ac1c5393b226640a30bae753983068136b3
author Ralf Baechle <ralf@linux-mips.org> Thu, 08 Jun 2006 00:43:41 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:12:21 -0700
[PATCH] Fix mempolicy.h build error
From: Ralf Baechle <ralf@linux-mips.org>
<linux/mempolicy.h> uses struct mm_struct and relies on a definition or
declaration somehow magically being dragged in which may result in a
build:
[...]
CC mm/mempolicy.o
In file included from mm/mempolicy.c:69:
include/linux/mempolicy.h:150: warning: ‘struct mm_struct’ declared inside parameter list
include/linux/mempolicy.h:150: warning: its scope is only this definition or declaration, which is probably not what you want
include/linux/mempolicy.h:175: warning: ‘struct mm_struct’ declared inside parameter list
mm/mempolicy.c:622: error: conflicting types for ‘do_migrate_pages’
include/linux/mempolicy.h:175: error: previous declaration of ‘do_migrate_pages’ was here
mm/mempolicy.c:1661: error: conflicting types for ‘mpol_rebind_mm’
include/linux/mempolicy.h:150: error: previous declaration of ‘mpol_rebind_mm’ was here
make[1]: *** [mm/mempolicy.o] Error 1
make: *** [mm] Error 2
[ralf@denk linux-ip35]$
Including <linux/sched.h> is a step into direction of include hell so
fixed by adding a forward declaration of struct mm_struct instead.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fd0a0ac1c5393b226640a30bae753983068136b3
tree 5d44c0bca57ec726be332338dad1935605e27d3c
parent a2ef3a50f19f64d350bdc0aa15c31ae4b8973f57
author Lennert Buytenhek <buytenh@wantstofly.org> Thu, 08 Jun 2006 00:43:40 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:12:21 -0700
[PATCH] ep93xx build fix
From: Lennert Buytenhek <buytenh@wantstofly.org>
The recent renaming of m48t86's ->readb() and ->writeb() platform driver
methods (2d7b20c1884777e66009be1a533641c19c4705f6) to ->readbyte() and
->writebyte() to fix the ia64 build broke the build of the cirrus ep93xx
ARM platform. This patch fixes it up.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a2ef3a50f19f64d350bdc0aa15c31ae4b8973f57
tree a34de089cfe8cf433eca46b0aaf3d81e208aae85
parent d44647b0a6e48d18a1402dfa9052d85c4fe98341
author Andy Currid <ACurrid@nvidia.com> Thu, 08 Jun 2006 00:43:39 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:12:21 -0700
[PATCH] Fix HPET operation on 64-bit NVIDIA platforms
From: "Andy Currid" <ACurrid@nvidia.com>
This patch fixes a kernel panic during boot that occurs on NVIDIA platforms
that have HPET enabled.
When HPET is enabled, the standard timer IRQ is routed to IOAPIC pin 2 and is
advertised as such in the ACPI APIC table - but an earlier workaround in the
kernel was ignoring this override. The fix is to honor timer IRQ overrides
from ACPI when HPET is detected on an NVIDIA platform.
Signed-off-by: Andy Currid <acurrid@nvidia.com>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Yu, Luming" <luming.yu@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d44647b0a6e48d18a1402dfa9052d85c4fe98341
tree b71d11af7eac501ba37d7ea45caecf5eb0a3cfe9
parent 1def630a6a49dda5bc89dfbd86656293640456f0
author Andy Currid <ACurrid@nvidia.com> Thu, 08 Jun 2006 00:43:38 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 08 Jun 2006 15:12:21 -0700
[PATCH] Fix HPET operation on 32-bit NVIDIA platforms
From: "Andy Currid" <ACurrid@nvidia.com>
This patch fixes a kernel panic during boot that occurs on NVIDIA platforms
that have HPET enabled.
When HPET is enabled, the standard timer IRQ is routed to IOAPIC pin 2 and is
advertised as such in the ACPI APIC table - but an earlier workaround in the
kernel was ignoring this override. The fix is to honor timer IRQ overrides
from ACPI when HPET is detected on an NVIDIA platform.
Signed-off-by: Andy Currid <acurrid@nvidia.com>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Yu, Luming" <luming.yu@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e2f04e18941dbd3826901540a0be03f1728f8822
tree 1a52bcac2d2f165089d7784025659f21e6db57b0
parent 0c27c5d5b93339df4def7ced77ea5be26df4d84b
author Matt Reimer <mreimer@vpop.net> Thu, 08 Jun 2006 22:46:48 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu, 08 Jun 2006 22:46:48 +0100
[ARM] 3546/1: PATCH: subtle lost interrupts bug on i.MX
Patch from Matt Reimer
There is a subtle bug in the GPIO interrupt status register
handling in arch/arm/mach-imx/irq.c:imx_gpio_ack_irq(). The
documentation states that a 1 should be written to the relevant bit to
acknowledge a GPIO interrupt, but that is not what the code does.
The problem is that the |= writes back 1s for all the *other*
interrupts represented in the register, so interrupts could get lost.
For example, if interrupts are pending for GPIO B10 and B12, ISR_B
would have the value 0x00001400. Then when the interrupt code handles
GPIO B10, it eventually calls imx_gpio_ack_irq(IRQ_GPIOB(10)), which
effectively does this:
ISR_B |= 1 << 10;
with the result that (0x00001400 | 0x00000400) is written, clearing
the interrupt status bits for *both* GPIO B10 and B12.
The fix is to write 1s only for the interrupts we want to clear.
The same problem seems to be occurring in the DMA code; this patch
does not address those issues.
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 0c27c5d5b93339df4def7ced77ea5be26df4d84b
tree 5b0c8efeb5b4b6cfd840c125a875c12fbecbf014
parent d782f33df706f1b8a4496b41fd7d339c6e23aa59
author Richard Purdie <rpurdie@rpsys.net> Thu, 08 Jun 2006 22:44:07 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu, 08 Jun 2006 22:44:07 +0100
[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
Patch from Richard Purdie
Add a power budget variable to the PXA OHCI platform data and add a
default value for the spitz platform(s) which prevents known failures
with certain USB devices.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a
tree ae1437d26c61392c7829a8b8d5c04a6c0772089f
parent 2e84abe742c42f7b063b141db55e5793ce4c502c
parent 24f476eeecba66524af3f95e31ac208eea99e617
author Jeff Garzik <jeff@garzik.org> Thu, 08 Jun 2006 15:49:36 -0400
committer Jeff Garzik <jeff@garzik.org> Thu, 08 Jun 2006 15:49:36 -0400
Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes
commit 2e84abe742c42f7b063b141db55e5793ce4c502c
tree 38ce19eb451b969389e456aa4d9bb7321626f481
parent 1def630a6a49dda5bc89dfbd86656293640456f0
parent ea9a7719597e81a119a155178eabfc941eef11cc
author Jeff Garzik <jeff@garzik.org> Thu, 08 Jun 2006 15:46:27 -0400
committer Jeff Garzik <jeff@garzik.org> Thu, 08 Jun 2006 15:46:27 -0400
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
commit d782f33df706f1b8a4496b41fd7d339c6e23aa59
tree ab3241bfff98d3114f5f1337ca3885720f396276
parent 1def630a6a49dda5bc89dfbd86656293640456f0
author Russell King <rmk@dyn-67.arm.linux.org.uk> Thu, 08 Jun 2006 17:59:31 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Thu, 08 Jun 2006 17:59:31 +0100
[ARM] Fix Neponset IRQ handling
While testing the genirq code on ARM, a condition was found whereby
the Neponset IRQ handler was being re-entered, causing the system
to deadlock.
Under the ARM IRQ code, this would not have been a visible problem
because the "simple" IRQ handling had no re-entrancy protection.
Resolve this by acknowledging the parent interrupt after we mask it
when we are going to handle one of our "special" level-based sources
(from ethernet or USAR chip.)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 24f476eeecba66524af3f95e31ac208eea99e617
tree bbcd87d78ea4bd38100645ca28797a5c3df9a741
parent b9b6e78b11de295ef073271979355d5fab71b877
author Auke Kok <auke-jan.h.kok@intel.com> Thu, 08 Jun 2006 09:28:47 -0700
committer Auke Kok <juke-jan.h.kok@intel.com> Thu, 08 Jun 2006 09:28:47 -0700
e1000: remove risky prefetch on next_skb->data
It was brought to our attention that the prefetches break e1000 traffic
on xscale/arm architectures. Remove them for now. We'll let them
stay in mm for a while, or find a better solution to enable.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
commit b9b6e78b11de295ef073271979355d5fab71b877
tree 63f35532786844d5a32e391e13e5bafe7bb6ef0f
parent e82b0f2cc21be905e504573483fa9542b15df96f
author Auke Kok <auke-jan.h.kok@intel.com> Thu, 08 Jun 2006 09:28:38 -0700
committer Auke Kok <juke-jan.h.kok@intel.com> Thu, 08 Jun 2006 09:28:38 -0700
e1000: fix ethtool test irq alloc as "probe"
New code added in 2.6.17 caused setup_irq to print a warning when
running ethtool -t eth0 offline.
This test marks the request_irq call made by this test as a "probe"
to see if the interrupt is shared or not.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
commit ea9a7719597e81a119a155178eabfc941eef11cc
tree f55cdd1138d851544beef3c12f991821aaead2cf
parent 672c6108a51bf559d19595d9f8193dfd81f0f752
author Michael Buesch <mb@bu3sch.de> Sun, 04 Jun 2006 02:20:42 +0200
committer John W. Linville <linville@tuxdriver.com> Mon, 05 Jun 2006 15:28:56 -0400
[PATCH] bcm43xx: add DMA rx poll workaround to DMA4
Also add the Poll RX DMA Memory workaround to the DMA4
(xmitstatus) path.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>