Luming Yu [Sat, 23 Jul 2005 08:08:00 +0000 (04:08 -0400)]
[ACPI] Add "ec_polling" boot option
EC burst mode benefits many machines, some of
them significantly. However, our current
implementation fails on some machines such
as Rafael's Asus L5D.
This patch restores the alternative EC polling code,
which can be enabled at boot time via "ec_polling"
http://bugzilla.kernel.org/show_bug.cgi?id=4665
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Wed, 22 Jun 2005 22:37:00 +0000 (18:37 -0400)]
[ACPI] address boot-freeze with updated DMI blacklist for c-states
http://bugzilla.kernel.org/show_bug.cgi?id=4763
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Venkatesh Pallipadi [Fri, 29 Jul 2005 20:00:13 +0000 (16:00 -0400)]
[ACPI] Fix memset arguments in acpi processor_idle.c
http://bugzilla.kernel.org/show_bug.cgi?id=4954
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Venkatesh Pallipadi [Fri, 29 Jul 2005 19:51:36 +0000 (15:51 -0400)]
[ACPI] Fix the regression with c1_default_handler on some systems
where C-states come from FADT.
Thanks to Kevin Radloff for identifying the issue and
isolating it to exact line of code that is causing the issue.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Luming Yu [Sat, 23 Jul 2005 04:26:33 +0000 (00:26 -0400)]
ACPI: delete unnecessary EC console messages
http://bugzilla.kernel.org/show_bug.cgi?id=4534
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown [Sun, 3 Jul 2005 20:42:23 +0000 (16:42 -0400)]
[ACPI] increase MAX_IO_APICS to 64 on i386
x86_64 was already 128
http://bugzilla.kernel.org/show_bug.cgi?id=3754
Signed-off-by: Len Brown <len.brown@intel.com>
Venkatesh Pallipadi [Fri, 15 Apr 2005 19:07:10 +0000 (15:07 -0400)]
[ACPI] enable C2 and C3 idle power states on SMP
http://bugzilla.kernel.org/show_bug.cgi?id=4401
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Luming Yu [Sat, 23 Apr 2005 03:07:10 +0000 (23:07 -0400)]
[ACPI] EC GPE-disabled issue
http://bugzilla.kernel.org/show_bug.cgi?id=3851
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown [Fri, 5 Apr 2019 05:07:45 +0000 (00:07 -0500)]
[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
Signed-off-by: Len Brown <len.brown@intel.com>
Jesse Barnes [Tue, 19 Apr 2005 03:52:17 +0000 (23:52 -0400)]
[ACPI] cleanup: delete !IA64_SGI_SN from acpi/Kconfig
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Venkatesh Pallipadi [Tue, 19 Apr 2005 03:06:47 +0000 (23:06 -0400)]
[ACPI] fix C1 patch for IA64
http://bugzilla.kernel.org/show_bug.cgi?id=4233
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Tue, 19 Apr 2005 02:59:23 +0000 (22:59 -0400)]
[ACPI] quiet dmesg related to ACPI PM of PCI devices
DBG("No ACPI bus support for %s\n", dev->bus_id);
http://bugzilla.kernel.org/show_bug.cgi?id=4277
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Robert Moore [Tue, 19 Apr 2005 02:49:35 +0000 (22:49 -0400)]
ACPICA
20050408 from Bob Moore
Fixed three cases in the interpreter where an "index"
argument to an ASL function was still (internally) 32
bits instead of the required 64 bits. This was the Index
argument to the Index, Mid, and Match operators.
The "strupr" function is now permanently local
(acpi_ut_strupr), since this is not a POSIX-defined
function and not present in most kernel-level C
libraries. References to the C library strupr function
have been removed from the headers.
Completed the deployment of static
functions/prototypes. All prototypes with the static
attribute have been moved from the headers to the owning
C file.
ACPICA
20050329 from Bob Moore
An error is now generated if an attempt is made to create
a Buffer Field of length zero (A CreateField with a length
operand of zero.)
The interpreter now issues a warning whenever executable
code at the module level is detected during ACPI table
load. This will give some idea of the prevalence of this
type of code.
Implemented support for references to named objects (other
than control methods) within package objects.
Enhanced package object output for the debug
object. Package objects are now completely dumped, showing
all elements.
Enhanced miscellaneous object output for the debug
object. Any object can now be written to the debug object
(for example, a device object can be written, and the type
of the object will be displayed.)
The "static" qualifier has been added to all local
functions across the core subsystem.
The number of "long" lines (> 80 chars) within the source
has been significantly reduced, by about 1/3.
Cleaned up all header files to ensure that all CA/iASL
functions are prototyped (even static functions) and the
formatting is consistent.
Two new header files have been added, acopcode.h and
acnames.h.
Removed several obsolete functions that were no longer
used.
Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown [Fri, 15 Apr 2005 03:12:56 +0000 (23:12 -0400)]
[ACPI] Deprecate /proc/acpi/sleep in favor of /sys/power/state
Signed-off-by: Len Brown <len.brown@intel.com>
Nickolai Zeldovich [Sat, 9 Apr 2005 03:37:34 +0000 (23:37 -0400)]
[ACPI] S3 resume -- use lgdtl, not lgdt
From: Nickolai Zeldovich <kolya@MIT.EDU>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Fri, 1 Apr 2005 05:07:31 +0000 (00:07 -0500)]
[ACPI] PNPACPI vs sound IRQ
http://bugme.osdl.org/show_bug.cgi?id=4016
Written-by: David Shaohua Li <shaohua.li@intel.com>
Acked-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Venkatesh Pallipadi [Fri, 1 Apr 2005 04:23:15 +0000 (23:23 -0500)]
[ACPI] update /proc/acpi/processor/*/power even if only C1 support
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Ashok Raj [Fri, 1 Apr 2005 03:51:10 +0000 (22:51 -0500)]
[ACPI] Evaluate CPEI Processor Override flag
ACPI 3.0 added a Correctable Platform Error Interrupt (CPEI)
Processor Overide flag to MADT.Platform_Interrupt_Source.
Record the processor that was provided as hint from ACPI.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Keiichiro Tokunaga [Thu, 31 Mar 2005 04:15:47 +0000 (23:15 -0500)]
[ACPI] hotplug Processor consideration in acpi_bus_add()
Signed-off-by: Keiichiro Tokunaga <tokunaga.keiich@jp.fujitsu.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Andrew Morton [Thu, 31 Mar 2005 03:53:30 +0000 (22:53 -0500)]
[ACPI] fix debug-mode build warning in acpi/hotkey.c
drivers/acpi/hotkey.c: In function `create_polling_proc':
drivers/acpi/hotkey.c:334: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Paulo Marques [Thu, 31 Mar 2005 03:39:49 +0000 (22:39 -0500)]
[ACPI] fix kmalloc size bug in acpi/video.c
acpi_video_device_find_cap() used &p instead of *p
when calculating storage size, thus allocating
only 4 or 8 bytes instead of 12...
Also, kfree(NULL) is legal, so remove some unneeded checks.
From: Paulo Marques <pmarques@grupopie.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Adrian Bunk [Thu, 31 Mar 2005 03:31:35 +0000 (22:31 -0500)]
[ACPI] fix potential NULL dereference in acpi/video.c
Found-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Panagiotis Issaris [Thu, 31 Mar 2005 03:15:36 +0000 (22:15 -0500)]
[ACPI] check for kmalloc failure in toshiba_acpi.c
Signed-off-by: Panagiotis Issaris <takis@gna.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Andrew Morton [Thu, 31 Mar 2005 03:12:13 +0000 (22:12 -0500)]
[ACPI] fix build warning
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Greg Kroah-Hartman [Thu, 31 Mar 2005 02:23:19 +0000 (21:23 -0500)]
cleanup: remove unnecessary initializer on static pointers
Suggested-by: Greg KH <greg@kroah.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Matthieu Castet [Fri, 25 Mar 2005 17:03:15 +0000 (12:03 -0500)]
[ACPI] PNPACPI parse error
http://bugzilla.kernel.org/show_bug.cgi?id=3912
Written-by: matthieu castet <castet.matthieu@free.fr>
Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown [Wed, 23 Mar 2005 21:16:03 +0000 (16:16 -0500)]
[ACPI] gut acpi_pci_choose_state() to avoid conflict
with pending pm_message_t re-definition.
Signed-off-by: Len Brown <len.brown@intel.com>
Luming Yu [Sat, 19 Mar 2005 06:54:47 +0000 (01:54 -0500)]
[ACPI] fix EC access width
http://bugzilla.kernel.org/show_bug.cgi?id=4346
Written-by: David Shaohua Li and Luming Yu
Signed-off-by: Len Brown <len.brown@intel.com>
Dmitry Torokhov [Sat, 19 Mar 2005 06:10:05 +0000 (01:10 -0500)]
[ACPI] Enable EC Burst Mode
Fixes several Embedded Controller issues, including
button failure and battery status AE_TIME failure.
http://bugzilla.kernel.org/show_bug.cgi?id=3851
Based on patch by: Andi Kleen <ak@suse.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Sat, 19 Mar 2005 05:16:18 +0000 (00:16 -0500)]
[ACPI] pci_set_power_state() now calls
platform_pci_set_power_state()
and ACPI can answer
http://bugzilla.kernel.org/show_bug.cgi?id=4277
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Sat, 19 Mar 2005 05:15:48 +0000 (00:15 -0500)]
[ACPI] PCI can now get suspend state from firmware
pci_choose_state() can now call
platform_pci_choose_state()
and ACPI can answer
http://bugzilla.kernel.org/show_bug.cgi?id=4277
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Fri, 18 Mar 2005 23:53:36 +0000 (18:53 -0500)]
[ACPI] Bind ACPI and PCI devices
http://bugzilla.kernel.org/show_bug.cgi?id=4277
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Fri, 18 Mar 2005 23:45:35 +0000 (18:45 -0500)]
[ACPI] Bind PCI devices with ACPI devices
Implement the framework for binding physical devices
with ACPI devices. A physical bus like PCI bus
should create a 'acpi_bus_type', with:
.find_device:
For device which has parent such as normal PCI devices.
.find_bridge:
It's for special devices, such as PCI root bridge
or IDE controller. Such devices generally haven't a
parent or ->bus. We use the special method
to get an ACPI handle.
Uses new field in struct device: firmware_data
http://bugzilla.kernel.org/show_bug.cgi?id=4277
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Luming Yu [Fri, 18 Mar 2005 23:03:45 +0000 (18:03 -0500)]
[ACPI] generic Hot Key support
See Documentation/acpi-hotkey.txt
Use cmdline "acpi_specific_hotkey" to enable
legacy platform specific drivers.
http://bugzilla.kernel.org/show_bug.cgi?id=3887
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Fri, 18 Mar 2005 21:43:54 +0000 (16:43 -0500)]
[ACPI] S3 Suspend to RAM: fix driver suspend/resume methods
Drivers should do this:
.suspend()
pci_disable_device()
.resume()
pci_enable_device()
http://bugzilla.kernel.org/show_bug.cgi?id=3469
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Fri, 18 Mar 2005 21:30:29 +0000 (16:30 -0500)]
[ACPI] S3 Suspend to RAM: interrupt resume fix
Delete PCI Interrupt Link Device .resume method --
it is the device driver's job to request interrupts,
not the Link's job to remember what the devices want.
This addresses the issue of attempting to run
the ACPI interpreter too early in resume, when
interrupts are still disabled.
http://bugzilla.kernel.org/show_bug.cgi?id=3469
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
David Shaohua Li [Fri, 18 Mar 2005 21:27:13 +0000 (16:27 -0500)]
[ACPI] Suspend to RAM fix
Free some RAM before entering S3 so that upon
resume we can be sure early allocations will succeed.
http://bugzilla.kernel.org/show_bug.cgi?id=3469
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Alexey Starikovskiy [Fri, 18 Mar 2005 21:20:46 +0000 (16:20 -0500)]
[ACPI] ACPI poweroff fix
Register an "acpi" system device to be notified of shutdown preparation.
This depends on CONFIG_PM
http://bugzilla.kernel.org/show_bug.cgi?id=4041
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown [Fri, 18 Mar 2005 21:00:29 +0000 (16:00 -0500)]
[ACPI] CONFIG_ACPI now depends on CONFIG_PM
Signed-off-by: Len Brown <len.brown@intel.com>
Alexey Starikovskiy [Fri, 18 Mar 2005 20:35:22 +0000 (15:35 -0500)]
[ACPI] Allow simultaneous Fixed Feature and Control Method buttons
delete /proc/acpi/button
http://bugzilla.kernel.org/show_bug.cgi?id=1920
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Keiichiro Tokunaga [Wed, 2 Mar 2005 05:00:00 +0000 (00:00 -0500)]
[ACPI] update CONFIG_ACPI_CONTAINER Kconfig help
Signed-off-by: Keiichiro Tokunaga <tokunaga.keiich@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Linus Torvalds [Fri, 17 Jun 2005 19:48:29 +0000 (12:48 -0700)]
Linux 2.6.12
Linus Torvalds [Fri, 17 Jun 2005 19:35:26 +0000 (12:35 -0700)]
Merge 'for-linus' branch of /linux/kernel/git/axboe/linux-2.6-block
Christoph Hellwig [Fri, 17 Jun 2005 19:25:25 +0000 (12:25 -0700)]
[PATCH] PCI: don't override drv->shutdown unconditionally
There are many drivers that have been setting the generic driver
model level shutdown callback, and pci thus must not override it.
Without this patch we can have really bad data loss on various
raid controllers.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Fri, 17 Jun 2005 09:36:36 +0000 (11:36 +0200)]
[PATCH] timer exit cleanup
Do all timer zapping in exit_itimers.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Kiyoshi Ueda [Fri, 17 Jun 2005 14:15:10 +0000 (16:15 +0200)]
When cfq I/O scheduler is selected, get_request() in __make_request() calls
__cfq_get_queue(). __cfq_get_queue() finds an existing queue (struct
cfq_queue) of the current process for the device and returns it. If it's not
found, __cfq_get_queue() creates and returns a new one if __cfq_get_queue() is
called with __GFP_WAIT flag, or __cfq_get_queue() returns NULL (this means that
get_request() fails) if no __GFP_WAIT flag.
On the other hand, in __make_request(), get_request() is called without
__GFP_WAIT flag at the first time. Thus, the get_request() fails when there is
no existing queue, typically when it's called for the first I/O request of the
process to the device.
Though it will be followed by get_request_wait() for general case,
__make_request() will just end the I/O with an error (EWOULDBLOCK) when the
request was for read-ahead.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Linus Torvalds [Thu, 16 Jun 2005 20:40:39 +0000 (13:40 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Nicolas Pitre [Thu, 16 Jun 2005 20:23:56 +0000 (21:23 +0100)]
[PATCH] ARM: 2715/1: restore CPLD interrupts upon resume for Lubbock and Mainstone
Patch from Nicolas Pitre
Without this some devices fail to work again after a suspend event.
Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Thu, 16 Jun 2005 20:22:23 +0000 (13:22 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Catalin Marinas [Thu, 16 Jun 2005 17:01:12 +0000 (18:01 +0100)]
[PATCH] ARM: 2714/1: Fix the IB2 definitions for the Versatile platform
Patch from Catalin Marinas
The initial IB2 addresses did not depend on the IB2 base. This
patch defines them as (VERSATILE_IB2_BASE + offset).
Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Catalin Marinas [Thu, 16 Jun 2005 17:01:11 +0000 (18:01 +0100)]
[PATCH] ARM: 2713/1: Fix the GPIO base for Integrator/CP
Patch from Catalin Marinas
The GPIO base for Integrator/CP is different from the
Integrator/AP. This patch sets the correct value for
INTEGRATOR_GPIO_BASE.
Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Catalin Marinas [Thu, 16 Jun 2005 17:01:11 +0000 (18:01 +0100)]
[PATCH] ARM: 2712/1: Fix the RGB order for the Versatile CLCD
Patch from Catalin Marinas
The current red and blue colours on the Versatile CLCD are
reversed when the 5:6:5 mode is used. The patch sets the proper
bit in the SYS_CLCD register value.
Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Thu, 16 Jun 2005 16:53:48 +0000 (09:53 -0700)]
Merge 'for-linus' branch of /linux/kernel/git/axboe/linux-2.6-block
Oliver Neukum [Thu, 16 Jun 2005 05:26:38 +0000 (22:26 -0700)]
[PATCH] fix for kaweth broken by changes in the networking layer
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dmitry Torokhov [Thu, 16 Jun 2005 05:26:36 +0000 (22:26 -0700)]
[PATCH] ALPS: fix enabling hardware tapping
It looks like logic for enabling hardware tapping in ALPS driver was
inverted and we enable it only if it was already enabled by BIOS or
firmware.
I have a confirmation from one user that the patch below fixes the problem
for him and it might be beneficial if we could get it into 2.6.12.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Daniel Jacobowitz [Thu, 16 Jun 2005 05:26:34 +0000 (22:26 -0700)]
[PATCH] Fix large core dumps with a 32-bit off_t
The ELF core dump code has one use of off_t when writing out segments.
Some of the segments may be passed the 2GB limit of an off_t, even on a
32-bit system, so it's important to use loff_t instead. This fixes a
corrupted core dump in the bigcore test in GDB's testsuite.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexandre Oliva [Thu, 16 Jun 2005 05:26:31 +0000 (22:26 -0700)]
[PATCH] sbp2 slab corruption fix
This fixed a problem that showed up in the Fedora development tree a few
weeks before the Fedora Core 4 release, initially as slab corruption, later
as hard crashes on boot up, when slab debugging was disabled for the
release. More details on the history at
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158424
The problem is caused by sbp2's use of scsi_host->hostdata[0] to hold a
scsi_id, without explicitly requesting space for it. Since hostdata is
declared as a zero-sized array, we don't get any such space by default, so
it must be explicitly requested. The patch below implements just that.
Signed-off-by: Alexandre Oliva <aoliva@redhat.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Tejun Heo [Thu, 16 Jun 2005 10:57:31 +0000 (12:57 +0200)]
This patch fixes q->unplug_thresh condition check in
__elv_add_request(). rq.count[READ] + rq.count[WRITE] can increase
more than one if another thread has allocated a request after the
current request is allocated or in_flight could have changed resulting
in larger-than-one change of nrq, thus breaking the threshold
mechanism.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Tejun Heo <htejun@gmail.com>
Tejun Heo [Thu, 16 Jun 2005 10:56:15 +0000 (12:56 +0200)]
This patch kills elevator_global_init() in elevator.c which does
nothing.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Tejun Heo <htejun@gmail.com>
David S. Miller [Thu, 16 Jun 2005 03:51:14 +0000 (20:51 -0700)]
[NETFILTER]: ipt_recent: last_pkts is an array of "unsigned long" not "u_int32_t"
This fixes various crashes on 64-bit when using this module.
Based upon a patch by Juergen Kreileder <jk@blackdown.de>.
Signed-off-by: David S. Miller <davem@davemloft.net>
ACKed-by: Patrick McHardy <kaber@trash.net>
Olaf Hering [Tue, 14 Jun 2005 20:52:19 +0000 (13:52 -0700)]
[PATCH] update ppc64 defconfig
enable cpusets
enable new lpfc and jsm drivers
enable new dm-multipath
leave new agp disabled
disable rivafb, it does not handle the cards in G5 models (FX5200 as example)
the new nvidiafb doesnt work on bigendian, yet
Signed-off-by: Olaf Hering <olh@suse.de>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paul Mackerras [Tue, 14 Jun 2005 12:19:24 +0000 (22:19 +1000)]
[PATCH] ppc64: update example configs
Here is a patch to update the example configs in arch/ppc64/configs.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Karsten Wiese [Tue, 14 Jun 2005 16:56:20 +0000 (09:56 -0700)]
[PATCH] usbusx2y: prevent oops & dead keyboard on usb unplugging while the device is being used
Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's. This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed. The patch ensures the correct sequence. Tested ok on
kernel 2.6.12-rc2.
Present in ALSA cvs
Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Karsten Wiese [Tue, 14 Jun 2005 16:54:55 +0000 (09:54 -0700)]
[PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used
Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's. This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed. The patch ensures the correct sequence. Tested ok on
kernel 2.6.12-rc2.
Present in ALSA cvs
Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Randy Dunlap [Tue, 14 Jun 2005 05:58:09 +0000 (22:58 -0700)]
[PATCH] macmodes: needs a license
Module needs a license to prevent kernel tainting.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Thomas Hood [Tue, 14 Jun 2005 05:58:04 +0000 (22:58 -0700)]
[PATCH] apm.c: ignore_normal_resume is set a bit too late
This patch causes the ignore_normal_resume flag to be set slightly earlier,
before there is a chance that the apm driver will receive the normal resume
event from the BIOS. (Addresses Debian bug #310865)
Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Markus Lidel [Tue, 14 Jun 2005 05:58:00 +0000 (22:58 -0700)]
[PATCH] i2o: Fix free of event memory in i2o_block_event()
Fixed freeing of event memory in i2o_block_event()
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jon Smirl [Mon, 13 Jun 2005 22:52:36 +0000 (15:52 -0700)]
[PATCH] Typo in fbdev sysfs support, virtual_size
It prints out x,x instead of x,y.
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@hotpop.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jan Kara [Mon, 13 Jun 2005 22:52:32 +0000 (15:52 -0700)]
[PATCH] cond_resched_lock() fix
On one path, cond_resched_lock() fails to return true if it dropped the lock.
We think this might be causing the crashes in JBD's log_do_checkpoint().
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Olof Johansson [Mon, 13 Jun 2005 22:52:27 +0000 (15:52 -0700)]
[PATCH] Fix PCI BAR size interpretation on 64-bit arches
On 64-bit machines, PCI_BASE_ADDRESS_MEM_MASK and other mask constants
passed to pci_size() are 64-bit (for example ~0x0fUL). However, pci_size
does comparisons between the u32 arguments and the mask, which will fail
even though any result from pci_size is still just 32-bit.
Changing the mask argument to u32 seems the obvious thing to do, since all
arithmetic in the function is 32-bit and having a larger mask makes no
sense.
This triggered on a PPC64 system here where an adapter (VGA, as it
happened) had a memory region base of 0xfe000000 and a sz of the same,
matching the if (max == maxbase ...) test at the bottom of pci_size but
failing the mask comparison. Quite a corner case which I guess explains
why we haven't seen it until now.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Mon, 13 Jun 2005 22:52:18 +0000 (15:52 -0700)]
[PATCH] uml: slirp and slip driver cleanups and fixes
This patch merges a lot of duplicated code in the slip and slirp drivers,
abstracts out the slip protocol, and makes the slip driver work in 2.6.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Mon, 13 Jun 2005 22:52:14 +0000 (15:52 -0700)]
[PATCH] uml: use fork instead of clone
Convert the boot-time host ptrace testing from clone to fork. They were
essentially doing fork anyway. This cleans up the code a bit, and makes
valgrind a bit happier about grinding it.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Mon, 13 Jun 2005 22:52:10 +0000 (15:52 -0700)]
[PATCH] uml: build cleanups
Fix a build failure when CONFIG_MODE_SKAS is disabled and make a Makefile
comment fit in 80 columns.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Dike [Mon, 13 Jun 2005 22:52:04 +0000 (15:52 -0700)]
[PATCH] uml: remove duplicate includes
A few files include the same header twice.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 14 Jun 2005 01:49:44 +0000 (18:49 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Patrick McHardy [Tue, 14 Jun 2005 01:27:13 +0000 (18:27 -0700)]
[NETFILTER]: Advance seq-file position in exp_next_seq()
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Tue, 14 Jun 2005 00:51:55 +0000 (17:51 -0700)]
Update DCO ("signoff") rules to 1.1
This adds a clause that notes explicitly that the person doing the
sign-off knows that the project (and his sign-off) is public and will
possibly get archived and re-distributed.
Linus Torvalds [Mon, 13 Jun 2005 23:24:01 +0000 (16:24 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
J. Simonetti [Mon, 13 Jun 2005 22:19:03 +0000 (15:19 -0700)]
[IPV4]: Sysctl configurable icmp error source address.
This patch alows you to change the source address of icmp error
messages. It applies cleanly to 2.6.11.11 and retains the default
behaviour.
In the old (default) behaviour icmp error messages are sent with the ip
of the exiting interface.
The new behaviour (when the sysctl variable is toggled on), it will send
the message with the ip of the interface that received the packet that
caused the icmp error. This is the behaviour network administrators will
expect from a router. It makes debugging complicated network layouts
much easier. Also, all 'vendor routers' I know of have the later
behaviour.
Signed-off-by: David S. Miller <davem@davemloft.net>
Sridhar Samudrala [Mon, 13 Jun 2005 22:13:05 +0000 (15:13 -0700)]
[SCTP] Fix incorrect setting of sk_bound_dev_if when binding/sending to a ipv6
link local address.
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Neil Horman [Mon, 13 Jun 2005 22:12:33 +0000 (15:12 -0700)]
[SCTP] Add support for ip_nonlocal_bind sysctl & IP_FREEBIND socket option
Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Vladislav Yasevich [Mon, 13 Jun 2005 22:11:57 +0000 (15:11 -0700)]
[SCTP] Extend the info exported via /proc/net/sctp to support netstat for SCTP.
Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Neil Horman [Mon, 13 Jun 2005 22:11:24 +0000 (15:11 -0700)]
[SCTP] Support SO_BINDTODEVICE socket option on incoming packets.
Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com
Signed-off-by: David S. Miller <davem@davemloft.net>
Vladislav Yasevich [Mon, 13 Jun 2005 22:10:49 +0000 (15:10 -0700)]
[SCTP]: Fix bug in restart of peeled-off associations.
Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Rémi Denis-Courmont [Mon, 13 Jun 2005 22:01:34 +0000 (15:01 -0700)]
[IPv6] Don't generate temporary for TUN devices
Userland layer-2 tunneling devices allocated through the TUNTAP driver
(drivers/net/tun.c) have a type of ARPHRD_NONE, and have no link-layer
address. The kernel complains at regular interval when IPv6 Privacy
extension are enabled because it can't find an hardware address :
Dec 29 11:02:04 auguste kernel: __ipv6_regen_rndid(idev=
cb3e0c00):
cannot get EUI64 identifier; use random bytes.
IPv6 Privacy extensions should probably be disabled on that sort of
device. They won't work anyway. If userland wants a more usual
Ethernet-ish interface with usual IPv6 autoconfiguration, it will use a
TAP device with an emulated link-layer and a random hardware address
rather than a TUN device.
As far as I could fine, TUN virtual device from TUNTAP is the very only
sort of device using ARPHRD_NONE as kernel device type.
Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
YOSHIFUJI Hideaki [Mon, 13 Jun 2005 21:59:44 +0000 (14:59 -0700)]
[IPV6]: Ensure to use icmpv6_socket in non-preemptive context.
We saw following trace several times:
|BUG: using smp_processor_id() in preemptible [
00000001] code: httpd/30137
|caller is icmpv6_send+0x23/0x540
| [<
c01ad63b>] smp_processor_id+0x9b/0xb8
| [<
c02993e7>] icmpv6_send+0x23/0x540
This is because of icmpv6_socket, which is the only one user of
smp_processor_id() in icmpv6_send(), AFAIK.
Since it should be used in non-preemptive context,
let's defer the dereference after disabling preemption
(by icmpv6_xmit_lock()).
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Mon, 13 Jun 2005 21:47:47 +0000 (14:47 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Nicolas Pitre [Mon, 13 Jun 2005 21:35:41 +0000 (22:35 +0100)]
[PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n
Patch from Nicolas Pitre
Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ralf Baechle [Mon, 13 Jun 2005 21:30:40 +0000 (14:30 -0700)]
[NET]: Move the netdev list to vger.kernel.org.
From: Ralf Baechle <ralf@linux-mips.org>
There are archives of the old list at http://oss.sgi.com/archives/netdev
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Randy Dunlap [Mon, 13 Jun 2005 21:29:06 +0000 (14:29 -0700)]
[IPV4]: Multipath modules need a license to prevent kernel tainting.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Andi Kleen [Mon, 13 Jun 2005 21:24:52 +0000 (14:24 -0700)]
[TCP]: Adjust TCP mem order check to new alloc_large_system_hash
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Tom Rini [Mon, 13 Jun 2005 20:57:10 +0000 (13:57 -0700)]
[NET]: linux/if_tr.h needs asm/byteorder.h
<linux/if_tr.h> uses __be16, but does not directly include
<asm/byteorder.h>. Add this in, so that dhcp/net-tools token ring code
can compile again.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Trond Myklebust [Mon, 13 Jun 2005 15:14:01 +0000 (11:14 -0400)]
[PATCH] NFS: Ensure that we revalidate the cached file length for llseek(SEEK_END)
This fixes a data corruption error for mail delivery applications that
expect to be able to do posix locking and then append writes on NFS.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Brownell [Mon, 13 Jun 2005 14:15:28 +0000 (07:15 -0700)]
[PATCH] spin longer for ehci port reset completion
This makes the EHCI driver spin a bit longer before concluding that the
port reset failed. "Obviously safe."
It allows some devices to enumerate that previously didn't. We've seen
a bunch of these problem reports recently, this will make some go away.
As reported by Michael Zapf <Michael.Zapf@uni-kassel.de>, some EHCI
controllers seem to take forever to finish port resets and produce
"port N reset error -110" type errors. Spinning a bit longer helps.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alan Cox [Sat, 11 Jun 2005 17:00:52 +0000 (18:00 +0100)]
[PATCH] pwc bug fix
The pwc chainsaw session left some setups not working. There is a
sanity check on compression buffers that simply isn't right any more as
we never allocate one.
This doesn't address the email and other changes. I'll do those
tomorrow if I get time, but it is the minimal fix for the code and basic
feature set.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Fri, 10 Jun 2005 23:45:30 +0000 (09:45 +1000)]
[PATCH] radeonfb: don't blow up VGA console on load
The current radeonfb memset's the framebuffer to 0 when loaded. This
removes occasional artifacts but has the nasty side effect that if you
load radeonfb without framebuffer console, you destroy the VGA text
buffer, font, etc... radeon must not touch the framebuffer content when
it doesn't "own" it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Geert Uytterhoeven [Sun, 12 Jun 2005 09:25:42 +0000 (11:25 +0200)]
[PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken
M68k: Mark Sun-3 NCR5380 SCSI broken until NCR5380_abort() and
NCR5380_bus_reset() are replaced with real new-style EH routines (the old EH
SCSI constants were removed in 2.6.12-rc3).
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Geert Uytterhoeven [Sun, 12 Jun 2005 09:25:43 +0000 (11:25 +0200)]
[PATCH] M68k: Update defconfigs
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Geert Uytterhoeven [Sun, 12 Jun 2005 08:56:26 +0000 (10:56 +0200)]
[PATCH] Remove obsolete HAVE_ARCH_GET_SIGNAL_TO_DELIVER?
Now m68k no longer sets HAVE_ARCH_GET_SIGNAL_TO_DELIVER, can it be removed
completely? Or may ARM26 still need it? Note that its usage was removed from
kernel/signal.c about 2 months ago.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Geert Uytterhoeven [Sun, 12 Jun 2005 08:57:40 +0000 (10:57 +0200)]
[PATCH] IrDA: IrDA: Fix CONFIG_VIA_FIR typo (double `those')
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This page took 0.044143 seconds and 5 git commands to generate.