From: Greg Kroah-Hartman Date: Tue, 10 Feb 2009 19:02:19 +0000 (-0800) Subject: start 2.6.28.5 review cycle X-Git-Tag: v2.6.27.16~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a29cc0666f9d83b65a9ffb1cf50d85ceb7e94084;p=thirdparty%2Fkernel%2Fstable-queue.git start 2.6.28.5 review cycle --- diff --git a/queue-2.6.28/acpi-disable-acpi-cleanly-when-bad-rsdp-found.patch b/review-2.6.28/acpi-disable-acpi-cleanly-when-bad-rsdp-found.patch similarity index 100% rename from queue-2.6.28/acpi-disable-acpi-cleanly-when-bad-rsdp-found.patch rename to review-2.6.28/acpi-disable-acpi-cleanly-when-bad-rsdp-found.patch diff --git a/queue-2.6.28/acpi-dock-don-t-eval-_sta-on-every-show_docked-sysfs-read.patch b/review-2.6.28/acpi-dock-don-t-eval-_sta-on-every-show_docked-sysfs-read.patch similarity index 100% rename from queue-2.6.28/acpi-dock-don-t-eval-_sta-on-every-show_docked-sysfs-read.patch rename to review-2.6.28/acpi-dock-don-t-eval-_sta-on-every-show_docked-sysfs-read.patch diff --git a/queue-2.6.28/acpi-enable-bit-11-in-_pdc-to-advertise-hw-coord.patch b/review-2.6.28/acpi-enable-bit-11-in-_pdc-to-advertise-hw-coord.patch similarity index 100% rename from queue-2.6.28/acpi-enable-bit-11-in-_pdc-to-advertise-hw-coord.patch rename to review-2.6.28/acpi-enable-bit-11-in-_pdc-to-advertise-hw-coord.patch diff --git a/queue-2.6.28/acpi-proc_dir_entry-video-vga-already-registered.patch b/review-2.6.28/acpi-proc_dir_entry-video-vga-already-registered.patch similarity index 100% rename from queue-2.6.28/acpi-proc_dir_entry-video-vga-already-registered.patch rename to review-2.6.28/acpi-proc_dir_entry-video-vga-already-registered.patch diff --git a/queue-2.6.28/acpi-skip-the-first-two-elements-in-the-_bcl-package.patch b/review-2.6.28/acpi-skip-the-first-two-elements-in-the-_bcl-package.patch similarity index 100% rename from queue-2.6.28/acpi-skip-the-first-two-elements-in-the-_bcl-package.patch rename to review-2.6.28/acpi-skip-the-first-two-elements-in-the-_bcl-package.patch diff --git a/queue-2.6.28/acpi-video-fix-reversed-brightness-behavior-on-thinkpad-sl-series.patch b/review-2.6.28/acpi-video-fix-reversed-brightness-behavior-on-thinkpad-sl-series.patch similarity index 100% rename from queue-2.6.28/acpi-video-fix-reversed-brightness-behavior-on-thinkpad-sl-series.patch rename to review-2.6.28/acpi-video-fix-reversed-brightness-behavior-on-thinkpad-sl-series.patch diff --git a/queue-2.6.28/acpica-fix-table-entry-truncation-calculation.patch b/review-2.6.28/acpica-fix-table-entry-truncation-calculation.patch similarity index 100% rename from queue-2.6.28/acpica-fix-table-entry-truncation-calculation.patch rename to review-2.6.28/acpica-fix-table-entry-truncation-calculation.patch diff --git a/queue-2.6.28/add-support-for-8-port-rs-232-mic-3620-from-advantech.patch b/review-2.6.28/add-support-for-8-port-rs-232-mic-3620-from-advantech.patch similarity index 100% rename from queue-2.6.28/add-support-for-8-port-rs-232-mic-3620-from-advantech.patch rename to review-2.6.28/add-support-for-8-port-rs-232-mic-3620-from-advantech.patch diff --git a/queue-2.6.28/agp-intel-add-support-for-g41-chipset.patch b/review-2.6.28/agp-intel-add-support-for-g41-chipset.patch similarity index 100% rename from queue-2.6.28/agp-intel-add-support-for-g41-chipset.patch rename to review-2.6.28/agp-intel-add-support-for-g41-chipset.patch diff --git a/queue-2.6.28/agp-intel-fix-broken-symbol-in-device-name.patch b/review-2.6.28/agp-intel-fix-broken-symbol-in-device-name.patch similarity index 100% rename from queue-2.6.28/agp-intel-fix-broken-symbol-in-device-name.patch rename to review-2.6.28/agp-intel-fix-broken-symbol-in-device-name.patch diff --git a/queue-2.6.28/alsa-hda-add-missing-coef-initialization-for-alc887.patch b/review-2.6.28/alsa-hda-add-missing-coef-initialization-for-alc887.patch similarity index 100% rename from queue-2.6.28/alsa-hda-add-missing-coef-initialization-for-alc887.patch rename to review-2.6.28/alsa-hda-add-missing-coef-initialization-for-alc887.patch diff --git a/queue-2.6.28/alsa-hda-add-missing-initialization-for-alc272.patch b/review-2.6.28/alsa-hda-add-missing-initialization-for-alc272.patch similarity index 100% rename from queue-2.6.28/alsa-hda-add-missing-initialization-for-alc272.patch rename to review-2.6.28/alsa-hda-add-missing-initialization-for-alc272.patch diff --git a/queue-2.6.28/alsa-hda-add-quirk-for-fsc-amilo-xi2550.patch b/review-2.6.28/alsa-hda-add-quirk-for-fsc-amilo-xi2550.patch similarity index 100% rename from queue-2.6.28/alsa-hda-add-quirk-for-fsc-amilo-xi2550.patch rename to review-2.6.28/alsa-hda-add-quirk-for-fsc-amilo-xi2550.patch diff --git a/queue-2.6.28/asus_acpi-add-r1f-support.patch b/review-2.6.28/asus_acpi-add-r1f-support.patch similarity index 100% rename from queue-2.6.28/asus_acpi-add-r1f-support.patch rename to review-2.6.28/asus_acpi-add-r1f-support.patch diff --git a/queue-2.6.28/do_wp_page-fix-regression-with-execute-in-place.patch b/review-2.6.28/do_wp_page-fix-regression-with-execute-in-place.patch similarity index 100% rename from queue-2.6.28/do_wp_page-fix-regression-with-execute-in-place.patch rename to review-2.6.28/do_wp_page-fix-regression-with-execute-in-place.patch diff --git a/queue-2.6.28/e1000-fix-bug-with-shared-interrupt-during-reset.patch b/review-2.6.28/e1000-fix-bug-with-shared-interrupt-during-reset.patch similarity index 100% rename from queue-2.6.28/e1000-fix-bug-with-shared-interrupt-during-reset.patch rename to review-2.6.28/e1000-fix-bug-with-shared-interrupt-during-reset.patch diff --git a/queue-2.6.28/e1000-fix-pci-enable-to-honor-the-need_ioport-flag.patch b/review-2.6.28/e1000-fix-pci-enable-to-honor-the-need_ioport-flag.patch similarity index 100% rename from queue-2.6.28/e1000-fix-pci-enable-to-honor-the-need_ioport-flag.patch rename to review-2.6.28/e1000-fix-pci-enable-to-honor-the-need_ioport-flag.patch diff --git a/queue-2.6.28/eeepc-laptop-add-support-for-extended-hotkeys.patch b/review-2.6.28/eeepc-laptop-add-support-for-extended-hotkeys.patch similarity index 100% rename from queue-2.6.28/eeepc-laptop-add-support-for-extended-hotkeys.patch rename to review-2.6.28/eeepc-laptop-add-support-for-extended-hotkeys.patch diff --git a/queue-2.6.28/eeepc-laptop-fix-oops-when-changing-backlight-brightness-during-eeepc-laptop-init.patch b/review-2.6.28/eeepc-laptop-fix-oops-when-changing-backlight-brightness-during-eeepc-laptop-init.patch similarity index 100% rename from queue-2.6.28/eeepc-laptop-fix-oops-when-changing-backlight-brightness-during-eeepc-laptop-init.patch rename to review-2.6.28/eeepc-laptop-fix-oops-when-changing-backlight-brightness-during-eeepc-laptop-init.patch diff --git a/queue-2.6.28/elf-core-dump-fix-get_user-use.patch b/review-2.6.28/elf-core-dump-fix-get_user-use.patch similarity index 100% rename from queue-2.6.28/elf-core-dump-fix-get_user-use.patch rename to review-2.6.28/elf-core-dump-fix-get_user-use.patch diff --git a/queue-2.6.28/firewire-ohci-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch b/review-2.6.28/firewire-ohci-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch similarity index 100% rename from queue-2.6.28/firewire-ohci-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch rename to review-2.6.28/firewire-ohci-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch diff --git a/queue-2.6.28/firewire-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch b/review-2.6.28/firewire-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch similarity index 100% rename from queue-2.6.28/firewire-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch rename to review-2.6.28/firewire-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch diff --git a/queue-2.6.28/firewire-sbp2-fix-dma-mapping-leak-on-the-failure-path.patch b/review-2.6.28/firewire-sbp2-fix-dma-mapping-leak-on-the-failure-path.patch similarity index 100% rename from queue-2.6.28/firewire-sbp2-fix-dma-mapping-leak-on-the-failure-path.patch rename to review-2.6.28/firewire-sbp2-fix-dma-mapping-leak-on-the-failure-path.patch diff --git a/queue-2.6.28/ieee1394-ohci1394-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch b/review-2.6.28/ieee1394-ohci1394-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch similarity index 100% rename from queue-2.6.28/ieee1394-ohci1394-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch rename to review-2.6.28/ieee1394-ohci1394-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch diff --git a/queue-2.6.28/ieee1394-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch b/review-2.6.28/ieee1394-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch similarity index 100% rename from queue-2.6.28/ieee1394-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch rename to review-2.6.28/ieee1394-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch diff --git a/queue-2.6.28/ipw2200-fix-scanning-while-associated.patch b/review-2.6.28/ipw2200-fix-scanning-while-associated.patch similarity index 100% rename from queue-2.6.28/ipw2200-fix-scanning-while-associated.patch rename to review-2.6.28/ipw2200-fix-scanning-while-associated.patch diff --git a/review-2.6.28/mbox b/review-2.6.28/mbox new file mode 100644 index 00000000000..c9b9256ee7a --- /dev/null +++ b/review-2.6.28/mbox @@ -0,0 +1,4933 @@ +From gregkh@mini.kroah.org Tue Feb 10 10:55:46 2009 +Message-Id: <20090210185546.428734571@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:38 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Dean Nelson +Subject: [patch 01/53] sgi-xp: fix writing past the end of kzalloc()d space +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=sgi-xp-fix-writing-past-the-end-of-kzalloc-d-space.patch +Content-Length: 2653 +Lines: 75 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Dean Nelson + +commit 361916a943cd9dbda1c0b00879d0225cc919d868 upstream. + +A missing type cast results in writing way beyond the end of a kzalloc()'d +memory segment resulting in slab corruption. But it seems like the better +solution is to define ->recv_msg_slots as a 'void *' rather than a +'struct xpc_notify_mq_msg_uv *' and add the type cast. + +Signed-off-by: Dean Nelson +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/sgi-xp/xpc.h | 5 +++-- + drivers/misc/sgi-xp/xpc_uv.c | 11 +++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) + +--- a/drivers/misc/sgi-xp/xpc.h ++++ b/drivers/misc/sgi-xp/xpc.h +@@ -3,7 +3,7 @@ + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * +- * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. ++ * Copyright (c) 2004-2009 Silicon Graphics, Inc. All Rights Reserved. + */ + + /* +@@ -502,7 +502,8 @@ struct xpc_channel_uv { + /* partition's notify mq */ + + struct xpc_send_msg_slot_uv *send_msg_slots; +- struct xpc_notify_mq_msg_uv *recv_msg_slots; ++ void *recv_msg_slots; /* each slot will hold a xpc_notify_mq_msg_uv */ ++ /* structure plus the user's payload */ + + struct xpc_fifo_head_uv msg_slot_free_list; + struct xpc_fifo_head_uv recv_msg_list; /* deliverable payloads */ +--- a/drivers/misc/sgi-xp/xpc_uv.c ++++ b/drivers/misc/sgi-xp/xpc_uv.c +@@ -3,7 +3,7 @@ + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * +- * Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. ++ * Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved. + */ + + /* +@@ -825,8 +825,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpc + continue; + + for (entry = 0; entry < nentries; entry++) { +- msg_slot = ch_uv->recv_msg_slots + entry * +- ch->entry_size; ++ msg_slot = ch_uv->recv_msg_slots + ++ entry * ch->entry_size; + + msg_slot->hdr.msg_slot_number = entry; + } +@@ -1123,9 +1123,8 @@ xpc_handle_notify_mq_msg_uv(struct xpc_p + /* we're dealing with a normal message sent via the notify_mq */ + ch_uv = &ch->sn.uv; + +- msg_slot = (struct xpc_notify_mq_msg_uv *)((u64)ch_uv->recv_msg_slots + +- (msg->hdr.msg_slot_number % ch->remote_nentries) * +- ch->entry_size); ++ msg_slot = ch_uv->recv_msg_slots + ++ (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size; + + BUG_ON(msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number); + BUG_ON(msg_slot->hdr.size != 0); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:46 2009 +Message-Id: <20090210185546.583137848@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:39 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Carsten Otte , + Nick Piggin , + Heiko Carstens +Subject: [patch 02/53] do_wp_page: fix regression with execute in place +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=do_wp_page-fix-regression-with-execute-in-place.patch +Content-Length: 1369 +Lines: 41 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Carsten Otte + +commit ab92661d5d9514647346047f30f67a7f35ffea67 upstream. + +Fix do_wp_page for VM_MIXEDMAP mappings. + +In the case where pfn_valid returns 0 for a pfn at the beginning of +do_wp_page and the mapping is not shared writable, the code branches to +label `gotten:' with old_page == NULL. + +In case the vma is locked (vma->vm_flags & VM_LOCKED), lock_page, +clear_page_mlock, and unlock_page try to access the old_page. + +This patch checks whether old_page is valid before it is dereferenced. + +The regression was introduced by "mlock: mlocked pages are unevictable" +(commit b291f000393f5a0b679012b39d79fbc85c018233). + +Signed-off-by: Carsten Otte +Cc: Nick Piggin +Cc: Heiko Carstens +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/memory.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mm/memory.c ++++ b/mm/memory.c +@@ -1881,7 +1881,7 @@ gotten: + * Don't let another task, with possibly unlocked vma, + * keep the mlocked page. + */ +- if (vma->vm_flags & VM_LOCKED) { ++ if ((vma->vm_flags & VM_LOCKED) && old_page) { + lock_page(old_page); /* for LRU manipulation */ + clear_page_mlock(old_page); + unlock_page(old_page); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:46 2009 +Message-Id: <20090210185546.728717251@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:40 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Johannes Weiner , + Peter Zijlstra , + Matthew Wilcox , + Chuck Lever , + Nick Piggin , + Ingo Molnar +Subject: [patch 03/53] wait: prevent exclusive waiter starvation +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=wait-prevent-exclusive-waiter-starvation.patch +Content-Length: 6707 +Lines: 189 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Johannes Weiner + +commit 777c6c5f1f6e757ae49ecca2ed72d6b1f523c007 upstream. + +With exclusive waiters, every process woken up through the wait queue must +ensure that the next waiter down the line is woken when it has finished. + +Interruptible waiters don't do that when aborting due to a signal. And if +an aborting waiter is concurrently woken up through the waitqueue, noone +will ever wake up the next waiter. + +This has been observed with __wait_on_bit_lock() used by +lock_page_killable(): the first contender on the queue was aborting when +the actual lock holder woke it up concurrently. The aborted contender +didn't acquire the lock and therefor never did an unlock followed by +waking up the next waiter. + +Add abort_exclusive_wait() which removes the process' wait descriptor from +the waitqueue, iff still queued, or wakes up the next waiter otherwise. +It does so under the waitqueue lock. Racing with a wake up means the +aborting process is either already woken (removed from the queue) and will +wake up the next waiter, or it will remove itself from the queue and the +concurrent wake up will apply to the next waiter after it. + +Use abort_exclusive_wait() in __wait_event_interruptible_exclusive() and +__wait_on_bit_lock() when they were interrupted by other means than a wake +up through the queue. + +[akpm@linux-foundation.org: coding-style fixes] +Reported-by: Chris Mason +Signed-off-by: Johannes Weiner +Mentored-by: Oleg Nesterov +Cc: Peter Zijlstra +Cc: Matthew Wilcox +Cc: Chuck Lever +Cc: Nick Piggin +Cc: Ingo Molnar +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/wait.h | 11 +++++++-- + kernel/sched.c | 4 +-- + kernel/wait.c | 59 ++++++++++++++++++++++++++++++++++++++++++++------- + 3 files changed, 63 insertions(+), 11 deletions(-) + +--- a/include/linux/wait.h ++++ b/include/linux/wait.h +@@ -132,6 +132,8 @@ static inline void __remove_wait_queue(w + list_del(&old->task_list); + } + ++void __wake_up_common(wait_queue_head_t *q, unsigned int mode, ++ int nr_exclusive, int sync, void *key); + void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key); + extern void __wake_up_locked(wait_queue_head_t *q, unsigned int mode); + extern void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr); +@@ -333,16 +335,19 @@ do { \ + for (;;) { \ + prepare_to_wait_exclusive(&wq, &__wait, \ + TASK_INTERRUPTIBLE); \ +- if (condition) \ ++ if (condition) { \ ++ finish_wait(&wq, &__wait); \ + break; \ ++ } \ + if (!signal_pending(current)) { \ + schedule(); \ + continue; \ + } \ + ret = -ERESTARTSYS; \ ++ abort_exclusive_wait(&wq, &__wait, \ ++ TASK_INTERRUPTIBLE, NULL); \ + break; \ + } \ +- finish_wait(&wq, &__wait); \ + } while (0) + + #define wait_event_interruptible_exclusive(wq, condition) \ +@@ -431,6 +436,8 @@ extern long interruptible_sleep_on_timeo + void prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state); + void prepare_to_wait_exclusive(wait_queue_head_t *q, wait_queue_t *wait, int state); + void finish_wait(wait_queue_head_t *q, wait_queue_t *wait); ++void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait, ++ unsigned int mode, void *key); + int autoremove_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key); + int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key); + +--- a/kernel/sched.c ++++ b/kernel/sched.c +@@ -4586,8 +4586,8 @@ EXPORT_SYMBOL(default_wake_function); + * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns + * zero in this (rare) case, and we handle it by continuing to scan the queue. + */ +-static void __wake_up_common(wait_queue_head_t *q, unsigned int mode, +- int nr_exclusive, int sync, void *key) ++void __wake_up_common(wait_queue_head_t *q, unsigned int mode, ++ int nr_exclusive, int sync, void *key) + { + wait_queue_t *curr, *next; + +--- a/kernel/wait.c ++++ b/kernel/wait.c +@@ -91,6 +91,15 @@ prepare_to_wait_exclusive(wait_queue_hea + } + EXPORT_SYMBOL(prepare_to_wait_exclusive); + ++/* ++ * finish_wait - clean up after waiting in a queue ++ * @q: waitqueue waited on ++ * @wait: wait descriptor ++ * ++ * Sets current thread back to running state and removes ++ * the wait descriptor from the given waitqueue if still ++ * queued. ++ */ + void finish_wait(wait_queue_head_t *q, wait_queue_t *wait) + { + unsigned long flags; +@@ -117,6 +126,39 @@ void finish_wait(wait_queue_head_t *q, w + } + EXPORT_SYMBOL(finish_wait); + ++/* ++ * abort_exclusive_wait - abort exclusive waiting in a queue ++ * @q: waitqueue waited on ++ * @wait: wait descriptor ++ * @state: runstate of the waiter to be woken ++ * @key: key to identify a wait bit queue or %NULL ++ * ++ * Sets current thread back to running state and removes ++ * the wait descriptor from the given waitqueue if still ++ * queued. ++ * ++ * Wakes up the next waiter if the caller is concurrently ++ * woken up through the queue. ++ * ++ * This prevents waiter starvation where an exclusive waiter ++ * aborts and is woken up concurrently and noone wakes up ++ * the next waiter. ++ */ ++void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait, ++ unsigned int mode, void *key) ++{ ++ unsigned long flags; ++ ++ __set_current_state(TASK_RUNNING); ++ spin_lock_irqsave(&q->lock, flags); ++ if (!list_empty(&wait->task_list)) ++ list_del_init(&wait->task_list); ++ else if (waitqueue_active(q)) ++ __wake_up_common(q, mode, 1, 0, key); ++ spin_unlock_irqrestore(&q->lock, flags); ++} ++EXPORT_SYMBOL(abort_exclusive_wait); ++ + int autoremove_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key) + { + int ret = default_wake_function(wait, mode, sync, key); +@@ -177,17 +219,20 @@ int __sched + __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q, + int (*action)(void *), unsigned mode) + { +- int ret = 0; +- + do { ++ int ret; ++ + prepare_to_wait_exclusive(wq, &q->wait, mode); +- if (test_bit(q->key.bit_nr, q->key.flags)) { +- if ((ret = (*action)(q->key.flags))) +- break; +- } ++ if (!test_bit(q->key.bit_nr, q->key.flags)) ++ continue; ++ ret = action(q->key.flags); ++ if (!ret) ++ continue; ++ abort_exclusive_wait(wq, &q->wait, mode, &q->key); ++ return ret; + } while (test_and_set_bit(q->key.bit_nr, q->key.flags)); + finish_wait(wq, &q->wait); +- return ret; ++ return 0; + } + EXPORT_SYMBOL(__wait_on_bit_lock); + + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:47 2009 +Message-Id: <20090210185546.858344629@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:41 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Tony Battersby , + Jiri Kosina , + Hugh Dickins +Subject: [patch 04/53] shm: fix shmctl(SHM_INFO) lockup with !CONFIG_SHMEM +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=shm-fix-shmctl-lockup-with-config_shmem.patch +Content-Length: 1455 +Lines: 46 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Tony Battersby + +commit a68e61e8ff2d46327a37b69056998b47745db6fa upstream. + +shm_get_stat() assumes that the inode is a "struct shmem_inode_info", +which is incorrect for !CONFIG_SHMEM (see fs/ramfs/inode.c: +ramfs_get_inode() vs. mm/shmem.c: shmem_get_inode()). + +This bad assumption can cause shmctl(SHM_INFO) to lockup when +shm_get_stat() tries to spin_lock(&info->lock). Users of !CONFIG_SHMEM +may encounter this lockup simply by invoking the 'ipcs' command. + +Reported by Jiri Olsa back in February 2008: +http://lkml.org/lkml/2008/2/29/74 + +Signed-off-by: Tony Battersby +Cc: Jiri Kosina +Reported-by: Jiri Olsa +Cc: Hugh Dickins +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + ipc/shm.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/ipc/shm.c ++++ b/ipc/shm.c +@@ -565,11 +565,15 @@ static void shm_get_stat(struct ipc_name + struct hstate *h = hstate_file(shp->shm_file); + *rss += pages_per_huge_page(h) * mapping->nrpages; + } else { ++#ifdef CONFIG_SHMEM + struct shmem_inode_info *info = SHMEM_I(inode); + spin_lock(&info->lock); + *rss += inode->i_mapping->nrpages; + *swp += info->swapped; + spin_unlock(&info->lock); ++#else ++ *rss += inode->i_mapping->nrpages; ++#endif + } + + total++; + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:47 2009 +Message-Id: <20090210185547.016600982@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:42 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Adam Tkac , + Michael Kerrisk +Subject: [patch 05/53] revert "rlimit: permit setting RLIMIT_NOFILE to RLIM_INFINITY" +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=revert-rlimit-permit-setting-rlimit_nofile-to-rlim_infinity.patch +Content-Length: 3833 +Lines: 98 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Andrew Morton + +commit 60fd760fb9ff7034360bab7137c917c0330628c2 upstream. + +Revert commit 0c2d64fb6cae9aae480f6a46cfe79f8d7d48b59f because it causes +(arguably poorly designed) existing userspace to spend interminable +periods closing billions of not-open file descriptors. + +We could bring this back, with some sort of opt-in tunable in /proc, which +defaults to "off". + +Peter's alanysis follows: + +: I spent several hours trying to get to the bottom of a serious +: performance issue that appeared on one of our servers after upgrading to +: 2.6.28. In the end it's what could be considered a userspace bug that +: was triggered by a change in 2.6.28. Since this might also affect other +: people I figured I'd at least document what I found here, and maybe we +: can even do something about it: +: +: +: So, I upgraded some of debian.org's machines to 2.6.28.1 and immediately +: the team maintaining our ftp archive complained that one of their +: scripts that previously ran in a few minutes still hadn't even come +: close to being done after an hour or so. Downgrading to 2.6.27 fixed +: that. +: +: Turns out that script is forking a lot and something in it or python or +: whereever closes all the file descriptors it doesn't want to pass on. +: That is, it starts at zero and goes up to ulimit -n/RLIMIT_NOFILE and +: closes them all with a few exceptions. +: +: Turns out that takes a long time when your limit -n is now 2^20 (1048576). +: +: With 2.6.27.* the ulimit -n was the standard 1024, but with 2.6.28 it is +: now a thousand times that. +: +: 2.6.28 included a patch titled "rlimit: permit setting RLIMIT_NOFILE to +: RLIM_INFINITY" (0c2d64fb6cae9aae480f6a46cfe79f8d7d48b59f)[1] that +: allows, as the title implies, to set the limit for number of files to +: infinity. +: +: Closer investigation showed that the broken default ulimit did not apply +: to "system" processes (like stuff started from init). In the end I +: could establish that all processes that passed through pam_limit at one +: point had the bad resource limit. +: +: Apparently the pam library in Debian etch (4.0) initializes the limits +: to some default values when it doesn't have any settings in limit.conf +: to override them. Turns out that for nofiles this is RLIM_INFINITY. +: Commenting out "case RLIMIT_NOFILE" in pam_limit.c:267 of our pam +: package version 0.79-5 fixes that - tho I'm not sure what side effects +: that has. +: +: Debian lenny (the upcoming 5.0 version) doesn't have this issue as it +: uses a different pam (version). + +Reported-by: Peter Palfrader +Cc: Adam Tkac +Cc: Michael Kerrisk +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/sys.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +--- a/kernel/sys.c ++++ b/kernel/sys.c +@@ -1447,22 +1447,14 @@ SYSCALL_DEFINE2(setrlimit, unsigned int, + return -EINVAL; + if (copy_from_user(&new_rlim, rlim, sizeof(*rlim))) + return -EFAULT; ++ if (new_rlim.rlim_cur > new_rlim.rlim_max) ++ return -EINVAL; + old_rlim = current->signal->rlim + resource; + if ((new_rlim.rlim_max > old_rlim->rlim_max) && + !capable(CAP_SYS_RESOURCE)) + return -EPERM; +- +- if (resource == RLIMIT_NOFILE) { +- if (new_rlim.rlim_max == RLIM_INFINITY) +- new_rlim.rlim_max = sysctl_nr_open; +- if (new_rlim.rlim_cur == RLIM_INFINITY) +- new_rlim.rlim_cur = sysctl_nr_open; +- if (new_rlim.rlim_max > sysctl_nr_open) +- return -EPERM; +- } +- +- if (new_rlim.rlim_cur > new_rlim.rlim_max) +- return -EINVAL; ++ if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > sysctl_nr_open) ++ return -EPERM; + + retval = security_task_setrlimit(resource, &new_rlim); + if (retval) + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:47 2009 +Message-Id: <20090210185547.149065579@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:43 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Masami Hiramatsu +Subject: [patch 06/53] prevent kprobes from catching spurious page faults +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=prevent-kprobes-from-catching-spurious-page-faults.patch +Content-Length: 1336 +Lines: 47 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Masami Hiramatsu + +commit 9be260a646bf76fa418ee519afa10196b3164681 upstream. + +Prevent kprobes from catching spurious faults which will cause infinite +recursive page-fault and memory corruption by stack overflow. + +Signed-off-by: Masami Hiramatsu +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/mm/fault.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/arch/x86/mm/fault.c ++++ b/arch/x86/mm/fault.c +@@ -601,8 +601,6 @@ void __kprobes do_page_fault(struct pt_r + + si_code = SEGV_MAPERR; + +- if (notify_page_fault(regs)) +- return; + if (unlikely(kmmio_fault(regs, address))) + return; + +@@ -632,6 +630,9 @@ void __kprobes do_page_fault(struct pt_r + if (spurious_fault(address, error_code)) + return; + ++ /* kprobes don't want to hook the spurious faults. */ ++ if (notify_page_fault(regs)) ++ return; + /* + * Don't take the mm semaphore here. If we fixup a prefetch + * fault we could otherwise deadlock. +@@ -639,6 +640,9 @@ void __kprobes do_page_fault(struct pt_r + goto bad_area_nosemaphore; + } + ++ /* kprobes don't want to hook the spurious faults. */ ++ if (notify_page_fault(regs)) ++ return; + + /* + * It's safe to allow irq's after cr2 has been saved and the + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:47 2009 +Message-Id: <20090210185547.282757645@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:44 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Clemens Ladisch , + Takashi Iwai +Subject: [patch 07/53] sound: usb-audio: handle wMaxPacketSize for FIXED_ENDPOINT devices +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=sound-usb-audio-handle-wmaxpacketsize-for-fixed_endpoint-devices.patch +Content-Length: 1056 +Lines: 29 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Clemens Ladisch + +commit 894dcd78782842924527598b0b764c9b4e679e21 upstream. + +For audio devices that do not have proper audio descriptors (e.g., +Edirol UA-20), we use hardcoded parameters from our quirks list. +However, we must still read the maximum packet size from the standard +endpoint descriptor; otherwise, we might use packets that are too big +and therefore rejected by the USB core. + +Signed-off-by: Clemens Ladisch +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/usbaudio.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/usb/usbaudio.c ++++ b/sound/usb/usbaudio.c +@@ -2966,6 +2966,7 @@ static int create_fixed_stream_quirk(str + return -EINVAL; + } + alts = &iface->altsetting[fp->altset_idx]; ++ fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize); + usb_set_interface(chip->dev, fp->iface, 0); + init_usb_pitch(chip->dev, fp->iface, alts, fp); + init_usb_sample_rate(chip->dev, fp->iface, alts, fp, fp->rate_max); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:47 2009 +Message-Id: <20090210185547.440554731@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:45 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + NeilBrown +Subject: [patch 08/53] md: Ensure an md array never has too many devices. +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=md-ensure-an-md-array-never-has-too-many-devices.patch +Content-Length: 2541 +Lines: 84 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: NeilBrown + +commit de01dfadf25bf83cfe3d85c163005c4320532658 upstream. + +Each different metadata format supported by md supports a +different maximum number of devices. +We really should be enforcing this maximum in the kernel, but +we aren't quite doing that properly. + +We currently only enforce it at the 'hot_add' point, which is an +older interface which is not used by current userspace. + +We need to also enforce it at 'add_new_disk' time for active arrays +and at 'do_md_run' time when starting a new array. + +So move the test from 'hot_add' into 'bind_rdev_to_array' which is +called from both 'hot_add' and 'add_new_disk, and add a new +test in 'analyse_sbs' which is called from 'do_md_run'. + +This bug (or missing feature) has been around "forever" and so +the patch is suitable for any -stable that is currently maintained. + +Signed-off-by: NeilBrown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/md.c | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +--- a/drivers/md/md.c ++++ b/drivers/md/md.c +@@ -1447,6 +1447,11 @@ static int bind_rdev_to_array(mdk_rdev_t + if (find_rdev_nr(mddev, rdev->desc_nr)) + return -EBUSY; + } ++ if (mddev->max_disks && rdev->desc_nr >= mddev->max_disks) { ++ printk(KERN_WARNING "md: %s: array is limited to %d devices\n", ++ mdname(mddev), mddev->max_disks); ++ return -EBUSY; ++ } + bdevname(rdev->bdev,b); + while ( (s=strchr(b, '/')) != NULL) + *s = '!'; +@@ -2355,6 +2360,15 @@ static void analyze_sbs(mddev_t * mddev) + + i = 0; + rdev_for_each(rdev, tmp, mddev) { ++ if (rdev->desc_nr >= mddev->max_disks || ++ i > mddev->max_disks) { ++ printk(KERN_WARNING ++ "md: %s: %s: only %d devices permitted\n", ++ mdname(mddev), bdevname(rdev->bdev, b), ++ mddev->max_disks); ++ kick_rdev_from_array(rdev); ++ continue; ++ } + if (rdev != freshest) + if (super_types[mddev->major_version]. + validate_super(mddev, rdev)) { +@@ -4448,13 +4462,6 @@ static int hot_add_disk(mddev_t * mddev, + * noticed in interrupt contexts ... + */ + +- if (rdev->desc_nr == mddev->max_disks) { +- printk(KERN_WARNING "%s: can not hot-add to full array!\n", +- mdname(mddev)); +- err = -EBUSY; +- goto abort_unbind_export; +- } +- + rdev->raid_disk = -1; + + md_update_sb(mddev, 1); +@@ -4468,9 +4475,6 @@ static int hot_add_disk(mddev_t * mddev, + md_new_event(mddev); + return 0; + +-abort_unbind_export: +- unbind_rdev_from_array(rdev); +- + abort_export: + export_rdev(rdev); + return err; + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:47 2009 +Message-Id: <20090210185547.611149096@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:46 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Andre Noll , + NeilBrown +Subject: [patch 09/53] md: Fix a bug in linear.c causing which_dev() to return the wrong device. +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=md-fix-a-bug-in-linear.c-causing-which_dev-to-return-the-wrong-device.patch +Content-Length: 1937 +Lines: 56 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Andre Noll + +commit 852c8bf484a0e17ee27f413ef26e87f522af5607 upstream. + +ab5bd5cbc8d4b868378d062eed3d4240930fbb86 introduced the following +bug in linear software raid for large arrays on 32 bit machines: + +which_dev() computes the device holding a given sector by shifting +down the sector number to a 32 bit range, dividing by the array +spacing and looking up the resulting index in the hash table of +the array. + +Because the computed index might be slightly too small, a loop at +the end of which_dev() increases the index until the given sector +actually falls into the range of the device associated with that index. + +The changes of the above mentioned commit caused this loop to check +whether the _index_ rather than the sector number is small enough, +effectively bypassing the loop and thus possibly returning the wrong +device. + +As reported by Simon Kirby, this leads to errors such as + + linear_make_request: Sector 2340486136 out of bounds on dev sdi: 156301312 sectors, offset 2109870464 + +Fix this bug by introducing a local variable for the index so that +the variable containing the passed sector is left unchanged. + +Signed-off-by: Andre Noll +Signed-off-by: NeilBrown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/linear.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/md/linear.c ++++ b/drivers/md/linear.c +@@ -25,13 +25,13 @@ static inline dev_info_t *which_dev(mdde + { + dev_info_t *hash; + linear_conf_t *conf = mddev_to_conf(mddev); ++ sector_t idx = sector >> conf->sector_shift; + + /* + * sector_div(a,b) returns the remainer and sets a to a/b + */ +- sector >>= conf->sector_shift; +- (void)sector_div(sector, conf->spacing); +- hash = conf->hash_table[sector]; ++ (void)sector_div(idx, conf->spacing); ++ hash = conf->hash_table[idx]; + + while (sector >= hash->num_sectors + hash->start_sector) + hash++; + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:47 2009 +Message-Id: <20090210185547.762986695@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:47 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Venkatesh Pallipadi , + Len Brown +Subject: [patch 10/53] ACPI: Enable bit 11 in _PDC to advertise hw coord +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=acpi-enable-bit-11-in-_pdc-to-advertise-hw-coord.patch +Content-Length: 1429 +Lines: 40 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Pallipadi, Venkatesh + +commit d96f94c604453f87fe24154b87e1e9a3a72511f8 upstream. + +Bit 11 in intel PDC definitions is meant for OS capability to handle +hardware coordination of P-states. In Linux we have always supported +hwardware coordination of P-states. Just let the BIOSes know that we +support it, by setting this bit. + +Some BIOSes use this bit to choose between hardware or software coordination +and without this change below, BIOSes switch to software coordination, which +is not very optimal in terms of power consumption and extra wakeups from idle. + +Signed-off-by: Venkatesh Pallipadi +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + include/acpi/pdc_intel.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/include/acpi/pdc_intel.h ++++ b/include/acpi/pdc_intel.h +@@ -14,6 +14,7 @@ + #define ACPI_PDC_SMP_T_SWCOORD (0x0080) + #define ACPI_PDC_C_C1_FFH (0x0100) + #define ACPI_PDC_C_C2C3_FFH (0x0200) ++#define ACPI_PDC_SMP_P_HWCOORD (0x0800) + + #define ACPI_PDC_EST_CAPABILITY_SMP (ACPI_PDC_SMP_C1PT | \ + ACPI_PDC_C_C1_HALT | \ +@@ -22,6 +23,7 @@ + #define ACPI_PDC_EST_CAPABILITY_SWSMP (ACPI_PDC_SMP_C1PT | \ + ACPI_PDC_C_C1_HALT | \ + ACPI_PDC_SMP_P_SWCOORD | \ ++ ACPI_PDC_SMP_P_HWCOORD | \ + ACPI_PDC_P_FFH) + + #define ACPI_PDC_C_CAPABILITY_SMP (ACPI_PDC_SMP_C2C3 | \ + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:48 2009 +Message-Id: <20090210185547.925558624@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:48 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Holger Macht , + Len Brown +Subject: [patch 11/53] ACPI: dock: Dont eval _STA on every show_docked sysfs read +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=acpi-dock-don-t-eval-_sta-on-every-show_docked-sysfs-read.patch +Content-Length: 1520 +Lines: 43 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Holger Macht + +commit fc5a9f8841ee87d93376ada5d73117d4d6a373ea upstream. + +Some devices trigger a DEVICE_CHECK on every evalutation of _STA. This +can also be seen in commit 8b59560a3baf2e7c24e0fb92ea5d09eca92805db +(ACPI: dock: avoid check _STA method). If an undock is processed, the +dock driver sends a uevent and userspace might read the show_docked +property in sysfs. This causes an evaluation of _STA of the particular +device which causes the dock driver to immediately dock again. + +In any case, evaluation of _STA (show_docked) does not necessarily mean +that we are docked, so check with the internal device structure. + +http://bugzilla.kernel.org/show_bug.cgi?id=12360 + +Signed-off-by: Holger Macht +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/dock.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/drivers/acpi/dock.c ++++ b/drivers/acpi/dock.c +@@ -855,10 +855,14 @@ fdd_out: + static ssize_t show_docked(struct device *dev, + struct device_attribute *attr, char *buf) + { ++ struct acpi_device *tmp; ++ + struct dock_station *dock_station = *((struct dock_station **) + dev->platform_data); +- return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station)); + ++ if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp))) ++ return snprintf(buf, PAGE_SIZE, "1\n"); ++ return snprintf(buf, PAGE_SIZE, "0\n"); + } + static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL); + + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:48 2009 +Message-Id: <20090210185548.076003430@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:49 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Stefan Richter +Subject: [patch 12/53] ieee1394: ohci1394: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=ieee1394-ohci1394-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch +Content-Length: 1616 +Lines: 44 + + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Stefan Richter + +Commit 64c634ef83991b390ec0503e61f16efb0ba3c60b upstream. + +Camcorders have a tendency to fail read requests to their config ROM and +write request to their FCP command register with ack_busy_X. This has +become a problem with newer kernels and especially Panasonic camcorders, +causing AV/C in dvgrab and kino to fail. Dvgrab for example frequently +logs "send oops"; kino reports loss of AV/C control. I suspect that +lower CPU scheduling latencies in newer kernels made this issue more +prominent now. + +According to +https://sourceforge.net/tracker/?func=detail&atid=114103&aid=2492640&group_id=14103 +this can be fixed by configuring the FireWire controller for more +hardware retries for request transmission; these retries are evidently +more successful than libavc1394's own retry loop (typically 3 tries on +top of hardware retries). + +Presumably the same issue has been reported at +https://bugzilla.redhat.com/show_bug.cgi?id=449252 and +https://bugzilla.redhat.com/show_bug.cgi?id=477279 . + +Tested-by: Mathias Beilstein +Signed-off-by: Stefan Richter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ieee1394/ohci1394.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/ieee1394/ohci1394.h ++++ b/drivers/ieee1394/ohci1394.h +@@ -26,7 +26,7 @@ + + #define OHCI1394_DRIVER_NAME "ohci1394" + +-#define OHCI1394_MAX_AT_REQ_RETRIES 0x2 ++#define OHCI1394_MAX_AT_REQ_RETRIES 0xf + #define OHCI1394_MAX_AT_RESP_RETRIES 0x2 + #define OHCI1394_MAX_PHYS_RESP_RETRIES 0x8 + #define OHCI1394_MAX_SELF_ID_ERRORS 16 + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:48 2009 +Message-Id: <20090210185548.220612734@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:50 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Stefan Richter +Subject: [patch 13/53] firewire: ohci: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=firewire-ohci-increase-at-req.-retries-fix-ack_busy_x-from-panasonic-camcorders-and-others.patch +Content-Length: 1823 +Lines: 47 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Stefan Richter + +Commit 8b7b6afaa84708d08139daa08538ca3e56c351f1 upstream. + +Camcorders have a tendency to fail read requests to their config ROM and +write request to their FCP command register with ack_busy_X. This has +become a problem with newer kernels and especially Panasonic camcorders, +causing AV/C in dvgrab and kino to fail. Dvgrab for example frequently +logs "send oops"; kino reports loss of AV/C control. I suspect that +lower CPU scheduling latencies in newer kernels made this issue more +prominent now. + +According to +https://sourceforge.net/tracker/?func=detail&atid=114103&aid=2492640&group_id=14103 +this can be fixed by configuring the FireWire controller for more +hardware retries for request transmission; these retries are evidently +more successful than libavc1394's own retry loop (typically 3 tries on +top of hardware retries). + +Presumably the same issue has been reported at +https://bugzilla.redhat.com/show_bug.cgi?id=449252 and +https://bugzilla.redhat.com/show_bug.cgi?id=477279 . + +In a quick test with a JVC camcorder (which didn't malfunction like the +reported camcorders), this change decreased the number of ack_busy_X +from 16 in three runs of dvgrab to 4 in three runs of the same capture +duration. + +Signed-off-by: Stefan Richter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firewire/fw-ohci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/firewire/fw-ohci.c ++++ b/drivers/firewire/fw-ohci.c +@@ -226,7 +226,7 @@ static inline struct fw_ohci *fw_ohci(st + #define CONTEXT_DEAD 0x0800 + #define CONTEXT_ACTIVE 0x0400 + +-#define OHCI1394_MAX_AT_REQ_RETRIES 0x2 ++#define OHCI1394_MAX_AT_REQ_RETRIES 0xf + #define OHCI1394_MAX_AT_RESP_RETRIES 0x2 + #define OHCI1394_MAX_PHYS_RESP_RETRIES 0x8 + + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:48 2009 +Message-Id: <20090210185548.348938061@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:51 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Stefan Richter +Subject: [patch 14/53] firewire: sbp2: fix DMA mapping leak on the failure path +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=firewire-sbp2-fix-dma-mapping-leak-on-the-failure-path.patch +Content-Length: 2263 +Lines: 66 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Stefan Richter + +Commit 5e2125677fd72d36396cc537466e07ffcbbd4b2b upstream. + +Reported-by: FUJITA Tomonori +who also provided a first version of the fix. + +Signed-off-by: Stefan Richter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firewire/fw-sbp2.c | 27 +++++++++++++++++---------- + 1 file changed, 17 insertions(+), 10 deletions(-) + +--- a/drivers/firewire/fw-sbp2.c ++++ b/drivers/firewire/fw-sbp2.c +@@ -1282,6 +1282,19 @@ static struct fw_driver sbp2_driver = { + .id_table = sbp2_id_table, + }; + ++static void sbp2_unmap_scatterlist(struct device *card_device, ++ struct sbp2_command_orb *orb) ++{ ++ if (scsi_sg_count(orb->cmd)) ++ dma_unmap_sg(card_device, scsi_sglist(orb->cmd), ++ scsi_sg_count(orb->cmd), ++ orb->cmd->sc_data_direction); ++ ++ if (orb->request.misc & cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT)) ++ dma_unmap_single(card_device, orb->page_table_bus, ++ sizeof(orb->page_table), DMA_TO_DEVICE); ++} ++ + static unsigned int + sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data) + { +@@ -1361,15 +1374,7 @@ complete_command_orb(struct sbp2_orb *ba + + dma_unmap_single(device->card->device, orb->base.request_bus, + sizeof(orb->request), DMA_TO_DEVICE); +- +- if (scsi_sg_count(orb->cmd) > 0) +- dma_unmap_sg(device->card->device, scsi_sglist(orb->cmd), +- scsi_sg_count(orb->cmd), +- orb->cmd->sc_data_direction); +- +- if (orb->page_table_bus != 0) +- dma_unmap_single(device->card->device, orb->page_table_bus, +- sizeof(orb->page_table), DMA_TO_DEVICE); ++ sbp2_unmap_scatterlist(device->card->device, orb); + + orb->cmd->result = result; + orb->done(orb->cmd); +@@ -1500,8 +1505,10 @@ static int sbp2_scsi_queuecommand(struct + orb->base.request_bus = + dma_map_single(device->card->device, &orb->request, + sizeof(orb->request), DMA_TO_DEVICE); +- if (dma_mapping_error(device->card->device, orb->base.request_bus)) ++ if (dma_mapping_error(device->card->device, orb->base.request_bus)) { ++ sbp2_unmap_scatterlist(device->card->device, orb); + goto out; ++ } + + sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, generation, + lu->command_block_agent_address + SBP2_ORB_POINTER); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:48 2009 +Message-Id: <20090210185548.508234209@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:52 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Jarod Wilson , + Stefan Richter +Subject: [patch 15/53] firewire: sbp2: add workarounds for 2nd and 3rd generation iPods +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=firewire-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch +Content-Length: 2003 +Lines: 56 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Stefan Richter + +Commit c8c4707cf7ca8ff7dcc1653447e48cb3de0bf114 upstream. + +According to https://bugs.launchpad.net/bugs/294391 + - 3rd generation iPods need the "fix capacity" workaround after all + (apparently they crash after the last sector was accessed), + - 2nd generation iPods need the "128 kB maximum request size" + workaround. + +Alas both iPod generations feature the same model ID in the config ROM, +hence we can only define a shared quirks list entry for them. Luckily +the fix capacity workaround did not show a negative effect in Jarod's +tests with 2nd gen. iPod. + +A side note: Apple computers in target mode (or at least an x86 Mac +mini) don't have firmware_version and model_id, hence none of the iPod +quirks list entries is active for them. + +Tested-by: Jarod Wilson +Acked-by: Jarod Wilson +Signed-off-by: Stefan Richter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firewire/fw-sbp2.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +--- a/drivers/firewire/fw-sbp2.c ++++ b/drivers/firewire/fw-sbp2.c +@@ -357,15 +357,17 @@ static const struct { + .model = ~0, + .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS, + }, +- + /* +- * There are iPods (2nd gen, 3rd gen) with model_id == 0, but +- * these iPods do not feature the read_capacity bug according +- * to one report. Read_capacity behaviour as well as model_id +- * could change due to Apple-supplied firmware updates though. ++ * iPod 2nd generation: needs 128k max transfer size workaround ++ * iPod 3rd generation: needs fix capacity workaround + */ +- +- /* iPod 4th generation. */ { ++ { ++ .firmware_revision = 0x0a2700, ++ .model = 0x000000, ++ .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS | ++ SBP2_WORKAROUND_FIX_CAPACITY, ++ }, ++ /* iPod 4th generation */ { + .firmware_revision = 0x0a2700, + .model = 0x000021, + .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:48 2009 +Message-Id: <20090210185548.655674870@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:53 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Jarod Wilson , + Stefan Richter +Subject: [patch 16/53] ieee1394: sbp2: add workarounds for 2nd and 3rd generation iPods +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=ieee1394-sbp2-add-workarounds-for-2nd-and-3rd-generation-ipods.patch +Content-Length: 1151 +Lines: 37 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Stefan Richter + +Commit 1448d7c6a2ff96d3b52ecae49e2d0f046a097fe0 upstream. + +As per https://bugs.launchpad.net/bugs/294391. These got one sample of +each iPod generation going. However there still occurred I/O stalls +with the 3rd generation iPod which remain undiagnosed at the time of +this writing. + +Acked-by: Jarod Wilson +Signed-off-by: Stefan Richter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ieee1394/sbp2.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/ieee1394/sbp2.c ++++ b/drivers/ieee1394/sbp2.c +@@ -395,6 +395,16 @@ static const struct { + .model_id = SBP2_ROM_VALUE_WILDCARD, + .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS, + }, ++ /* ++ * iPod 2nd generation: needs 128k max transfer size workaround ++ * iPod 3rd generation: needs fix capacity workaround ++ */ ++ { ++ .firmware_revision = 0x0a2700, ++ .model_id = 0x000000, ++ .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS | ++ SBP2_WORKAROUND_FIX_CAPACITY, ++ }, + /* iPod 4th generation */ { + .firmware_revision = 0x0a2700, + .model_id = 0x000021, + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:48 2009 +Message-Id: <20090210185548.797804533@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:54 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Karsten Keil , + Rusty Russell +Subject: [patch 17/53] module: remove over-zealous check in __module_get() +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=module-remove-over-zealous-check-in-__module_get.patch +Content-Length: 1044 +Lines: 33 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Rusty Russell + +commit 7f9a50a5b89b87f8e754f59ae9968da28be618a5 upstream. + +Impact: fix spurious BUG_ON() triggered under load + +module_refcount() isn't reliable outside stop_machine(), as demonstrated +by Karsten Keil , networking can trigger it under load +(an inc on one cpu and dec on another while module_refcount() is tallying + can give false results, for example). + +Almost noone should be using __module_get, but that's another issue. + +Cc: Karsten Keil +Signed-off-by: Rusty Russell +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/module.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -391,7 +391,6 @@ void symbol_put_addr(void *addr); + static inline void __module_get(struct module *module) + { + if (module) { +- BUG_ON(module_refcount(module) == 0); + local_inc(&module->ref[get_cpu()].count); + put_cpu(); + } + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:49 2009 +Message-Id: <20090210185548.957473223@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:55 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Andy Whitcroft , + Alan Cox , + Matthew Burgess +Subject: [patch 18/53] serial: RS485 ioctl structure uses __u32 include linux/types.h +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=serial-rs485-ioctl-structure-uses-__u32-include-linux-types.h.patch +Content-Length: 1473 +Lines: 51 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Andy Whitcroft + +commit 60c20fb8c00a2b23308ae4517f145383bc66d291 upstream. + +In the commit below a new struct serial_rs485 was introduced for a new +ioctl: + + commit c26c56c0f40e200e61d1390629c806f6adaffbcc + Author: Alan Cox + Date: Mon Oct 13 10:37:48 2008 +0100 + + tty: Cris has a nice RS485 ioctl so we should steal it + +This structure uses the __u32 types for some of its members, which leads +to the following compile error: + + $ cc -I.../include -c X.c + In file included from X.c:2: .../include/linux/serial.h:185: + error: expected specifier-qualifier-list before ‘__u32’ + $ + +It seems that these types are appropriate for this structure as it is +to be exposed to userspace. These types are available via linux/types.h +so move the include of that outside the __KERNEL__ section. + +Signed-off-by: Andy Whitcroft +Signed-off-by: Andrew Morton +Signed-off-by: Alan Cox +Signed-off-by: Linus Torvalds +Cc: Matthew Burgess +Signed-off-by: Greg Kroah-Hartman + + +--- + include/linux/serial.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/include/linux/serial.h ++++ b/include/linux/serial.h +@@ -10,8 +10,9 @@ + #ifndef _LINUX_SERIAL_H + #define _LINUX_SERIAL_H + +-#ifdef __KERNEL__ + #include ++ ++#ifdef __KERNEL__ + #include + + /* + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:49 2009 +Message-Id: <20090210185549.118686368@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:56 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Borislav Petkov , + "H. Peter Anvin" +Subject: [patch 19/53] x86: APIC: enable workaround on AMD Fam10h CPUs +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=x86-apic-enable-workaround-on-amd-fam10h-cpus.patch +Content-Length: 1110 +Lines: 33 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Borislav Petkov + +commit 858770619debfb9269add63e4ba8b7c6b5538dd1 upstream. + +Impact: fix to enable APIC for AMD Fam10h on chipsets with a missing/b0rked + ACPI MP table (MADT) + +Booting a 32bit kernel on an AMD Fam10h CPU running on chipsets with +missing/b0rked MP table leads to a hang pretty early in the boot process +due to the APIC not being initialized. Fix that by falling back to the +default APIC base address in 32bit code, as it is done in the 64bit +codepath. + +Signed-off-by: Borislav Petkov +Signed-off-by: H. Peter Anvin +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/apic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/kernel/apic.c ++++ b/arch/x86/kernel/apic.c +@@ -1451,7 +1451,7 @@ static int __init detect_init_APIC(void) + switch (boot_cpu_data.x86_vendor) { + case X86_VENDOR_AMD: + if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || +- (boot_cpu_data.x86 == 15)) ++ (boot_cpu_data.x86 >= 15)) + break; + goto no_apic; + case X86_VENDOR_INTEL: + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:49 2009 +Message-Id: <20090210185549.272137929@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:57 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Darren Salt , + Len Brown +Subject: [patch 20/53] eeepc-laptop: fix oops when changing backlight brightness during eeepc-laptop init +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=eeepc-laptop-fix-oops-when-changing-backlight-brightness-during-eeepc-laptop-init.patch +Content-Length: 2363 +Lines: 61 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Darren Salt + +commit 7695fb04aca62e2d8a7ca6ede50f6211e1d71e53 upstream. + +I got the following oops while changing the backlight brightness during +startup. When it happens, it prevents use of the hotkeys, Fn-Fx, and the +lid button. + +It's a clear use-before-init, as I verified by testing with an +appropriately-placed "else printk". + +BUG: unable to handle kernel NULL pointer dereference at 00000000 +*pde = 00000000 +Oops: 0002 [#1] PREEMPT SMP +Pid: 160, comm: kacpi_notify Not tainted (2.6.28.1-eee901 #4) 901 +EIP: 0060:[] [] eeepc_hotk_notify+26/da +EFLAGS: 00010246 CPU: 1 +Using defaults from ksymoops -t elf32-i386 -a i386 +EAX: 00000009 EBX: 00000000 ECX: 00000009 EDX: f70dbf64 +ESI: 00000029 EDI: f7335188 EBP: c02112c9 ESP: f70dbf80 + DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 + f70731e0 f73acd50 c02164ac f7335180 f70aa040 c02112e6 f733518c c012b62f + f70aa044 f70aa040 c012bdba f70aa04c 00000000 c012be6e 00000000 f70bdf80 + c012e198 f70dbfc4 f70dbfc4 f70aa040 c012bdba 00000000 c012e0c9 c012e091 +Call Trace: + [] ? acpi_ev_notify_dispatch+4c/55 + [] ? acpi_os_execute_deferred+1d/25 + [] ? run_workqueue+71/f1 + [] ? worker_thread+0/bf + [] ? worker_thread+b4/bf + [] ? autoremove_wake_function+0/2b + [] ? worker_thread+0/bf + [] ? kthread+38/5f + [] ? kthread+0/5f + [] ? kernel_thread_helper+7/10 +Code: 00 00 00 00 c3 83 3d 60 5c 50 c0 00 56 89 d6 53 0f 84 c4 00 00 00 8d 42 +e0 83 f8 0f 77 0f 8b 1d 68 5c 50 c0 89 d8 e8 a9 fa ff ff <89> 03 8b 1d 60 5c +50 c0 89 f2 83 e2 7f 0f b7 4c 53 10 8d 41 01 + +Signed-off-by: Darren Salt +Signed-off-by: Andrew Morton +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/eeepc-laptop.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/misc/eeepc-laptop.c ++++ b/drivers/misc/eeepc-laptop.c +@@ -510,7 +510,8 @@ static int eeepc_hotk_check(void) + static void notify_brn(void) + { + struct backlight_device *bd = eeepc_backlight_device; +- bd->props.brightness = read_brightness(bd); ++ if (bd) ++ bd->props.brightness = read_brightness(bd); + } + + static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data) + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:49 2009 +Message-Id: <20090210185549.404972069@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:58 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Matthew Garrett , + Corentin Chary , + Len Brown +Subject: [patch 21/53] eeepc-laptop: Add support for extended hotkeys +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=eeepc-laptop-add-support-for-extended-hotkeys.patch +Content-Length: 974 +Lines: 30 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Matthew Garrett + +commit b5f6f26550700445dcc125bbf75b9104e779d353 upstream. + +Newer Eees have extra hotkeys above the function keys. This patch adds support +for sending them through the input layer. + +Signed-off-by: Matthew Garrett +Signed-off-by: Corentin Chary +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/eeepc-laptop.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/misc/eeepc-laptop.c ++++ b/drivers/misc/eeepc-laptop.c +@@ -161,6 +161,10 @@ static struct key_entry eeepc_keymap[] = + {KE_KEY, 0x13, KEY_MUTE }, + {KE_KEY, 0x14, KEY_VOLUMEDOWN }, + {KE_KEY, 0x15, KEY_VOLUMEUP }, ++ {KE_KEY, 0x1a, KEY_COFFEE }, ++ {KE_KEY, 0x1b, KEY_ZOOM }, ++ {KE_KEY, 0x1c, KEY_PROG2 }, ++ {KE_KEY, 0x1d, KEY_PROG3 }, + {KE_KEY, 0x30, KEY_SWITCHVIDEOMODE }, + {KE_KEY, 0x31, KEY_SWITCHVIDEOMODE }, + {KE_KEY, 0x32, KEY_SWITCHVIDEOMODE }, + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:49 2009 +Message-Id: <20090210185549.536056597@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:59 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Jesse Brandeburg , + "David S. Miller" +Subject: [patch 22/53] e1000: fix bug with shared interrupt during reset +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=e1000-fix-bug-with-shared-interrupt-during-reset.patch +Content-Length: 1350 +Lines: 36 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Jesse Brandeburg + +commit 15b2bee22a0390d951301b53e83df88d0350c499 upstream. + +A nasty bug was found where an MTU change (or anything else that caused a +reset) could race with the interrupt code. The interrupt code was entered +by a shared interrupt during the MTU change. + +This change prevents the interrupt code from running while the driver is in +the middle of its reset path. + +Signed-off-by: Jesse Brandeburg +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- a/drivers/net/e1000/e1000_main.c ++++ b/drivers/net/e1000/e1000_main.c +@@ -31,7 +31,7 @@ + + char e1000_driver_name[] = "e1000"; + static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver"; +-#define DRV_VERSION "7.3.20-k3-NAPI" ++#define DRV_VERSION "7.3.21-k3-NAPI" + const char e1000_driver_version[] = DRV_VERSION; + static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation."; + +@@ -3712,7 +3712,7 @@ static irqreturn_t e1000_intr(int irq, void *data) + struct e1000_hw *hw = &adapter->hw; + u32 rctl, icr = er32(ICR); + +- if (unlikely(!icr)) ++ if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags))) + return IRQ_NONE; /* Not our interrupt */ + + /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:49 2009 +Message-Id: <20090210185549.686154722@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:00 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Karsten Keil , + "David S. Miller" +Subject: [patch 23/53] e1000: Fix PCI enable to honor the need_ioport flag +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=e1000-fix-pci-enable-to-honor-the-need_ioport-flag.patch +Content-Length: 830 +Lines: 28 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Karsten Keil + +commit 4d7155b932b8129c72e2f2714890e20b2a05e0b7 upstream. + +On machine were no IO ports are assigned the call +to pci_enable_device() will fail, even if need_ioport +is false, we need to use pci_enable_device_mem() here. + +Signed-off-by: Karsten Keil +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/e1000/e1000_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/e1000/e1000_main.c ++++ b/drivers/net/e1000/e1000_main.c +@@ -921,7 +921,7 @@ static int __devinit e1000_probe(struct + err = pci_enable_device(pdev); + } else { + bars = pci_select_bars(pdev, IORESOURCE_MEM); +- err = pci_enable_device(pdev); ++ err = pci_enable_device_mem(pdev); + } + if (err) + return err; + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:49 2009 +Message-Id: <20090210185549.835893035@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:01 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Zhenyu Wang , + Eric Anholt , + Dave Airlie +Subject: [patch 24/53] agp/intel: add support for G41 chipset +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=agp-intel-add-support-for-g41-chipset.patch +Content-Length: 2134 +Lines: 60 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Zhenyu Wang + +commit a50ccc6c6623ab0e64f2109881e07c176b2d876f upstream. + +Signed-off-by: Zhenyu Wang +Signed-off-by: Eric Anholt +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/agp/intel-agp.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/char/agp/intel-agp.c ++++ b/drivers/char/agp/intel-agp.c +@@ -40,6 +40,8 @@ + #define PCI_DEVICE_ID_INTEL_Q45_IG 0x2E12 + #define PCI_DEVICE_ID_INTEL_G45_HB 0x2E20 + #define PCI_DEVICE_ID_INTEL_G45_IG 0x2E22 ++#define PCI_DEVICE_ID_INTEL_G41_HB 0x2E30 ++#define PCI_DEVICE_ID_INTEL_G41_IG 0x2E32 + + /* cover 915 and 945 variants */ + #define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \ +@@ -63,7 +65,8 @@ + #define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \ + agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \ + agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \ +- agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB) ++ agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \ ++ agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB) + + extern int agp_memory_reserved; + +@@ -1196,6 +1199,7 @@ static void intel_i965_get_gtt_range(int + case PCI_DEVICE_ID_INTEL_IGD_E_HB: + case PCI_DEVICE_ID_INTEL_Q45_HB: + case PCI_DEVICE_ID_INTEL_G45_HB: ++ case PCI_DEVICE_ID_INTEL_G41_HB: + *gtt_offset = *gtt_size = MB(2); + break; + default: +@@ -2163,6 +2167,8 @@ static const struct intel_driver_descrip + "Q45/Q43", NULL, &intel_i965_driver }, + { PCI_DEVICE_ID_INTEL_G45_HB, PCI_DEVICE_ID_INTEL_G45_IG, 0, + "G45/G43", NULL, &intel_i965_driver }, ++ { PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG, 0, ++ "G41", NULL, &intel_i965_driver }, + { 0, 0, 0, NULL, NULL, NULL } + }; + +@@ -2360,6 +2366,7 @@ static struct pci_device_id agp_intel_pc + ID(PCI_DEVICE_ID_INTEL_IGD_E_HB), + ID(PCI_DEVICE_ID_INTEL_Q45_HB), + ID(PCI_DEVICE_ID_INTEL_G45_HB), ++ ID(PCI_DEVICE_ID_INTEL_G41_HB), + { } + }; + + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:50 2009 +Message-Id: <20090210185549.980605979@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:02 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Eric Anholt , + Dave Airlie +Subject: [patch 25/53] agp/intel: Fix broken ® symbol in device name. +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=agp-intel-fix-broken-symbol-in-device-name.patch +Content-Length: 959 +Lines: 24 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Eric Anholt + +commit b854b2ab959e8175d75e01cf8ed452ed2624d0c8 upstream. + +Signed-off-by: Eric Anholt +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/agp/intel-agp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/char/agp/intel-agp.c ++++ b/drivers/char/agp/intel-agp.c +@@ -2160,7 +2160,7 @@ static const struct intel_driver_descrip + { PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33", + NULL, &intel_g33_driver }, + { PCI_DEVICE_ID_INTEL_GM45_HB, PCI_DEVICE_ID_INTEL_GM45_IG, 0, +- "Mobile Intel? GM45 Express", NULL, &intel_i965_driver }, ++ "Mobile Intel® GM45 Express", NULL, &intel_i965_driver }, + { PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0, + "Intel Integrated Graphics Device", NULL, &intel_i965_driver }, + { PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG, 0, + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:50 2009 +Message-Id: <20090210185550.137879032@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:03 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Takashi Iwai +Subject: [patch 26/53] ALSA: hda - Add quirk for FSC Amilo Xi2550 +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-add-quirk-for-fsc-amilo-xi2550.patch +Content-Length: 1062 +Lines: 28 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Takashi Iwai + +commit f67d8176ba9a3dbc33454cd67057184b2ef5ee31 upstream. + +Added model=fujisu-pi2515 for FSC Amilo Xi2550 with ALC883 codec. + +Refernece: Novell bnc#450979 + https://bugzilla.novell.com/show_bug.cgi?id=450979 + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8463,6 +8463,8 @@ static struct snd_pci_quirk alc883_cfg_t + SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD), + SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch), + SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), ++ SND_PCI_QUIRK(0x1734, 0x1107, "FSC AMILO Xi2550", ++ ALC883_FUJITSU_PI2515), + SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515), + SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch), + SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763), + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:50 2009 +Message-Id: <20090210185550.291923476@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:04 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Takashi Iwai +Subject: [patch 27/53] ALSA: hda - Add missing COEF initialization for ALC887 +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-add-missing-coef-initialization-for-alc887.patch +Content-Length: 547 +Lines: 22 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Takashi Iwai + +commit 4a5a4c56b443a213fa9c2ad27984a8681a3d7087 upstream. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -995,6 +995,7 @@ do_sku: + case 0x10ec0882: + case 0x10ec0883: + case 0x10ec0885: ++ case 0x10ec0887: + case 0x10ec0889: + snd_hda_codec_write(codec, 0x20, 0, + AC_VERB_SET_COEF_INDEX, 7); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:50 2009 +Message-Id: <20090210185550.421779651@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:05 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Takashi Iwai +Subject: [patch 28/53] ALSA: hda - Add missing initialization for ALC272 +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-add-missing-initialization-for-alc272.patch +Content-Length: 585 +Lines: 25 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Takashi Iwai + +commit c6e8f2daadc6d61a32b7486a1058c8f1f9baa499 upstream. + +ALC272 needs EAPD for speaker outputs as well as other similar ALC +codecs. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -967,6 +967,7 @@ do_sku: + case 0x10ec0267: + case 0x10ec0268: + case 0x10ec0269: ++ case 0x10ec0272: + case 0x10ec0660: + case 0x10ec0662: + case 0x10ec0663: + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:50 2009 +Message-Id: <20090210185550.557525873@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:06 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Corentin Chary , + Len Brown +Subject: [patch 29/53] asus_acpi: Add R1F support +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=asus_acpi-add-r1f-support.patch +Content-Length: 1411 +Lines: 54 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Corentin Chary + +commit 1021e2119eb33a990a2b9ff1410805dd9bdf7997 upstream. + +Add R1F support + +Signed-off-by: Corentin Chary +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/asus_acpi.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +--- a/drivers/acpi/asus_acpi.c ++++ b/drivers/acpi/asus_acpi.c +@@ -143,6 +143,7 @@ struct asus_hotk { + S1300N, S5200N*/ + A4S, /* Z81sp */ + F3Sa, /* (Centrino) */ ++ R1F, + END_MODEL + } model; /* Models currently supported */ + u16 event_count[128]; /* Count for each event TODO make this better */ +@@ -420,7 +421,18 @@ static struct model_data model_conf[END_ + .display_get = "\\ADVG", + .display_set = "SDSP", + }, +- ++ { ++ .name = "R1F", ++ .mt_bt_switch = "BLED", ++ .mt_mled = "MLED", ++ .mt_wled = "WLED", ++ .mt_lcd_switch = "\\Q10", ++ .lcd_status = "\\GP06", ++ .brightness_set = "SPLV", ++ .brightness_get = "GPLV", ++ .display_set = "SDSP", ++ .display_get = "\\INFB" ++ } + }; + + /* procdir we use */ +@@ -1165,6 +1177,8 @@ static int asus_model_match(char *model) + return W3V; + else if (strncmp(model, "W5A", 3) == 0) + return W5A; ++ else if (strncmp(model, "R1F", 3) == 0) ++ return R1F; + else if (strncmp(model, "A4S", 3) == 0) + return A4S; + else if (strncmp(model, "F3Sa", 4) == 0) + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:50 2009 +Message-Id: <20090210185550.698962356@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:07 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Roel Kluin , + Len Brown +Subject: [patch 30/53] panasonic-laptop: fix X[ ARRAY_SIZE(X) ] +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=panasonic-laptop-fix-x.patch +Content-Length: 794 +Lines: 26 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Roel Kluin + +commit 2b190e76def5233c542f6025b4a133b1d4bd1a37 upstream. + +Ensure pcc->keymap[ ARRAY_SIZE(pcc->keymap) ] does not occur. + +Signed-off-by: Roel Kluin +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/panasonic-laptop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/misc/panasonic-laptop.c ++++ b/drivers/misc/panasonic-laptop.c +@@ -515,7 +515,7 @@ static void acpi_pcc_generate_keyinput(s + + hkey_num = result & 0xf; + +- if (hkey_num < 0 || hkey_num > ARRAY_SIZE(pcc->keymap)) { ++ if (hkey_num < 0 || hkey_num >= ARRAY_SIZE(pcc->keymap)) { + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "hotkey number out of range: %d\n", + hkey_num)); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:50 2009 +Message-Id: <20090210185550.850287883@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:08 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Zhao Yakui , + Len Brown +Subject: [patch 31/53] ACPI: Skip the first two elements in the _BCL package +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=acpi-skip-the-first-two-elements-in-the-_bcl-package.patch +Content-Length: 2726 +Lines: 68 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Zhao Yakui + +commit 0a3db1cec5d476804185114ff5d1845aed3936b3 upstream. + +According to the Spec the first two elements in the _BCL package won't be + +regarded as the available brightness level. The first is the brightness when +full power is connected to the box(It means that the AC adapter is plugged). +The second is the brightness level when the box is on battery. + If the first two elements are still used while finding the next brightness +level, it will fall back to the lowest level when keeping on pressing +hotkey. (On some boxes the brightness will be changed twice when hotkey is +pressed once. One is in the ACPI video driver. The other is changed by sys I/F. +In the ACPI video driver the first two elements will be used while changing +the brightness. But the first two elements is skipped while using sys I/F. +In such case there exists the inconsistency). + So he first two elements had better be skipped while showing the available +brightness or finding the next brightness level. + +http://bugzilla.kernel.org/show_bug.cgi?id=12450 + +Signed-off-by: Zhao Yakui +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/acpi/video.c ++++ b/drivers/acpi/video.c +@@ -1005,7 +1005,7 @@ acpi_video_device_brightness_seq_show(st + } + + seq_printf(seq, "levels: "); +- for (i = 0; i < dev->brightness->count; i++) ++ for (i = 2; i < dev->brightness->count; i++) + seq_printf(seq, " %d", dev->brightness->levels[i]); + seq_printf(seq, "\ncurrent: %d\n", dev->brightness->curr); + +@@ -1044,7 +1044,7 @@ acpi_video_device_write_brightness(struc + return -EFAULT; + + /* validate through the list of available levels */ +- for (i = 0; i < dev->brightness->count; i++) ++ for (i = 2; i < dev->brightness->count; i++) + if (level == dev->brightness->levels[i]) { + if (ACPI_SUCCESS + (acpi_video_device_lcd_set_level(dev, level))) +@@ -1697,7 +1697,7 @@ acpi_video_get_next_level(struct acpi_vi + max = max_below = 0; + min = min_above = 255; + /* Find closest level to level_current */ +- for (i = 0; i < device->brightness->count; i++) { ++ for (i = 2; i < device->brightness->count; i++) { + l = device->brightness->levels[i]; + if (abs(l - level_current) < abs(delta)) { + delta = l - level_current; +@@ -1707,7 +1707,7 @@ acpi_video_get_next_level(struct acpi_vi + } + /* Ajust level_current to closest available level */ + level_current += delta; +- for (i = 0; i < device->brightness->count; i++) { ++ for (i = 2; i < device->brightness->count; i++) { + l = device->brightness->levels[i]; + if (l < min) + min = l; + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:51 2009 +Message-Id: <20090210185550.996809783@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:09 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Zhao Yakui , + Len Brown +Subject: [patch 32/53] ACPI: proc_dir_entry video/VGA already registered +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=acpi-proc_dir_entry-video-vga-already-registered.patch +Content-Length: 873 +Lines: 32 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Zhao Yakui + +commit f3b39f1393d5cebe56f43a584ef47efbebd2702c upstream. + +eliminate the duplicate the name of "VGA" + +http://bugzilla.kernel.org/show_bug.cgi?id=12514 + +Signed-off-by: Zhao Yakui +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/acpi/video.c ++++ b/drivers/acpi/video.c +@@ -1991,6 +1991,12 @@ static int acpi_video_bus_add(struct acp + device->pnp.bus_id[3] = '0' + instance; + instance ++; + } ++ /* a hack to fix the duplicate name "VGA" problem on Pa 3553 */ ++ if (!strcmp(device->pnp.bus_id, "VGA")) { ++ if (instance) ++ device->pnp.bus_id[3] = '0' + instance; ++ instance++; ++ } + + video->device = device; + strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:51 2009 +Message-Id: <20090210185551.155965200@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:10 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Len Brown +Subject: [patch 33/53] ACPI: disable ACPI cleanly when bad RSDP found +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=acpi-disable-acpi-cleanly-when-bad-rsdp-found.patch +Content-Length: 1181 +Lines: 46 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Len Brown + +commit 9e3a9d1ed8cc8db93e5c53e9a5b09065bd95de8b upstream. + +When ACPI is disabled in the BIOS of this VIA C3 box, +it invalidates the RSDP, which Linux notices: + +ACPI Error (tbxfroot-0218): A valid RSDP was not found [20080926] + +Bug Linux neglected to disable ACPI at that stage, +and later scribbled on smp_found_config: + +ACPI: No APIC-table, disabling MPS + +But this box doesn't run well in legacy PIC mode, +it needed IOAPIC mode to perform correctly: + +http://lkml.org/lkml/2009/2/5/39 + +So exit ACPI mode cleanly when we first detect +that it is hopeless. + +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/tables.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/acpi/tables.c ++++ b/drivers/acpi/tables.c +@@ -293,7 +293,12 @@ static void __init check_multiple_madt(v + + int __init acpi_table_init(void) + { +- acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0); ++ acpi_status status; ++ ++ status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0); ++ if (ACPI_FAILURE(status)) ++ return 1; ++ + check_multiple_madt(); + return 0; + } + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:51 2009 +Message-Id: <20090210185551.307919925@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:11 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Myron Stowe , + Len Brown +Subject: [patch 34/53] ACPICA: Fix table entry truncation calculation +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=acpica-fix-table-entry-truncation-calculation.patch +Content-Length: 1501 +Lines: 43 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Myron Stowe + +commit 386e4a8358239f90275e1f93d5ad11cdc93c6453 upstream. + +During early boot, ACPI RSDT/XSDT table entries are gathered into the +'initial_tables[]' array. This array is currently statically defined (see +./drivers/acpi/tables.c). When there are more table entries than can be +held in the 'initial_tables[]' array, the message "Truncating N table +entries!" is output. As currently implemented, this message will always +erroneously calculate N as 0. + +This patch fixes the calculation that determines how many table entries +will be missing (truncated). + +This modification may be used under either the GPL or the BSD-style +license used for Intel ACPI CA code. + +Signed-off-by: Myron Stowe +Signed-off-by: Andrew Morton +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/tables/tbutils.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/acpi/tables/tbutils.c ++++ b/drivers/acpi/tables/tbutils.c +@@ -512,10 +512,9 @@ acpi_tb_parse_root_table(acpi_physical_a + if (ACPI_FAILURE(status)) { + ACPI_WARNING((AE_INFO, + "Truncating %u table entries!", +- (unsigned) +- (acpi_gbl_root_table_list.size - +- acpi_gbl_root_table_list. +- count))); ++ (unsigned) (table_count - ++ (acpi_gbl_root_table_list. ++ count - 2)))); + break; + } + } + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:51 2009 +Message-Id: <20090210185551.457791141@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:12 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Shaohua Li , + Alex Chiang , + Jesse Barnes +Subject: [patch 35/53] PCI: properly clean up ASPM link state on device remove +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=pci-properly-clean-up-aspm-link-state-on-device-remove.patch +Content-Length: 1573 +Lines: 43 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Alex Chiang + +commit 3419c75e15f82c3ab09bd944fddbde72c9e4b3ea upstream. + +We only want to disable ASPM when the last function is removed from +the parent's device list. We determine this by checking to see if +the parent's device list is completely empty. + +Unfortunately, we never hit that code because the parent is considered +an upstream port, and never had an ASPM link_state associated with it. + +The early check for !link_state causes us to return early, we never +discover that our device list is empty, and thus we never remove the +downstream ports' link_state nodes. + +Instead of checking to see if the parent's device list is empty, we can +check to see if we are the last device on the list, and if so, then we +know that we can clean up properly. + +Cc: Shaohua Li +Signed-off-by: Alex Chiang +Signed-off-by: Jesse Barnes +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pci/pcie/aspm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/pci/pcie/aspm.c ++++ b/drivers/pci/pcie/aspm.c +@@ -713,9 +713,9 @@ void pcie_aspm_exit_link_state(struct pc + + /* + * All PCIe functions are in one slot, remove one function will remove +- * the the whole slot, so just wait ++ * the whole slot, so just wait until we are the last function left. + */ +- if (!list_empty(&parent->subordinate->devices)) ++ if (!list_is_last(&pdev->bus_list, &parent->subordinate->devices)) + goto out; + + /* All functions are removed, so just disable ASPM for the link */ + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:51 2009 +Message-Id: <20090210185551.616134088@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:13 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + "Timothy S. Nelson" , + Alex Villacis-Lasso , + Jesse Barnes +Subject: [patch 36/53] PCI: return error on failure to read PCI ROMs +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=pci-return-error-on-failure-to-read-pci-roms.patch +Content-Length: 5663 +Lines: 142 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Timothy S. Nelson + +commit 97c44836cdec1ea713a15d84098a1a908157e68f upstream. + +This patch makes the ROM reading code return an error to user space if +the size of the ROM read is equal to 0. + +The patch also emits a warnings if the contents of the ROM are invalid, +and documents the effects of the "enable" file on ROM reading. + +Signed-off-by: Timothy S. Nelson +Acked-by: Alex Villacis-Lasso +Signed-off-by: Jesse Barnes +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/filesystems/sysfs-pci.txt | 13 ++++++++++++- + arch/ia64/sn/kernel/io_acpi_init.c | 2 +- + arch/ia64/sn/kernel/io_init.c | 2 +- + drivers/pci/pci-sysfs.c | 4 ++-- + drivers/pci/rom.c | 8 +++++--- + include/linux/pci.h | 2 +- + 6 files changed, 22 insertions(+), 9 deletions(-) + +--- a/arch/ia64/sn/kernel/io_acpi_init.c ++++ b/arch/ia64/sn/kernel/io_acpi_init.c +@@ -434,7 +434,7 @@ sn_acpi_slot_fixup(struct pci_dev *dev) + size = pci_resource_len(dev, PCI_ROM_RESOURCE); + addr = ioremap(pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE], + size); +- image_size = pci_get_rom_size(addr, size); ++ image_size = pci_get_rom_size(dev, addr, size); + dev->resource[PCI_ROM_RESOURCE].start = (unsigned long) addr; + dev->resource[PCI_ROM_RESOURCE].end = + (unsigned long) addr + image_size - 1; +--- a/arch/ia64/sn/kernel/io_init.c ++++ b/arch/ia64/sn/kernel/io_init.c +@@ -269,7 +269,7 @@ sn_io_slot_fixup(struct pci_dev *dev) + + rom = ioremap(pci_resource_start(dev, PCI_ROM_RESOURCE), + size + 1); +- image_size = pci_get_rom_size(rom, size + 1); ++ image_size = pci_get_rom_size(dev, rom, size + 1); + dev->resource[PCI_ROM_RESOURCE].end = + dev->resource[PCI_ROM_RESOURCE].start + + image_size - 1; +--- a/Documentation/filesystems/sysfs-pci.txt ++++ b/Documentation/filesystems/sysfs-pci.txt +@@ -9,6 +9,7 @@ that support it. For example, a given b + | |-- class + | |-- config + | |-- device ++ | |-- enable + | |-- irq + | |-- local_cpus + | |-- resource +@@ -32,6 +33,7 @@ files, each with their own function. + class PCI class (ascii, ro) + config PCI config space (binary, rw) + device PCI device (ascii, ro) ++ enable Whether the device is enabled (ascii, rw) + irq IRQ number (ascii, ro) + local_cpus nearby CPU mask (cpumask, ro) + resource PCI resource host addresses (ascii, ro) +@@ -57,10 +59,19 @@ used to do actual device programming fro + don't support mmapping of certain resources, so be sure to check the return + value from any attempted mmap. + ++The 'enable' file provides a counter that indicates how many times the device ++has been enabled. If the 'enable' file currently returns '4', and a '1' is ++echoed into it, it will then return '5'. Echoing a '0' into it will decrease ++the count. Even when it returns to 0, though, some of the initialisation ++may not be reversed. ++ + The 'rom' file is special in that it provides read-only access to the device's + ROM file, if available. It's disabled by default, however, so applications + should write the string "1" to the file to enable it before attempting a read +-call, and disable it following the access by writing "0" to the file. ++call, and disable it following the access by writing "0" to the file. Note ++that the device must be enabled for a rom read to return data succesfully. ++In the event a driver is not bound to the device, it can be enabled using the ++'enable' file, documented above. + + Accessing legacy resources through sysfs + ---------------------------------------- +--- a/drivers/pci/pci-sysfs.c ++++ b/drivers/pci/pci-sysfs.c +@@ -777,8 +777,8 @@ pci_read_rom(struct kobject *kobj, struc + return -EINVAL; + + rom = pci_map_rom(pdev, &size); /* size starts out as PCI window size */ +- if (!rom) +- return 0; ++ if (!rom || !size) ++ return -EIO; + + if (off >= size) + count = 0; +--- a/drivers/pci/rom.c ++++ b/drivers/pci/rom.c +@@ -63,7 +63,7 @@ void pci_disable_rom(struct pci_dev *pde + * The PCI window size could be much larger than the + * actual image size. + */ +-size_t pci_get_rom_size(void __iomem *rom, size_t size) ++size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size) + { + void __iomem *image; + int last_image; +@@ -72,8 +72,10 @@ size_t pci_get_rom_size(void __iomem *ro + do { + void __iomem *pds; + /* Standard PCI ROMs start out with these bytes 55 AA */ +- if (readb(image) != 0x55) ++ if (readb(image) != 0x55) { ++ dev_err(&pdev->dev, "Invalid ROM contents\n"); + break; ++ } + if (readb(image + 1) != 0xAA) + break; + /* get the PCI data structure and check its signature */ +@@ -159,7 +161,7 @@ void __iomem *pci_map_rom(struct pci_dev + * size is much larger than the actual size of the ROM. + * True size is important if the ROM is going to be copied. + */ +- *size = pci_get_rom_size(rom, *size); ++ *size = pci_get_rom_size(pdev, rom, *size); + return rom; + } + +--- a/include/linux/pci.h ++++ b/include/linux/pci.h +@@ -651,7 +651,7 @@ int pci_enable_rom(struct pci_dev *pdev) + void pci_disable_rom(struct pci_dev *pdev); + void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); + void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); +-size_t pci_get_rom_size(void __iomem *rom, size_t size); ++size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size); + + /* Power management related routines */ + int pci_save_state(struct pci_dev *dev); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:51 2009 +Message-Id: <20090210185551.749109862@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:14 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Eric Biederman , + Paul Turner , + Alexey Dobriyan , + Al Viro +Subject: [patch 37/53] seq_file: move traverse so it can be used from seq_read +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=seq_file-move-traverse-so-it-can-be-used-from-seq_read.patch +Content-Length: 3433 +Lines: 155 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Eric Biederman + +commit 33da8892a2f9e7d4b2d9a35fc80833ba2d2b1aa6 upstream. + +In 2.6.25 some /proc files were converted to use the seq_file +infrastructure. But seq_files do not correctly support pread(), which +broke some usersapce applications. + +To handle pread correctly we can't assume that f_pos is where we left it +in seq_read. So move traverse() so that we can eventually use it in +seq_read and do thus some day support pread(). + +Signed-off-by: Eric Biederman +Cc: Paul Turner +Cc: Alexey Dobriyan +Cc: Al Viro +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/seq_file.c | 114 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 57 insertions(+), 57 deletions(-) + +--- a/fs/seq_file.c ++++ b/fs/seq_file.c +@@ -54,6 +54,63 @@ int seq_open(struct file *file, const st + } + EXPORT_SYMBOL(seq_open); + ++static int traverse(struct seq_file *m, loff_t offset) ++{ ++ loff_t pos = 0, index; ++ int error = 0; ++ void *p; ++ ++ m->version = 0; ++ index = 0; ++ m->count = m->from = 0; ++ if (!offset) { ++ m->index = index; ++ return 0; ++ } ++ if (!m->buf) { ++ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL); ++ if (!m->buf) ++ return -ENOMEM; ++ } ++ p = m->op->start(m, &index); ++ while (p) { ++ error = PTR_ERR(p); ++ if (IS_ERR(p)) ++ break; ++ error = m->op->show(m, p); ++ if (error < 0) ++ break; ++ if (unlikely(error)) { ++ error = 0; ++ m->count = 0; ++ } ++ if (m->count == m->size) ++ goto Eoverflow; ++ if (pos + m->count > offset) { ++ m->from = offset - pos; ++ m->count -= m->from; ++ m->index = index; ++ break; ++ } ++ pos += m->count; ++ m->count = 0; ++ if (pos == offset) { ++ index++; ++ m->index = index; ++ break; ++ } ++ p = m->op->next(m, p, &index); ++ } ++ m->op->stop(m, p); ++ return error; ++ ++Eoverflow: ++ m->op->stop(m, p); ++ kfree(m->buf); ++ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL); ++ return !m->buf ? -ENOMEM : -EAGAIN; ++} ++ + /** + * seq_read - ->read() method for sequential files. + * @file: the file to read from +@@ -186,63 +243,6 @@ Efault: + } + EXPORT_SYMBOL(seq_read); + +-static int traverse(struct seq_file *m, loff_t offset) +-{ +- loff_t pos = 0, index; +- int error = 0; +- void *p; +- +- m->version = 0; +- index = 0; +- m->count = m->from = 0; +- if (!offset) { +- m->index = index; +- return 0; +- } +- if (!m->buf) { +- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL); +- if (!m->buf) +- return -ENOMEM; +- } +- p = m->op->start(m, &index); +- while (p) { +- error = PTR_ERR(p); +- if (IS_ERR(p)) +- break; +- error = m->op->show(m, p); +- if (error < 0) +- break; +- if (unlikely(error)) { +- error = 0; +- m->count = 0; +- } +- if (m->count == m->size) +- goto Eoverflow; +- if (pos + m->count > offset) { +- m->from = offset - pos; +- m->count -= m->from; +- m->index = index; +- break; +- } +- pos += m->count; +- m->count = 0; +- if (pos == offset) { +- index++; +- m->index = index; +- break; +- } +- p = m->op->next(m, p, &index); +- } +- m->op->stop(m, p); +- return error; +- +-Eoverflow: +- m->op->stop(m, p); +- kfree(m->buf); +- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL); +- return !m->buf ? -ENOMEM : -EAGAIN; +-} +- + /** + * seq_lseek - ->llseek() method for sequential files. + * @file: the file in question + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185551.909692292@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:15 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Alexey Dobriyan +Subject: [patch 38/53] seq_file: fix big-enough lseek() + read() +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=seq_file-fix-big-enough-lseek-read.patch +Content-Length: 836 +Lines: 27 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Alexey Dobriyan + +commit f01d1d546abb2f4028b5299092f529eefb01253a upstream. + +lseek() further than length of the file will leave stale ->index +(second-to-last during iteration). Next seq_read() will not notice +that ->f_pos is big enough to return 0, but will print last item +as if ->f_pos is pointing to it. + +Introduced in commit cb510b8172602a66467f3551b4be1911f5a7c8c2 +aka "seq_file: more atomicity in traverse()". + +Signed-off-by: Alexey Dobriyan +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- a/fs/seq_file.c ++++ b/fs/seq_file.c +@@ -102,6 +102,7 @@ static int traverse(struct seq_file *m, loff_t offset) + p = m->op->next(m, p, &index); + } + m->op->stop(m, p); ++ m->index = index; + return error; + + Eoverflow: + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185552.046982215@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:16 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Niels de Vos , + Alan Cox +Subject: [patch 39/53] serial: set correct baud_base for Oxford Semiconductor Ltd EXSYS EX-41092 Dual 16950 Serial adapter +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=serial-set-correct-baud_base-for-oxford-semiconductor-ltd-exsys-ex-41092-dual-16950-serial-adapter.patch +Content-Length: 1471 +Lines: 42 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Niels de Vos + +commit 39aced68d664291db3324d0fcf0985ab5626aac2 upstream. + +The PCI-card identified as "Oxford Semiconductor Ltd EXSYS EX-41092 Dual +16950 Serial adapter" is only usable with other devices (i.e. not the same +card) after doing a "setserial /dev/ttyS baud_base 115200". This +baud_base should be default for this card. + +Signed-off-by: Niels de Vos +Signed-off-by: Alan Cox +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/serial/8250_pci.c | 3 +++ + include/linux/pci_ids.h | 1 + + 2 files changed, 4 insertions(+) + +--- a/drivers/serial/8250_pci.c ++++ b/drivers/serial/8250_pci.c +@@ -2375,6 +2375,9 @@ static struct pci_device_id serial_pci_t + * For now just used the hex ID 0x950a. + */ + { PCI_VENDOR_ID_OXSEMI, 0x950a, ++ PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL, 0, 0, ++ pbn_b0_2_115200 }, ++ { PCI_VENDOR_ID_OXSEMI, 0x950a, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, + pbn_b0_2_1130000 }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954, +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -1770,6 +1770,7 @@ + #define PCI_DEVICE_ID_SIIG_8S_20x_650 0x2081 + #define PCI_DEVICE_ID_SIIG_8S_20x_850 0x2082 + #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050 ++#define PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL 0x2530 + + #define PCI_VENDOR_ID_RADISYS 0x1331 + + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185552.224484525@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:17 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Michael Bramer , + Alan Cox +Subject: [patch 40/53] Add support for 8-port RS-232 MIC-3620 from advantech +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=add-support-for-8-port-rs-232-mic-3620-from-advantech.patch +Content-Length: 1539 +Lines: 39 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Michael Bramer + +commit 78d70d48132ce4c678a95b771ffa1af4fb5a03ec upstream. + +This Patch add the device information for the +MIC-3620 8-port RS-232 cPCI card from Advantech Co. Ltd. + +Signed-off-by: Michael Bramer +Signed-off-by: Alan Cox +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/serial/8250_pci.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/serial/8250_pci.c ++++ b/drivers/serial/8250_pci.c +@@ -766,6 +766,8 @@ pci_default_setup(struct serial_private + #define PCI_SUBDEVICE_ID_OCTPRO422 0x0208 + #define PCI_SUBDEVICE_ID_POCTAL232 0x0308 + #define PCI_SUBDEVICE_ID_POCTAL422 0x0408 ++#define PCI_VENDOR_ID_ADVANTECH 0x13fe ++#define PCI_DEVICE_ID_ADVANTECH_PCI3620 0x3620 + + /* Unknown vendors/cards - this should not be in linux/pci_ids.h */ + #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584 +@@ -2132,6 +2134,10 @@ static int pciserial_resume_one(struct p + #endif + + static struct pci_device_id serial_pci_tbl[] = { ++ /* Advantech use PCI_DEVICE_ID_ADVANTECH_PCI3620 (0x3620) as 'PCI_SUBVENDOR_ID' */ ++ { PCI_VENDOR_ID_ADVANTECH, PCI_DEVICE_ID_ADVANTECH_PCI3620, ++ PCI_DEVICE_ID_ADVANTECH_PCI3620, 0x0001, 0, 0, ++ pbn_b2_8_921600 }, + { PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960, + PCI_SUBVENDOR_ID_CONNECT_TECH, + PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232, 0, 0, + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185552.311853874@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:18 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Hugh Dickins +Subject: [patch 41/53] mm: fix error case in mlock downgrade reversion +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=mm-fix-error-case-in-mlock-downgrade-reversion.patch +Content-Length: 1137 +Lines: 34 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Hugh Dickins + +commit d5b562330ec766292a3ac54ae5e0673610bd5b3d upstream. + +Commit 27421e211a39784694b597dbf35848b88363c248, Manually revert +"mlock: downgrade mmap sem while populating mlocked regions", has +introduced its own regression: __mlock_vma_pages_range() may report +an error (for example, -EFAULT from trying to lock down pages from +beyond EOF), but mlock_vma_pages_range() must hide that from its +callers as before. + +Reported-by: Sami Farin +Signed-off-by: Hugh Dickins +Signed-off-by: Linus Torvalds + +--- + mm/mlock.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/mm/mlock.c ++++ b/mm/mlock.c +@@ -310,7 +310,10 @@ long mlock_vma_pages_range(struct vm_are + is_vm_hugetlb_page(vma) || + vma == get_gate_vma(current))) { + +- return __mlock_vma_pages_range(vma, start, end, 1); ++ __mlock_vma_pages_range(vma, start, end, 1); ++ ++ /* Hide errors from mmap() and other callers */ ++ return 0; + } + + /* + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185552.446477063@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:19 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Roland McGrath +Subject: [patch 42/53] elf core dump: fix get_user use +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=elf-core-dump-fix-get_user-use.patch +Content-Length: 1968 +Lines: 54 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Roland McGrath + +commit 92dc07b1f988e8c237a38e23be660b9b8533e6fd upstream. + +The elf_core_dump() code does its work with set_fs(KERNEL_DS) in force, +so vma_dump_size() needs to switch back with set_fs(USER_DS) to safely +use get_user() for a normal user-space address. + +Checking for VM_READ optimizes out the case where get_user() would fail +anyway. The vm_file check here was already superfluous given the control +flow earlier in the function, so that is a cleanup/optimization unrelated +to other changes but an obvious and trivial one. + +Reported-by: Gerald Schaefer +Signed-off-by: Roland McGrath +Signed-off-by: Greg Kroah-Hartman + +--- + fs/binfmt_elf.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- a/fs/binfmt_elf.c ++++ b/fs/binfmt_elf.c +@@ -1196,9 +1196,11 @@ static unsigned long vma_dump_size(struc + * check for an ELF header. If we find one, dump the first page to + * aid in determining what was mapped here. + */ +- if (FILTER(ELF_HEADERS) && vma->vm_file != NULL && vma->vm_pgoff == 0) { ++ if (FILTER(ELF_HEADERS) && ++ vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) { + u32 __user *header = (u32 __user *) vma->vm_start; + u32 word; ++ mm_segment_t fs = get_fs(); + /* + * Doing it this way gets the constant folded by GCC. + */ +@@ -1211,7 +1213,15 @@ static unsigned long vma_dump_size(struc + magic.elfmag[EI_MAG1] = ELFMAG1; + magic.elfmag[EI_MAG2] = ELFMAG2; + magic.elfmag[EI_MAG3] = ELFMAG3; +- if (get_user(word, header) == 0 && word == magic.cmp) ++ /* ++ * Switch to the user "segment" for get_user(), ++ * then put back what elf_core_dump() had in place. ++ */ ++ set_fs(USER_DS); ++ if (unlikely(get_user(word, header))) ++ word = 0; ++ set_fs(fs); ++ if (word == magic.cmp) + return PAGE_SIZE; + } + + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185552.592494911@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:20 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Zhang Rui , + Len Brown , + Thomas Renninger +Subject: [patch 43/53] ACPI: video: Fix reversed brightness behavior on ThinkPad SL series +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=acpi-video-fix-reversed-brightness-behavior-on-thinkpad-sl-series.patch +Content-Length: 1905 +Lines: 66 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Zhang Rui + +commit 935e5f290ec1eb0f1c15004421f5fd3154380fd5 upstream. + +Section B.6.2 of ACPI 3.0b specification that defines _BCL method +doesn't require the brightness levels returned to be sorted. +At least ThinkPad SL300 (and probably all IdeaPads) returns the +array reversed (i.e. bightest levels have lowest indexes), which +causes the brightness management behave in completely reversed +manner on these machines (brightness increases when the laptop is +idle, while the display dims when used). + +Sorting the array by brightness level values after reading the list +fixes the issue. + +http://bugzilla.kernel.org/show_bug.cgi?id=12037 + +Signed-off-by: Zhang Rui +Tested-by: Lubomir Rintel +Signed-off-by: Len Brown +Signed-off-by: Thomas Renninger +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +--- a/drivers/acpi/video.c ++++ b/drivers/acpi/video.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -631,6 +632,16 @@ acpi_video_bus_DOS(struct acpi_video_bus + } + + /* ++ * Simple comparison function used to sort backlight levels. ++ */ ++ ++static int ++acpi_video_cmp_level(const void *a, const void *b) ++{ ++ return *(int *)a - *(int *)b; ++} ++ ++/* + * Arg: + * device : video output device (LCD, CRT, ..) + * +@@ -681,6 +692,10 @@ acpi_video_init_brightness(struct acpi_v + count++; + } + ++ /* don't sort the first two brightness levels */ ++ sort(&br->levels[2], count - 2, sizeof(br->levels[2]), ++ acpi_video_cmp_level, NULL); ++ + if (count < 2) + goto out_free_levels; + + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185552.721026125@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:21 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Helmut Schaa , + "John W. Linville" +Subject: [patch 44/53] ipw2200: fix scanning while associated +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=ipw2200-fix-scanning-while-associated.patch +Content-Length: 4294 +Lines: 106 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Helmut Schaa + +commit 14a4dfe2ff8c353f59ae8324059ded1cfe22c7d9 upstream. + +This patch fixes sporadic firmware restarts when scanning while associated. + +The firmware will quietly cancel a scan (while associated) if the dwell time +for a channel to be scanned is larger than the time it may stay away from the +operating channel (because of DTIM catching). Unfortunately the driver is not +notified about the canceled scan and therefore the scan watchdog timeout will +be hit and the driver causes a firmware restart which results in +disassociation. This mainly happens on passive channels which use a dwell time +of 120 whereas a typical beacon interval is around 100. + +The patch changes the dwell time for passive channels to be slightly smaller +than the actual beacon interval to work around the firmware issue. Furthermore +the number of allowed beacon misses is increased from one to three as otherwise +most scans (while associated) won't complete successfully. + +However scanning while associated will still fail in corner cases such as a +beacon intervals below 30. + +Signed-off-by: Helmut Schaa +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ipw2200.c | 28 ++++++++++++++++++++++------ + drivers/net/wireless/ipw2200.h | 1 + + 2 files changed, 23 insertions(+), 6 deletions(-) + +--- a/drivers/net/wireless/ipw2200.c ++++ b/drivers/net/wireless/ipw2200.c +@@ -4347,7 +4347,8 @@ static void ipw_handle_missed_beacon(str + return; + } + +- if (priv->status & STATUS_SCANNING) { ++ if (priv->status & STATUS_SCANNING && ++ missed_count > IPW_MB_SCAN_CANCEL_THRESHOLD) { + /* Stop scan to keep fw from getting + * stuck (only if we aren't roaming -- + * otherwise we'll never scan more than 2 or 3 +@@ -6277,6 +6278,20 @@ static void ipw_add_scan_channels(struct + } + } + ++static int ipw_passive_dwell_time(struct ipw_priv *priv) ++{ ++ /* staying on passive channels longer than the DTIM interval during a ++ * scan, while associated, causes the firmware to cancel the scan ++ * without notification. Hence, don't stay on passive channels longer ++ * than the beacon interval. ++ */ ++ if (priv->status & STATUS_ASSOCIATED ++ && priv->assoc_network->beacon_interval > 10) ++ return priv->assoc_network->beacon_interval - 10; ++ else ++ return 120; ++} ++ + static int ipw_request_scan_helper(struct ipw_priv *priv, int type, int direct) + { + struct ipw_scan_request_ext scan; +@@ -6320,16 +6335,16 @@ static int ipw_request_scan_helper(struc + scan.full_scan_index = cpu_to_le32(ieee80211_get_scans(priv->ieee)); + + if (type == IW_SCAN_TYPE_PASSIVE) { +- IPW_DEBUG_WX("use passive scanning\n"); +- scan_type = IPW_SCAN_PASSIVE_FULL_DWELL_SCAN; ++ IPW_DEBUG_WX("use passive scanning\n"); ++ scan_type = IPW_SCAN_PASSIVE_FULL_DWELL_SCAN; + scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = +- cpu_to_le16(120); ++ cpu_to_le16(ipw_passive_dwell_time(priv)); + ipw_add_scan_channels(priv, &scan, scan_type); + goto send_request; + } + + /* Use active scan by default. */ +- if (priv->config & CFG_SPEED_SCAN) ++ if (priv->config & CFG_SPEED_SCAN) + scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_SCAN] = + cpu_to_le16(30); + else +@@ -6339,7 +6354,8 @@ static int ipw_request_scan_helper(struc + scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN] = + cpu_to_le16(20); + +- scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(120); ++ scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = ++ cpu_to_le16(ipw_passive_dwell_time(priv)); + scan.dwell_time[IPW_SCAN_ACTIVE_DIRECT_SCAN] = cpu_to_le16(20); + + #ifdef CONFIG_IPW2200_MONITOR +--- a/drivers/net/wireless/ipw2200.h ++++ b/drivers/net/wireless/ipw2200.h +@@ -244,6 +244,7 @@ enum connection_manager_assoc_states { + #define HOST_NOTIFICATION_S36_MEASUREMENT_REFUSED 31 + + #define HOST_NOTIFICATION_STATUS_BEACON_MISSING 1 ++#define IPW_MB_SCAN_CANCEL_THRESHOLD 3 + #define IPW_MB_ROAMING_THRESHOLD_MIN 1 + #define IPW_MB_ROAMING_THRESHOLD_DEFAULT 8 + #define IPW_MB_ROAMING_THRESHOLD_MAX 30 + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:52 2009 +Message-Id: <20090210185552.873010185@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:22 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Lachlan McIlroy , + Neil Brown +Subject: [patch 45/53] XFS: set b_error from bio error in xfs_buf_bio_end_io +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=xfs-set-b_error-from-bio-error-in-xfs_buf_bio_end_io.patch +Content-Length: 946 +Lines: 29 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Lachlan McIlroy + +commit cfbe52672fbc6f333892e8dde82c35e0a76aa5f5 upstream. + +Preserve any error returned by the bio layer. + +Reviewed-by: Eric Sandeen +Reviewed-by: Tim Shimmin +Signed-off-by: Lachlan McIlroy +Cc: Neil Brown +Signed-off-by: Greg Kroah-Hartman + +--- + fs/xfs/linux-2.6/xfs_buf.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/fs/xfs/linux-2.6/xfs_buf.c ++++ b/fs/xfs/linux-2.6/xfs_buf.c +@@ -1114,8 +1114,7 @@ xfs_buf_bio_end_io( + unsigned int blocksize = bp->b_target->bt_bsize; + struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; + +- if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) +- bp->b_error = EIO; ++ xfs_buf_ioerror(bp, -error); + + do { + struct page *page = bvec->bv_page; + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:53 2009 +Message-Id: <20090210185553.004957465@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:23 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Dan Williams +Subject: [patch 46/53] Revert USB: option: add Pantech cards +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=revert-usb-option-add-pantech-cards.patch +Content-Length: 1674 +Lines: 44 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Greg Kroah-Hartman + +commit 6b40c0057a7935bcf63a38a924094c7e61d4731f upstream. + +Revert 8b6346ec899713a90890c9e832f7eff91ea73504 as these devices really +work just fine with the cdc-acm driver, as they follow the spec +properly. + +Thanks to Chuck Ebbert for pointing out the problem here. + +Cc: Chuck Ebbert +Cc: Dan Williams +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 9 --------- + 1 file changed, 9 deletions(-) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -267,12 +267,6 @@ static int option_send_setup(struct tty + #define ERICSSON_VENDOR_ID 0x0bdb + #define ERICSSON_PRODUCT_F3507G 0x1900 + +-/* Pantech products */ +-#define PANTECH_VENDOR_ID 0x106c +-#define PANTECH_PRODUCT_PC5740 0x3701 +-#define PANTECH_PRODUCT_PC5750 0x3702 /* PX-500 */ +-#define PANTECH_PRODUCT_UM150 0x3711 +- + static struct usb_device_id option_ids[] = { + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, +@@ -476,9 +470,6 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, + { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) }, +- { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5740) }, +- { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5750) }, +- { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_UM150) }, + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:53 2009 +Message-Id: <20090210185553.156954432@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:24 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Dirk De Schepper , + Matthias Urlichs +Subject: [patch 47/53] USB: option: New mobile broadband modems to be supported +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=usb-option-new-mobile-broadband-modems-to-be-supported.patch +Content-Length: 9362 +Lines: 129 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Dirk De Schepper + +commit c200b9c9e8ec93cdd262cfa1699ad92e883d4876 upstream. + +- New Novatel and Dell mobile broadband modem products added + - Dell pid variables used in stead of numerical PIDs for known + products + +Signed-off-by: Dirk De Schepper +Signed-off-by: Matthias Urlichs +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 84 +++++++++++++++++++++++++++++--------------- + 1 file changed, 56 insertions(+), 28 deletions(-) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -192,14 +192,15 @@ static int option_send_setup(struct tty + #define NOVATELWIRELESS_PRODUCT_MC950D 0x4400 + + /* FUTURE NOVATEL PRODUCTS */ +-#define NOVATELWIRELESS_PRODUCT_EVDO_1 0x6000 +-#define NOVATELWIRELESS_PRODUCT_HSPA_1 0x7000 +-#define NOVATELWIRELESS_PRODUCT_EMBEDDED_1 0x8000 +-#define NOVATELWIRELESS_PRODUCT_GLOBAL_1 0x9000 +-#define NOVATELWIRELESS_PRODUCT_EVDO_2 0x6001 +-#define NOVATELWIRELESS_PRODUCT_HSPA_2 0x7001 +-#define NOVATELWIRELESS_PRODUCT_EMBEDDED_2 0x8001 +-#define NOVATELWIRELESS_PRODUCT_GLOBAL_2 0x9001 ++#define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED 0X6000 ++#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED 0X6001 ++#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED 0X7000 ++#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED 0X7001 ++#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0X8000 ++#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0X8001 ++#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0X9000 ++#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0X9001 ++#define NOVATELWIRELESS_PRODUCT_GLOBAL 0XA001 + + /* AMOI PRODUCTS */ + #define AMOI_VENDOR_ID 0x1614 +@@ -209,6 +210,27 @@ static int option_send_setup(struct tty + + #define DELL_VENDOR_ID 0x413C + ++/* Dell modems */ ++#define DELL_PRODUCT_5700_MINICARD 0x8114 ++#define DELL_PRODUCT_5500_MINICARD 0x8115 ++#define DELL_PRODUCT_5505_MINICARD 0x8116 ++#define DELL_PRODUCT_5700_EXPRESSCARD 0x8117 ++#define DELL_PRODUCT_5510_EXPRESSCARD 0x8118 ++ ++#define DELL_PRODUCT_5700_MINICARD_SPRINT 0x8128 ++#define DELL_PRODUCT_5700_MINICARD_TELUS 0x8129 ++ ++#define DELL_PRODUCT_5720_MINICARD_VZW 0x8133 ++#define DELL_PRODUCT_5720_MINICARD_SPRINT 0x8134 ++#define DELL_PRODUCT_5720_MINICARD_TELUS 0x8135 ++#define DELL_PRODUCT_5520_MINICARD_CINGULAR 0x8136 ++#define DELL_PRODUCT_5520_MINICARD_GENERIC_L 0x8137 ++#define DELL_PRODUCT_5520_MINICARD_GENERIC_I 0x8138 ++ ++#define DELL_PRODUCT_5730_MINICARD_SPRINT 0x8180 ++#define DELL_PRODUCT_5730_MINICARD_TELUS 0x8181 ++#define DELL_PRODUCT_5730_MINICARD_VZW 0x8182 ++ + #define KYOCERA_VENDOR_ID 0x0c88 + #define KYOCERA_PRODUCT_KPC650 0x17da + #define KYOCERA_PRODUCT_KPC680 0x180a +@@ -377,31 +399,37 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_1) }, /* Novatel Global product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_2) }, /* Novatel EVDO product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_2) }, /* Novatel HSPA product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_2) }, /* Novatel Embedded product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_2) }, /* Novatel Global product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) }, /* Novatel EVDO product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, /* Novatel HSPA Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, /* Novatel EVDO product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) }, /* Novatel HSPA product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, /* Novatel EVDO Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, /* Novatel HSPA Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL) }, /* Novatel Global product */ + + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) }, + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) }, + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) }, + +- { USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8116) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8129) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8133) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8136) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8137) }, /* Dell Wireless HSDPA 5520 */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5500_MINICARD) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5505_MINICARD) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_EXPRESSCARD) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5510_EXPRESSCARD) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_SPRINT) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_TELUS) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_VZW) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_SPRINT) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_TELUS) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ ++ { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ + { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */ + { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, + { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) }, + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:53 2009 +Message-Id: <20090210185553.292762480@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:25 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Oliver Neukum +Subject: [patch 48/53] USB: new id for ti_usb_3410_5052 driver +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=usb-new-id-for-ti_usb_3410_5052-driver.patch +Content-Length: 2069 +Lines: 53 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Oliver Neukum + +commit 1a1fab513734b3a4fca1bee8229e5ff7e1cb873c upstream. + +This adds a new device id + +Signed-off-by: Oliver Neukum +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ti_usb_3410_5052.c | 3 +++ + drivers/usb/serial/ti_usb_3410_5052.h | 2 ++ + 2 files changed, 5 insertions(+) + +--- a/drivers/usb/serial/ti_usb_3410_5052.c ++++ b/drivers/usb/serial/ti_usb_3410_5052.c +@@ -179,6 +179,7 @@ static unsigned int product_5052_count; + static struct usb_device_id ti_id_table_3410[1+TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + }; + + static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { +@@ -186,6 +187,7 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + }; + + static struct usb_device_id ti_id_table_combined[] = { +@@ -195,6 +197,7 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + { } + }; + +--- a/drivers/usb/serial/ti_usb_3410_5052.h ++++ b/drivers/usb/serial/ti_usb_3410_5052.h +@@ -27,7 +27,9 @@ + + /* Vendor and product ids */ + #define TI_VENDOR_ID 0x0451 ++#define IBM_VENDOR_ID 0x04b3 + #define TI_3410_PRODUCT_ID 0x3410 ++#define IBM_4543_PRODUCT_ID 0x4543 + #define TI_3410_EZ430_ID 0xF430 /* TI ez430 development tool */ + #define TI_5052_BOOT_PRODUCT_ID 0x5052 /* no EEPROM, no firmware */ + #define TI_5152_BOOT_PRODUCT_ID 0x5152 /* no EEPROM, no firmware */ + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:53 2009 +Message-Id: <20090210185553.449634587@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:26 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Oliver Neukum , + Chris Adams +Subject: [patch 49/53] USB: two more usb ids for ti_usb_3410_5052 +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=usb-two-more-usb-ids-for-ti_usb_3410_5052.patch +Content-Length: 2923 +Lines: 66 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Oliver Neukum + +commit 97dcf0416e390fc5c997d4ea60e6f975c7b7a1c3 upstream. + +This patch adds device IDs and balances the counts to make the +hot ID additioning mechanism work. + +Signed-off-by: Oliver Neukum +Cc: Chris Adams +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ti_usb_3410_5052.c | 10 +++++++--- + drivers/usb/serial/ti_usb_3410_5052.h | 2 ++ + 2 files changed, 9 insertions(+), 3 deletions(-) + +--- a/drivers/usb/serial/ti_usb_3410_5052.c ++++ b/drivers/usb/serial/ti_usb_3410_5052.c +@@ -176,13 +176,15 @@ static unsigned int product_5052_count; + /* the array dimension is the number of default entries plus */ + /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */ + /* null entry */ +-static struct usb_device_id ti_id_table_3410[1+TI_EXTRA_VID_PID_COUNT+1] = { ++static struct usb_device_id ti_id_table_3410[10+TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, + { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, + }; + +-static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { ++static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, +@@ -190,7 +192,7 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + }; + +-static struct usb_device_id ti_id_table_combined[] = { ++static struct usb_device_id ti_id_table_combined[14+2*TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) }, +@@ -198,6 +200,8 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, + { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, + { } + }; + +--- a/drivers/usb/serial/ti_usb_3410_5052.h ++++ b/drivers/usb/serial/ti_usb_3410_5052.h +@@ -30,6 +30,8 @@ + #define IBM_VENDOR_ID 0x04b3 + #define TI_3410_PRODUCT_ID 0x3410 + #define IBM_4543_PRODUCT_ID 0x4543 ++#define IBM_454B_PRODUCT_ID 0x454b ++#define IBM_454C_PRODUCT_ID 0x454c + #define TI_3410_EZ430_ID 0xF430 /* TI ez430 development tool */ + #define TI_5052_BOOT_PRODUCT_ID 0x5052 /* no EEPROM, no firmware */ + #define TI_5152_BOOT_PRODUCT_ID 0x5152 /* no EEPROM, no firmware */ + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:53 2009 +Message-Id: <20090210185553.601666886@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:27 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Alan Stern +Subject: [patch 50/53] USB: usb-storage: add Pentax to the bad-vendor list +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch +Content-Length: 2078 +Lines: 60 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Alan Stern + +commit 506e9469833c66ed6bb9acd902e208f7301b6adb upstream. + +This patch (as1202) adds Pentax to usb-storage's list of bad vendors +whose devices always need the CAPACITY_HEURISTICS flag. This is in +addition to the existing entries: Nokia, Nikon, and Motorola. + +Signed-off-by: Alan Stern +Tested-by: Virgo Pärna +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/scsiglue.c | 2 ++ + drivers/usb/storage/unusual_devs.h | 15 --------------- + 2 files changed, 2 insertions(+), 15 deletions(-) + +--- a/drivers/usb/storage/scsiglue.c ++++ b/drivers/usb/storage/scsiglue.c +@@ -64,6 +64,7 @@ + */ + #define VENDOR_ID_NOKIA 0x0421 + #define VENDOR_ID_NIKON 0x04b0 ++#define VENDOR_ID_PENTAX 0x0a17 + #define VENDOR_ID_MOTOROLA 0x22b8 + + /*********************************************************************** +@@ -150,6 +151,7 @@ static int slave_configure(struct scsi_d + switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) { + case VENDOR_ID_NOKIA: + case VENDOR_ID_NIKON: ++ case VENDOR_ID_PENTAX: + case VENDOR_ID_MOTOROLA: + if (!(us->fflags & (US_FL_FIX_CAPACITY | + US_FL_CAPACITY_OK))) +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1304,21 +1304,6 @@ UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1 + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), + +- +-/* Submitted by Per Winkvist */ +-UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff, +- "Pentax", +- "Optio S/S4", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_INQUIRY ), +- +-/* Reported by Jaak Ristioja */ +-UNUSUAL_DEV( 0x0a17, 0x006e, 0x0100, 0x0100, +- "Pentax", +- "K10D", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- + /* These are virtual windows driver CDs, which the zd1211rw driver + * automatically converts into WLAN devices. */ + UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:53 2009 +Message-Id: <20090210185553.745318668@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:28 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Joseph Chan , + Jeff Garzik +Subject: [patch 51/53] sata_via: Add VT8261 support +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=sata_via-add-vt8261-support.patch +Content-Length: 819 +Lines: 24 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: JosephChan@via.com.tw + +commit 6813952021a7820a505002de260bda36978671f7 upstream. + +Signed-off-by: Joseph Chan +Signed-off-by: Jeff Garzik +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/sata_via.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/ata/sata_via.c ++++ b/drivers/ata/sata_via.c +@@ -92,6 +92,8 @@ static const struct pci_device_id svia_p + { PCI_VDEVICE(VIA, 0x5372), vt6420 }, + { PCI_VDEVICE(VIA, 0x7372), vt6420 }, + { PCI_VDEVICE(VIA, 0x5287), vt8251 }, /* 2 sata chnls (Master/Slave) */ ++ { PCI_VDEVICE(VIA, 0x9000), vt8251 }, ++ { PCI_VDEVICE(VIA, 0x9040), vt8251 }, + + { } /* terminate list */ + }; + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:54 2009 +Message-Id: <20090210185553.892497089@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:29 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Pavel Machek , + Paul Clements +Subject: [patch 52/53] nbd: do not allow two clients at the same time +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=nbd-do-not-allow-two-clients-at-the-same-time.patch +Content-Length: 1658 +Lines: 53 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Pavel Machek + +commit c91192d66d6cea7878b8542c9d9f1873971aba92 upstream. + +Two nbd-clients at same time are bad idea, and cause WARN_ON from nbd in +2.6.28-rc7 from sysfs_add_one. This simply prevents that from happening. + +To reproduce: + + cat /dev/zero | head -c 10000000 > /tmp/delme.fstest.fs + nbd-server 9100 -l /anyone.can.connect > /tmp/delme.fstest.fs & + sleep 1 + nbd-client localhost 9100 /dev/nd0 & + nbd-client localhost 9100 /dev/nd0 & + +Signed-off-by: Pavel Machek +Acked-by: Paul Clements +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/nbd.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/block/nbd.c ++++ b/drivers/block/nbd.c +@@ -406,6 +406,7 @@ static int nbd_do_it(struct nbd_device * + ret = sysfs_create_file(&disk_to_dev(lo->disk)->kobj, &pid_attr.attr); + if (ret) { + printk(KERN_ERR "nbd: sysfs_create_file failed!"); ++ lo->pid = 0; + return ret; + } + +@@ -413,6 +414,7 @@ static int nbd_do_it(struct nbd_device * + nbd_end_request(req); + + sysfs_remove_file(&disk_to_dev(lo->disk)->kobj, &pid_attr.attr); ++ lo->pid = 0; + return 0; + } + +@@ -648,6 +650,8 @@ static int nbd_ioctl(struct block_device + set_capacity(lo->disk, lo->bytesize >> 9); + return 0; + case NBD_DO_IT: ++ if (lo->pid) ++ return -EBUSY; + if (!lo->file) + return -EINVAL; + thread = kthread_create(nbd_thread, lo, lo->disk->disk_name); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:54 2009 +Message-Id: <20090210185554.019457911@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:54:30 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Vlad Yasevich , + "David S. Miller" +Subject: [patch 53/53] sctp: Fix another socket race during accept/peeloff +References: <20090210185337.000769713@mini.kroah.org> +Content-Disposition: inline; filename=sctp-fix-another-socket-race-during-accept-peeloff.patch +Content-Length: 2109 +Lines: 55 + +2.6.28-stable review patch. If anyone has any objections, please let us know. +------------------ + +From: Vlad Yasevich + +commit ae53b5bd77719fed58086c5be60ce4f22bffe1c6 upstream. + +There is a race between sctp_rcv() and sctp_accept() where we +have moved the association from the listening socket to the +accepted socket, but sctp_rcv() processing cached the old +socket and continues to use it. + +The easy solution is to check for the socket mismatch once we've +grabed the socket lock. If we hit a mis-match, that means +that were are currently holding the lock on the listening socket, +but the association is refrencing a newly accepted socket. We need +to drop the lock on the old socket and grab the lock on the new one. + +A more proper solution might be to create accepted sockets when +the new association is established, similar to TCP. That would +eliminate the race for 1-to-1 style sockets, but it would still +existing for 1-to-many sockets where a user wished to peeloff an +association. For now, we'll live with this easy solution as +it addresses the problem. + +Reported-by: Michal Hocko +Reported-by: Karsten Keil +Signed-off-by: Vlad Yasevich +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/sctp/input.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +--- a/net/sctp/input.c ++++ b/net/sctp/input.c +@@ -249,6 +249,19 @@ int sctp_rcv(struct sk_buff *skb) + */ + sctp_bh_lock_sock(sk); + ++ if (sk != rcvr->sk) { ++ /* Our cached sk is different from the rcvr->sk. This is ++ * because migrate()/accept() may have moved the association ++ * to a new socket and released all the sockets. So now we ++ * are holding a lock on the old socket while the user may ++ * be doing something with the new socket. Switch our veiw ++ * of the current sk. ++ */ ++ sctp_bh_unlock_sock(sk); ++ sk = rcvr->sk; ++ sctp_bh_lock_sock(sk); ++ } ++ + if (sock_owned_by_user(sk)) { + SCTP_INC_STATS_BH(SCTP_MIB_IN_PKT_BACKLOG); + sctp_add_backlog(sk, skb); + + +From gregkh@mini.kroah.org Tue Feb 10 10:55:46 2009 +Message-Id: <20090210185337.000769713@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Tue, 10 Feb 2009 10:53:37 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk +Subject: [patch 00/53] 2.6.28-stable review +Content-Length: 3803 +Lines: 79 + +This is the start of the stable review cycle for the 2.6.28.5 release. +There are 53 patches in this series, all will be posted as a response +to this one. If anyone has any issues with these being applied, please +let us know. If anyone is a maintainer of the proper subsystem, and +wants to add a Signed-off-by: line to the patch, please respond with it. + +These patches are sent out with a number of different people on the +Cc: line. If you wish to be a reviewer, please email stable@kernel.org +to add your name to the list. If you want to be off the reviewer list, +also email us. + +Responses should be made by Thursday, February 12 19:00:00 UTC. +Anything received after that time might be too late. + +The whole patch series can be found in one patch at: + kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.25.8-rc1.gz +and the diffstat can be found below. + + +thanks, + +greg k-h + + + Documentation/filesystems/sysfs-pci.txt | 13 +++- + Makefile | 2 +- + arch/ia64/sn/kernel/io_acpi_init.c | 2 +- + arch/ia64/sn/kernel/io_init.c | 2 +- + arch/x86/kernel/apic.c | 2 +- + arch/x86/mm/fault.c | 8 ++- + drivers/acpi/asus_acpi.c | 16 ++++- + drivers/acpi/dock.c | 6 ++- + drivers/acpi/tables.c | 7 ++- + drivers/acpi/tables/tbutils.c | 7 +- + drivers/acpi/video.c | 29 +++++++- + drivers/ata/sata_via.c | 2 + + drivers/block/nbd.c | 4 + + drivers/char/agp/intel-agp.c | 11 +++- + drivers/firewire/fw-ohci.c | 2 +- + drivers/firewire/fw-sbp2.c | 43 +++++++----- + drivers/ieee1394/ohci1394.h | 2 +- + drivers/ieee1394/sbp2.c | 10 +++ + drivers/md/linear.c | 6 +- + drivers/md/md.c | 24 ++++--- + drivers/misc/eeepc-laptop.c | 7 ++- + drivers/misc/panasonic-laptop.c | 2 +- + drivers/misc/sgi-xp/xpc.h | 5 +- + drivers/misc/sgi-xp/xpc_uv.c | 11 ++-- + drivers/net/e1000/e1000_main.c | 6 +- + drivers/net/wireless/ipw2200.c | 28 ++++++-- + drivers/net/wireless/ipw2200.h | 1 + + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/pcie/aspm.c | 4 +- + drivers/pci/rom.c | 8 ++- + drivers/serial/8250_pci.c | 9 +++ + drivers/usb/serial/option.c | 93 +++++++++++++++---------- + drivers/usb/serial/ti_usb_3410_5052.c | 13 +++- + drivers/usb/serial/ti_usb_3410_5052.h | 4 + + drivers/usb/storage/scsiglue.c | 2 + + drivers/usb/storage/unusual_devs.h | 15 ---- + fs/binfmt_elf.c | 14 +++- + fs/seq_file.c | 115 ++++++++++++++++--------------- + fs/xfs/linux-2.6/xfs_buf.c | 3 +- + include/acpi/pdc_intel.h | 2 + + include/linux/module.h | 1 - + include/linux/pci.h | 2 +- + include/linux/pci_ids.h | 1 + + include/linux/serial.h | 3 +- + include/linux/wait.h | 11 +++- + ipc/shm.c | 4 + + kernel/sched.c | 4 +- + kernel/sys.c | 16 +--- + kernel/wait.c | 59 ++++++++++++++-- + mm/memory.c | 2 +- + mm/mlock.c | 5 +- + net/sctp/input.c | 13 ++++ + sound/pci/hda/patch_realtek.c | 4 + + sound/usb/usbaudio.c | 1 + + 54 files changed, 448 insertions(+), 222 deletions(-) + diff --git a/queue-2.6.28/md-ensure-an-md-array-never-has-too-many-devices.patch b/review-2.6.28/md-ensure-an-md-array-never-has-too-many-devices.patch similarity index 100% rename from queue-2.6.28/md-ensure-an-md-array-never-has-too-many-devices.patch rename to review-2.6.28/md-ensure-an-md-array-never-has-too-many-devices.patch diff --git a/queue-2.6.28/md-fix-a-bug-in-linear.c-causing-which_dev-to-return-the-wrong-device.patch b/review-2.6.28/md-fix-a-bug-in-linear.c-causing-which_dev-to-return-the-wrong-device.patch similarity index 100% rename from queue-2.6.28/md-fix-a-bug-in-linear.c-causing-which_dev-to-return-the-wrong-device.patch rename to review-2.6.28/md-fix-a-bug-in-linear.c-causing-which_dev-to-return-the-wrong-device.patch diff --git a/queue-2.6.28/mm-fix-error-case-in-mlock-downgrade-reversion.patch b/review-2.6.28/mm-fix-error-case-in-mlock-downgrade-reversion.patch similarity index 100% rename from queue-2.6.28/mm-fix-error-case-in-mlock-downgrade-reversion.patch rename to review-2.6.28/mm-fix-error-case-in-mlock-downgrade-reversion.patch diff --git a/queue-2.6.28/module-remove-over-zealous-check-in-__module_get.patch b/review-2.6.28/module-remove-over-zealous-check-in-__module_get.patch similarity index 100% rename from queue-2.6.28/module-remove-over-zealous-check-in-__module_get.patch rename to review-2.6.28/module-remove-over-zealous-check-in-__module_get.patch diff --git a/queue-2.6.28/nbd-do-not-allow-two-clients-at-the-same-time.patch b/review-2.6.28/nbd-do-not-allow-two-clients-at-the-same-time.patch similarity index 100% rename from queue-2.6.28/nbd-do-not-allow-two-clients-at-the-same-time.patch rename to review-2.6.28/nbd-do-not-allow-two-clients-at-the-same-time.patch diff --git a/queue-2.6.28/panasonic-laptop-fix-x.patch b/review-2.6.28/panasonic-laptop-fix-x.patch similarity index 100% rename from queue-2.6.28/panasonic-laptop-fix-x.patch rename to review-2.6.28/panasonic-laptop-fix-x.patch diff --git a/queue-2.6.28/pci-properly-clean-up-aspm-link-state-on-device-remove.patch b/review-2.6.28/pci-properly-clean-up-aspm-link-state-on-device-remove.patch similarity index 100% rename from queue-2.6.28/pci-properly-clean-up-aspm-link-state-on-device-remove.patch rename to review-2.6.28/pci-properly-clean-up-aspm-link-state-on-device-remove.patch diff --git a/queue-2.6.28/pci-return-error-on-failure-to-read-pci-roms.patch b/review-2.6.28/pci-return-error-on-failure-to-read-pci-roms.patch similarity index 100% rename from queue-2.6.28/pci-return-error-on-failure-to-read-pci-roms.patch rename to review-2.6.28/pci-return-error-on-failure-to-read-pci-roms.patch diff --git a/queue-2.6.28/prevent-kprobes-from-catching-spurious-page-faults.patch b/review-2.6.28/prevent-kprobes-from-catching-spurious-page-faults.patch similarity index 100% rename from queue-2.6.28/prevent-kprobes-from-catching-spurious-page-faults.patch rename to review-2.6.28/prevent-kprobes-from-catching-spurious-page-faults.patch diff --git a/queue-2.6.28/revert-rlimit-permit-setting-rlimit_nofile-to-rlim_infinity.patch b/review-2.6.28/revert-rlimit-permit-setting-rlimit_nofile-to-rlim_infinity.patch similarity index 100% rename from queue-2.6.28/revert-rlimit-permit-setting-rlimit_nofile-to-rlim_infinity.patch rename to review-2.6.28/revert-rlimit-permit-setting-rlimit_nofile-to-rlim_infinity.patch diff --git a/queue-2.6.28/revert-usb-option-add-pantech-cards.patch b/review-2.6.28/revert-usb-option-add-pantech-cards.patch similarity index 100% rename from queue-2.6.28/revert-usb-option-add-pantech-cards.patch rename to review-2.6.28/revert-usb-option-add-pantech-cards.patch diff --git a/queue-2.6.28/sata_via-add-vt8261-support.patch b/review-2.6.28/sata_via-add-vt8261-support.patch similarity index 100% rename from queue-2.6.28/sata_via-add-vt8261-support.patch rename to review-2.6.28/sata_via-add-vt8261-support.patch diff --git a/queue-2.6.28/sctp-fix-another-socket-race-during-accept-peeloff.patch b/review-2.6.28/sctp-fix-another-socket-race-during-accept-peeloff.patch similarity index 100% rename from queue-2.6.28/sctp-fix-another-socket-race-during-accept-peeloff.patch rename to review-2.6.28/sctp-fix-another-socket-race-during-accept-peeloff.patch diff --git a/queue-2.6.28/seq_file-fix-big-enough-lseek-read.patch b/review-2.6.28/seq_file-fix-big-enough-lseek-read.patch similarity index 100% rename from queue-2.6.28/seq_file-fix-big-enough-lseek-read.patch rename to review-2.6.28/seq_file-fix-big-enough-lseek-read.patch diff --git a/queue-2.6.28/seq_file-move-traverse-so-it-can-be-used-from-seq_read.patch b/review-2.6.28/seq_file-move-traverse-so-it-can-be-used-from-seq_read.patch similarity index 100% rename from queue-2.6.28/seq_file-move-traverse-so-it-can-be-used-from-seq_read.patch rename to review-2.6.28/seq_file-move-traverse-so-it-can-be-used-from-seq_read.patch diff --git a/queue-2.6.28/serial-rs485-ioctl-structure-uses-__u32-include-linux-types.h.patch b/review-2.6.28/serial-rs485-ioctl-structure-uses-__u32-include-linux-types.h.patch similarity index 100% rename from queue-2.6.28/serial-rs485-ioctl-structure-uses-__u32-include-linux-types.h.patch rename to review-2.6.28/serial-rs485-ioctl-structure-uses-__u32-include-linux-types.h.patch diff --git a/queue-2.6.28/serial-set-correct-baud_base-for-oxford-semiconductor-ltd-exsys-ex-41092-dual-16950-serial-adapter.patch b/review-2.6.28/serial-set-correct-baud_base-for-oxford-semiconductor-ltd-exsys-ex-41092-dual-16950-serial-adapter.patch similarity index 100% rename from queue-2.6.28/serial-set-correct-baud_base-for-oxford-semiconductor-ltd-exsys-ex-41092-dual-16950-serial-adapter.patch rename to review-2.6.28/serial-set-correct-baud_base-for-oxford-semiconductor-ltd-exsys-ex-41092-dual-16950-serial-adapter.patch diff --git a/queue-2.6.28/series b/review-2.6.28/series similarity index 100% rename from queue-2.6.28/series rename to review-2.6.28/series diff --git a/queue-2.6.28/sgi-xp-fix-writing-past-the-end-of-kzalloc-d-space.patch b/review-2.6.28/sgi-xp-fix-writing-past-the-end-of-kzalloc-d-space.patch similarity index 100% rename from queue-2.6.28/sgi-xp-fix-writing-past-the-end-of-kzalloc-d-space.patch rename to review-2.6.28/sgi-xp-fix-writing-past-the-end-of-kzalloc-d-space.patch diff --git a/queue-2.6.28/shm-fix-shmctl-lockup-with-config_shmem.patch b/review-2.6.28/shm-fix-shmctl-lockup-with-config_shmem.patch similarity index 100% rename from queue-2.6.28/shm-fix-shmctl-lockup-with-config_shmem.patch rename to review-2.6.28/shm-fix-shmctl-lockup-with-config_shmem.patch diff --git a/queue-2.6.28/sound-usb-audio-handle-wmaxpacketsize-for-fixed_endpoint-devices.patch b/review-2.6.28/sound-usb-audio-handle-wmaxpacketsize-for-fixed_endpoint-devices.patch similarity index 100% rename from queue-2.6.28/sound-usb-audio-handle-wmaxpacketsize-for-fixed_endpoint-devices.patch rename to review-2.6.28/sound-usb-audio-handle-wmaxpacketsize-for-fixed_endpoint-devices.patch diff --git a/queue-2.6.28/usb-new-id-for-ti_usb_3410_5052-driver.patch b/review-2.6.28/usb-new-id-for-ti_usb_3410_5052-driver.patch similarity index 100% rename from queue-2.6.28/usb-new-id-for-ti_usb_3410_5052-driver.patch rename to review-2.6.28/usb-new-id-for-ti_usb_3410_5052-driver.patch diff --git a/queue-2.6.28/usb-option-new-mobile-broadband-modems-to-be-supported.patch b/review-2.6.28/usb-option-new-mobile-broadband-modems-to-be-supported.patch similarity index 100% rename from queue-2.6.28/usb-option-new-mobile-broadband-modems-to-be-supported.patch rename to review-2.6.28/usb-option-new-mobile-broadband-modems-to-be-supported.patch diff --git a/queue-2.6.28/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch b/review-2.6.28/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch similarity index 100% rename from queue-2.6.28/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch rename to review-2.6.28/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch diff --git a/queue-2.6.28/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch b/review-2.6.28/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch similarity index 100% rename from queue-2.6.28/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch rename to review-2.6.28/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch diff --git a/queue-2.6.28/wait-prevent-exclusive-waiter-starvation.patch b/review-2.6.28/wait-prevent-exclusive-waiter-starvation.patch similarity index 100% rename from queue-2.6.28/wait-prevent-exclusive-waiter-starvation.patch rename to review-2.6.28/wait-prevent-exclusive-waiter-starvation.patch diff --git a/queue-2.6.28/x86-apic-enable-workaround-on-amd-fam10h-cpus.patch b/review-2.6.28/x86-apic-enable-workaround-on-amd-fam10h-cpus.patch similarity index 100% rename from queue-2.6.28/x86-apic-enable-workaround-on-amd-fam10h-cpus.patch rename to review-2.6.28/x86-apic-enable-workaround-on-amd-fam10h-cpus.patch diff --git a/queue-2.6.28/xfs-set-b_error-from-bio-error-in-xfs_buf_bio_end_io.patch b/review-2.6.28/xfs-set-b_error-from-bio-error-in-xfs_buf_bio_end_io.patch similarity index 100% rename from queue-2.6.28/xfs-set-b_error-from-bio-error-in-xfs_buf_bio_end_io.patch rename to review-2.6.28/xfs-set-b_error-from-bio-error-in-xfs_buf_bio_end_io.patch