Takashi Iwai [Thu, 17 Nov 2005 12:59:38 +0000 (13:59 +0100)]
[ALSA] Remove xxx_t typedefs: PCM
Modules: PCM Midlevel
Remove xxx_t typedefs from the core PCM codes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 12:58:48 +0000 (13:58 +0100)]
[ALSA] Remove xxx_t typedefs: Proc handler
Modules: ALSA Core
Remove xxx_t typedefs from the core proc handler codes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 12:58:21 +0000 (13:58 +0100)]
[ALSA] Remove xxx_t typedefs: Hwdep
Modules: HWDEP Midlevel
Remove xxx_t typedefs from the core hwdep codes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 12:56:51 +0000 (13:56 +0100)]
[ALSA] Remove xxx_t typedefs: Raw MIDI
Modules: RawMidi Midlevel
Remove xxx_t typedefs from the core raw MIDI codes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 12:56:05 +0000 (13:56 +0100)]
[ALSA] Remove xxx_t typedefs: Timer
Modules: RTC timer driver,Timer Midlevel
Remove xxx_t typedefs from the core timer.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 12:53:23 +0000 (13:53 +0100)]
[ALSA] Remove xxx_t typedefs: Controls
Modules: Control Midlevel
Remove xxx_t typedefs from the core controls.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 12:51:18 +0000 (13:51 +0100)]
[ALSA] Remove xxx_t typedefs: Core component
Modules: ALSA Core
Remove xxx_t typedefs from the core component.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 10:12:06 +0000 (11:12 +0100)]
[ALSA] nm256 - Code clean up
Modules: NM256 driver
Clean up snd-nm256 driver code:
- Simplify chip constructor function
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 10:09:23 +0000 (11:09 +0100)]
[ALSA] hda-codec - Fix assignment of speaker pin
Modules: HDA Codec driver,HDA generic driver
Fix the auto-assignment of speaker pin. Handle it independently from
line-out pins.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 10:08:23 +0000 (11:08 +0100)]
[ALSA] hda-codec - Fix a typo
Modules: HDA Codec driver
Fix a typo in hda_codec.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 10:07:49 +0000 (11:07 +0100)]
[ALSA] hda-codec - Prepare unsol workqueue on demand
Modules: HDA Codec driver
Prepare unsol workqueue only when a codec really supports.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 10:06:29 +0000 (11:06 +0100)]
[ALSA] hda-codec - Add channel-mode helper
Modules: HDA Codec driver,HDA generic driver
Add common channel-mode helper functions for all codec patches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 10:05:34 +0000 (11:05 +0100)]
[ALSA] Small update of Procfile.txt
Modules: Documentation
Small update of Procfile.txt for hda and usb proc files.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 10:04:55 +0000 (11:04 +0100)]
[ALSA] [Trivial] Fix ac97_quirk option in document
Modules: Documentation
Fix a wrong option value for ac97_quirk option in the document.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Andreas Mohr [Thu, 17 Nov 2005 10:03:31 +0000 (11:03 +0100)]
[ALSA] ALS4000 update
Modules: SB drivers,ALS4000 driver
some update for the ALS4000 driver (tested with hardware in my PC):
- use common control names according to ControlNames.txt
- add some controls (Master Mono, 3D control)
- optimize struct snd_card_als4000_t layout (performance/size)
- save some bytes via unified error path
- constify some read-only data
- add ToDo list
- move GPL license text to top
- add comments
Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:50:13 +0000 (10:50 +0100)]
[ALSA] emux - Avoid cast of function pointers
Modules: Common EMU synth
Pass the proper functions instead of cast of function pointers, which
can be dangerous with compiler optimizations.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:48:52 +0000 (10:48 +0100)]
[ALSA] usx2y - Code clean up
Modules: USB USX2Y
Clean up snd-usb-usx2y driver code:
- Avoid unnecessary cast
- Fix spaces/indents
- Use kzalloc()
- Remove weird debug prints
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:45:48 +0000 (10:45 +0100)]
[ALSA] korg1212 - Clean up debug prints
Modules: KORG1212 driver
Clean up debug prints in korg1212 driver.
Also, clean up spaces/indents in some places.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:44:51 +0000 (10:44 +0100)]
[ALSA] emu10k1 - Minor clean up of memory block handling
Modules: EMU10K1/EMU10K2 driver
Minor clean up of emu10k1 memory block allocation.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:43:53 +0000 (10:43 +0100)]
[ALSA] emu10k1x - Minor clean up
Modules: EMU10K1/EMU10K2 driver
Minor clean up of the emu10k1x interrupt handler code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:42:40 +0000 (10:42 +0100)]
[ALSA] ac97 - Remove ac9_enum definition from public header
Modules: AC97 Codec
Remove the definition of ac97_enum struct from the public ac97_codec.h.
It's used only in the module.
The location of struct ac97_pcm is moved closer to its accessor
to improve readability.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:40:18 +0000 (10:40 +0100)]
[ALSA] ca0106 - Code clean up
Modules: CA0106 driver
Clean up snd-ca0106 driver code:
- Fix spaces and indents
- Remove unnecessary spinlocks
- Clean up the mixer callbacks using private_value
- Clean up mixer constructors using an array
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:37:40 +0000 (10:37 +0100)]
[ALSA] intel8x0 - Clean up delay function
Modules: Intel8x0 driver,Intel8x0-modem driver
Remove superfluous delay macro.
Call appropriate functions directly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:36:57 +0000 (10:36 +0100)]
[ALSA] cs4281 - Clean up delay function
Modules: CS4281 driver
Remove the own delay function.
Call appropriate functions directly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:35:53 +0000 (10:35 +0100)]
[ALSA] Remove superfluous macros
Modules: ATIIXP driver,ATIIXP-modem driver
Remove superfluous macros for delay.
Call appropriate functions directly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:34:40 +0000 (10:34 +0100)]
[ALSA] harmony - Code clean up
Modules: PARISC Harmony driver
Clean up snd-harmony driver code:
- Give standard module options
- Fix spinlocks
- Fix the error path of request_irq()
- Clean up redundant codes
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:32:43 +0000 (10:32 +0100)]
[ALSA] au1x00 - Code clean up
Modules: MIPS AU1x00 driver
Clean up snd-au1x00 driver code:
- Remove global variables
- Remove old compatibility codes
- Fix DMA-link allocation/release functions in hw_params and hw_free
callbacks (they may be called multiple times)
- Fix spinlocks
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:29:33 +0000 (10:29 +0100)]
[ALSA] Clean up includes in asound.h & asequencer.h
Modules: ALSA sequencer,ALSA Core
Clean up includes in asound.h and asequencer.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:28:15 +0000 (10:28 +0100)]
[ALSA] [Trivial] Fix spaces in gus.h
Modules: GUS Library
Fix spaces in gus.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:27:08 +0000 (10:27 +0100)]
[ALSA] Clean up ISA cs4231 code
Modules: CS4231 driver
Clean up ISA cs4231 code, removing experimental EBUS/SBUS merge,
to improve readability.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:25:22 +0000 (10:25 +0100)]
[ALSA] Clean up sa11xx-uda1341 driver
Modules: SA11xx UDA1341 driver,L3 drivers,UDA1341
Clean up sa11xx-uda1341 driver:
- Fix buggy destructor
- Remove the global variable
- Move array definitions from uda1341.h
- Make functions in uda1341.c static
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:22:32 +0000 (10:22 +0100)]
[ALSA] Remove tea6330t struct definition from public header
Modules: I2C tea6330t
Remove tea6330t struct definition from public header.
It's anyway unaccessible from outside.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:21:19 +0000 (10:21 +0100)]
[ALSA] Remove snd_vx_delay() function
Replace snd_vx_delay() with appropriate delay/sleep functions.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:20:23 +0000 (10:20 +0100)]
[ALSA] snd-dummy - Code clean-up
Modules: Generic drivers
Clean up snd-dummy driver code.
- Make common PCM callbacks
- Simplify open callback
- Remove unnecessary irqsave in control callbacks
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:18:00 +0000 (10:18 +0100)]
[ALSA] Use standard bitmap functions
Modules: ALSA<-OSS emulation
Use standard bitmap functions instead of in-house ones.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:17:05 +0000 (10:17 +0100)]
[ALSA] Sort Kconfig entries
Modules: ISA,PCI drivers
Sort Kconfig entries in alphabetical order.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 17 Nov 2005 09:15:37 +0000 (10:15 +0100)]
[ALSA] Minor clean up and fixes for CS5535 audio driver
Modules: Documentation,CS5535 driver
Minor clean up and fixes for CS5535 audio driver.
Added an entry in ALSA-Configuration.txt, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Jaya Kumar [Thu, 17 Nov 2005 09:12:23 +0000 (10:12 +0100)]
[ALSA] Add support for the CS5535 Audio device
Add support for the CS5535 Audio device. I've fixed up some errors as per
Takashi's advice from the thread:
http://lkml.org/lkml/2005/9/15/119
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
cs5535 is a 32bit x86 only device using weird CPU features
Signed-off-by: Jaya Kumar <jayakumar.alsa@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Wed, 16 Nov 2005 17:43:35 +0000 (18:43 +0100)]
[ALSA] Remove superfluous pcm_free callbacks
Remove superflous pcm_free callbacks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Kurt J. Bosch [Wed, 16 Nov 2005 17:41:21 +0000 (18:41 +0100)]
[ALSA] Fix missing suspend/resume-code for ens1371
Modules: ENS1370/1+ driver
This patch fixes missing suspend/resume-code for snd-ens1371
(but not for snd-ens1370)
Signed-off-by: Kurt J. Bosch <kjb-temp-2005@gmx.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Daniel Mueller [Mon, 14 Nov 2005 16:40:44 +0000 (17:40 +0100)]
[ALSA] hda-codec - Fix HDA sound and V.92 modem for notebook Siemens FieldPG-M
Modules: HDA Codec driver
The patch fixes the problem of mute onboard HDA sound output,
buildin V.92 modem idendification and functionality.
Signed-off-by: Daniel Mueller <daniel.mueller@siemens.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Jaroslav Kysela [Mon, 14 Nov 2005 07:48:59 +0000 (08:48 +0100)]
[ALSA] ac97 - procfs - print PCI subsystem vendor/device values
Modules: AC97 Codec
For debugging and problem finding purposes, show also the PCI subsystem
vendor/device values in the ac97#X proc file.
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Fri, 11 Nov 2005 22:45:23 +0000 (23:45 +0100)]
[ALSA] snd-emu10k1: Found some new registers to display in debug mode.
Modules: EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
James Courtier-Dutton [Fri, 11 Nov 2005 22:39:05 +0000 (23:39 +0100)]
[ALSA] snd-emu10k1: Attenuate output volume to reduce distortion
Modules: EMU10K1/EMU10K2 driver
on Audigy 2 ZS Notebook.
Set the master volume to about 6 or 8% in alsamixer. This will
attenuate the output enough for better sound quality.
Note: Only stereo enabled at present.
The distortion is caused by the output path after the DSP
adding 12dB gain to the output while still in digital mode,
resulting in wrap around distortion.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Takashi Iwai [Fri, 11 Nov 2005 20:05:27 +0000 (21:05 +0100)]
[ALSA] ali5451 - Fix and clean up codec accessor
Modules: ALI5451 driver
Fix the codec accessors to avoid soft lockup.
Spin locks are revised, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Jaroslav Kysela [Thu, 10 Nov 2005 06:51:31 +0000 (07:51 +0100)]
[ALSA] ice1724 (juli) - forced analog doughter board detection
Modules: ICE1712 driver
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Tue, 8 Nov 2005 16:44:37 +0000 (17:44 +0100)]
[ALSA] via82xx - Add dxs entry for MSI KT800 Delta-FSR
Modules: VIA82xx driver
Added the dxs entry for MSI KT800 Delta-FSR.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Lee Revell [Mon, 7 Nov 2005 13:59:19 +0000 (14:59 +0100)]
[ALSA] Add support for Audigy 2 subsystem 2006
Modules: EMU10K1/EMU10K2 driver
Add support for Audigy 2 subsystem 2006.
Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Lee Revell [Mon, 7 Nov 2005 13:54:24 +0000 (14:54 +0100)]
[ALSA] emu10k1 - Enable side surround channels for Audigy2 EX
Modules: EMU10K1/EMU10K2 driver
Enable side surround channels for Audigy2 EX. Tested by Rick Wright
<riwright@vt.edu>.
Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Randy Dunlap [Mon, 7 Nov 2005 13:43:23 +0000 (14:43 +0100)]
[ALSA] sound/hda: rate-limit timeout message
Modules: HDA Intel driver
Rate-limit the azx_get_response timeout message. A continuous 2 per second
is too much.
Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Mon, 7 Nov 2005 13:38:44 +0000 (14:38 +0100)]
[ALSA] hda-codec - Allocate amp hash array dynamically
Modules: HDA Codec driver
Allocate amp hash array dynamically instead of static array.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Linus Torvalds [Tue, 3 Jan 2006 03:21:10 +0000 (19:21 -0800)]
Linux v2.6.15
Hey, it's fifteen years today since I bought the machine that got Linux
started. January 2nd is a good date.
Andi Kleen [Mon, 2 Jan 2006 23:07:28 +0000 (00:07 +0100)]
[PATCH] Make sure interleave masks have at least one node set
Otherwise a bad mem policy system call can confuse the interleaving
code into referencing undefined nodes.
Originally reported by Doug Chapman
I was told it's CVE-2005-3358
(one has to love these security people - they make everything sound important)
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dag-Erling Smørgrav [Mon, 2 Jan 2006 14:57:06 +0000 (15:57 +0100)]
[PATCH] Avoid namespace pollution in <asm/param.h>
In commit 3D59121003721a8fad11ee72e646fd9d3076b5679c, the x86 and x86-64
<asm/param.h> was changed to include <linux/config.h> for the
configurable timer frequency.
However, asm/param.h is sometimes used in userland (it is included
indirectly from <sys/param.h>), so your commit pollutes the userland
namespace with tons of CONFIG_FOO macros. This greatly confuses
software packages (such as BusyBox) which use CONFIG_FOO macros
themselves to control the inclusion of optional features.
After a short exchange, Christoph approved this patch
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Mon, 2 Jan 2006 02:04:44 +0000 (13:04 +1100)]
[PATCH] powerpc: more g5 overtemp problem fix
Some G5s still occasionally experience shutdowns due to overtemp
conditions despite the recent fix. After analyzing logs from such
machines, it appears that the overtemp code is a bit too quick at
shutting the machine down when reaching the critical temperature (tmax +
8) and doesn't leave the fan enough time to actually cool it down. This
happens if the temperature of a CPU suddenly rises too high in a very
short period of time, or occasionally on boot (that is the CPUs are
already overtemp by the time the driver loads).
This patches makes the code a bit more relaxed, leaving a few seconds to
the fans to do their job before kicking the machine shutown.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Stas Sergeev [Sun, 1 Jan 2006 01:18:52 +0000 (04:18 +0300)]
[PATCH] x86: teach dump_task_regs() about the -8 offset.
This should fix multi-threaded core-files
Signed-off-by: stsp@aknet.ru
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sun, 1 Jan 2006 01:00:29 +0000 (17:00 -0800)]
sysctl: make sure to terminate strings with a NUL
This is a slightly more complete fix for the previous minimal sysctl
string fix. It always terminates the returned string with a NUL, even
if the full result wouldn't fit in the user-supplied buffer.
The returned length is the full untruncated length, so that you can
tell when truncation has occurred.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 31 Dec 2005 21:49:26 +0000 (13:49 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Yi Yang [Fri, 30 Dec 2005 08:37:10 +0000 (16:37 +0800)]
[PATCH] Fix false old value return of sysctl
For the sysctl syscall, if the user wants to get the old value of a
sysctl entry and set a new value for it in the same syscall, the old
value is always overwritten by the new value if the sysctl entry is of
string type and if the user sets its strategy to sysctl_string. This
issue lies in the strategy being run twice if the strategy is set to
sysctl_string, the general strategy sysctl_string always returns 0 if
success.
Such strategy routines as sysctl_jiffies and sysctl_jiffies_ms return 1
because they do read and write for the sysctl entry.
The strategy routine sysctl_string return 0 although it actually read
and write the sysctl entry.
According to my analysis, if a strategy routine do read and write, it
should return 1, if it just does some necessary check but not read and
write, it should return 0, for example sysctl_intvec.
Signed-off-by: Yi Yang <yang.y.yi@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 31 Dec 2005 01:18:53 +0000 (17:18 -0800)]
sysctl: don't overflow the user-supplied buffer with '\0'
If the string was too long to fit in the user-supplied buffer,
the sysctl layer would zero-terminate it by writing past the
end of the buffer. Don't do that.
Noticed by Yi Yang <yang.y.yi@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Fri, 30 Dec 2005 16:39:10 +0000 (08:39 -0800)]
Insanity avoidance in /proc
The old /proc interfaces were never updated to use loff_t, and are just
generally broken. Now, we should be using the seq_file interface for
all of the proc files, but converting the legacy functions is more work
than most people care for and has little upside..
But at least we can make the non-LFS rules explicit, rather than just
insanely wrapping the offset or something.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Denny Priebe [Fri, 30 Dec 2005 03:19:09 +0000 (22:19 -0500)]
[PATCH] Input: wacom - fix X axis setup
This patch fixes a typo introduced by conversion to dynamic input_dev
allocation.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dmitry Torokhov [Fri, 30 Dec 2005 03:19:08 +0000 (22:19 -0500)]
[PATCH] Input: warrior - fix HAT0Y axis setup
This patch fixes a typo introduced by conversion to dynamic input_dev
allocation.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dmitry Torokhov [Fri, 30 Dec 2005 03:19:07 +0000 (22:19 -0500)]
[PATCH] Input: kbtab - fix Y axis setup
This patch fixes a typo introduced by conversion to dynamic input_dev
allocation.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Erik Hovland [Fri, 30 Dec 2005 15:57:35 +0000 (15:57 +0000)]
[ARM] 3216/1: indent and typo in drivers/serial/pxa.c
Patch from Erik Hovland
This patch provides two changes. An indent is supplied for an if/else clause so that it is more readable. An acronym is incorrectly typed as UER when it should be IER.
Signed-off-by: Erik Hovland <erik@hovland.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Jean Delvare [Thu, 29 Dec 2005 21:07:30 +0000 (22:07 +0100)]
[PATCH] Simplify the VIDEO_SAA7134_OSS Kconfig dependency line
Thanks to Roman Zippel for the suggestion.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
[ Short explanation: Kconfig uses ternary math: n/m/y, and !m is m ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 29 Dec 2005 21:01:54 +0000 (13:01 -0800)]
Revert radeon AGP aperture offset changes
This reverts the series of commits
67dbb4ea33731415fe09c62149a34f472719ac1d
281ab031a8c9e5b593142eb4ec59a87faae8676a
47807ce381acc34a7ffee2b42e35e96c0f322e52
that changed the GART VM start offset. It fixed some machines, but
seems to continually interact badly with some X versions.
Quoth Ben Herrenschmidt:
"So I think at this point, the best is that we keep the old bogus code
that at least is consistent with the bug in the server. I'm working on a
big patch to X that reworks the memory map stuff completely and fixes
those issues on the server side, I'll do a DRM patch matching this X fix
as well so that the memory map is only ever set in one place and with
what I hope is a correct algorithm..."
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 29 Dec 2005 18:27:28 +0000 (10:27 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Thu, 29 Dec 2005 18:27:07 +0000 (10:27 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Jean Delvare [Wed, 28 Dec 2005 20:02:57 +0000 (21:02 +0100)]
[PATCH] Fix recursive config dependency for SAA7134
Fix the cyclic dependency issue between CONFIG_SAA7134_ALSA and
CONFIG_SAA7134_OSS (credits to Mauro Carvalho Chehab.)
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Anton Blanchard [Wed, 28 Dec 2005 23:46:29 +0000 (10:46 +1100)]
[PATCH] ppc64: htab_initialize_secondary cannot be marked __init
Sonny has noticed hotplug CPU on ppc64 is broken in 2.6.15-*. One of the
problems is that htab_initialize_secondary is called when a cpu is being
brought up, but it is marked __init.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ravikiran G Thirumalai [Thu, 29 Dec 2005 12:06:11 +0000 (13:06 +0100)]
[PATCH] x86_64: Fix incorrect node_present_pages on NUMA
Currently, we do not pass the correct start_pfn to e820_hole_size, to
calculate holes. Following patch fixes that.
The bug results in incorrect number of node_present_pages for each pgdat
and causes ugly output in /sys and probably VM inbalances.
Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Sighed-off-by: Shair Fultheim <shai@scalex86.org>
Sighed-off-by: Linus Torvalds <torvalds@osdl.org>
Riccardo Magliocchetti [Thu, 29 Dec 2005 01:44:48 +0000 (20:44 -0500)]
[PATCH] Input: aiptek - fix Y axis setup
This patch fixes a typo introduced by conversion to dynamic input_dev
allocation.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dave Jones [Thu, 29 Dec 2005 01:01:04 +0000 (20:01 -0500)]
[PATCH] fix ia64 compile failure with gcc4.1
__get_unaligned creates a typeof the var its passed, and writes to it,
which on gcc4.1, spits out the following error:
drivers/char/vc_screen.c: In function 'vcs_write':
drivers/char/vc_screen.c:422: error: assignment of read-only variable 'val'
Signed-off-by: Dave Jones <davej@redhat.com>
[ The "right" fix would be to try to fix <asm-generic/unaligned.h>
but that's hard to do with the tools gcc gives us. So this
simpler patch is preferable -- Linus ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Thu, 29 Dec 2005 16:40:02 +0000 (17:40 +0100)]
[PATCH] uml: fix compilation with CONFIG_MODE_TT disabled
Fix UML compilation when SKAS mode is disabled. Indeed, we were compiling
SKAS-only object files, which failed due to some SKAS-only headers being
excluded from the search path.
Thanks to the bug report from Pekka J Enberg.
Acked-by: Pekka J Enberg <penberg (at) cs ! helsinki ! fi>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Thu, 29 Dec 2005 16:39:59 +0000 (17:39 +0100)]
[PATCH] Hostfs: update for new glibc - add missing symbol exports
Today, when compiling UML, I got warnings for two used unexported symbols:
readdir64 and truncate64. Indeed, my glibc headers are aliasing readdir to
readdir64 and truncate to truncate64 (and so on).
I'm then adding additional exports. Since I've no idea if the symbols where
always provided in the supported glibc's, I've added weak definitions too.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Thu, 29 Dec 2005 16:39:57 +0000 (17:39 +0100)]
[PATCH] uml: hostfs - fix possible PAGE_CACHE_SHIFT overflows
Prevent page->index << PAGE_CACHE_SHIFT from overflowing.
There is a casting there, but was added without care, so it's at the wrong
place. Note the extra parens around the shift - "+" is higher precedence than
"<<", leading to a GCC warning which saved all us.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Thu, 29 Dec 2005 16:39:54 +0000 (17:39 +0100)]
[PATCH] Hostfs: remove unused var
Trivial removal of unused variable from this file - doesn't even change the
generated assembly code, in fact (gcc should trigger a warning for unused value
here).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Thu, 29 Dec 2005 16:39:51 +0000 (17:39 +0100)]
[PATCH] uml: fix random segfaults at bootup
Don't use printk() where "current_thread_info()" is crap.
Until when we switch to running on init_stack, current_thread_info() evaluates
to crap. Printk uses "current" at times (in detail, ¤t is evaluated with
CONFIG_DEBUG_SPINLOCK to check the spinlock owner task).
And this leads to random segmentation faults.
Exactly, what happens is that ¤t = *(current_thread_info()), i.e. round
down $esp and dereference the value. I.e. access the stack below $esp, which
causes SIGSEGV on a VM_GROWSDOWN vma (see arch/i386/mm/fault.c).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Wed, 28 Dec 2005 21:45:19 +0000 (13:45 -0800)]
Merge /pub/scm/linux/kernel/git/davem/tg3-2.6
David S. Miller [Wed, 28 Dec 2005 21:27:04 +0000 (13:27 -0800)]
[SERMOUSE]: Sun mice speak 5-byte protocol too.
Noticed by Christophe Zimmerman, this explains the slow mouse movement
with 2.6.x kernels.
And checking the 2.4.x drivers/sbus/char/sunmouse.c driver shows we
always used a 5-byte protocol with Sun mice in the past. I have no
idea how the 3-byte thing got into the 2.6.x driver, but it's surely
wrong.
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Wed, 28 Dec 2005 21:22:54 +0000 (13:22 -0800)]
[SPARC]: Use STABS_DEBUG and DWARF_DEBUG macros in vmlinux.lds.S
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Wed, 28 Dec 2005 21:05:41 +0000 (13:05 -0800)]
[TG3]: Update driver version and reldate.
Signed-off-by: David S. Miller <davem@davemloft.net>
Chris Elmquist [Tue, 20 Dec 2005 21:25:19 +0000 (13:25 -0800)]
[TG3]: ethtool -d hangs PCIe systems
Resubmitting after recommendation to use GET_REG32_1() instead of
GET_REG32_LOOP(..., 1). Retested. Problem remains fixed.
Prevent tg3_get_regs() from reading reserved and undocumented registers
at RX_CPU_BASE and TX_CPU_BASE offsets which caused hostile behavior
on PCIe platforms.
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Benjamin Herrenschmidt [Tue, 27 Dec 2005 01:49:33 +0000 (12:49 +1100)]
[PATCH] Fix more radeon GART start calculation cases
As reported by Jules Villard <jvillard@ens-lyon.fr> and some others, the
recent GART aperture start reconfiguration causes problems on some
setups.
What I _think_ might be happening is that the X server is also trying to
muck around with the card memory map and is forcing it back into a wrong
setting that also happens to no longer match what the DRM wants to do
and blows up. There are bugs all over the place in that code (and still
some bugs in the DRM as well anyway).
This patch attempts to avoid that by using the largest of the 2 values,
which I think will cause it to behave as it used to for you and will
still fix the problem with machines that have an aperture size smaller
than the video memory.
Acked-by: Jules Villard <jvillard@ens-lyon.fr>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David L Stevens [Tue, 27 Dec 2005 22:03:00 +0000 (14:03 -0800)]
[IPV6] mcast: Fix multiple issues in MLDv2 reports.
The below "jumbo" patch fixes the following problems in MLDv2.
1) Add necessary "ntohs" to recent "pskb_may_pull" check [breaks
all nonzero source queries on little-endian (!)]
2) Add locking to source filter list [resend of prior patch]
3) fix "mld_marksources()" to
a) send nothing when all queried sources are excluded
b) send full exclude report when source queried sources are
not excluded
c) don't schedule a timer when there's nothing to report
NOTE: RFC 3810 specifies the source list should be saved and each
source reported individually as an IS_IN. This is an obvious DOS
path, requiring the host to store and then multicast as many sources
as are queried (e.g., millions...). This alternative sends a full,
relevant report that's limited to number of sources present on the
machine.
4) fix "add_grec()" to send empty-source records when it should
The original check doesn't account for a non-empty source
list with all sources inactive; the new code keeps that
short-circuit case, and also generates the group header
with an empty list if needed.
5) fix mca_crcount decrement to be after add_grec(), which needs
its original value
These issues (other than item #1 ;-) ) were all found by Yan Zheng,
much thanks!
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller [Tue, 27 Dec 2005 21:57:59 +0000 (13:57 -0800)]
[NET]: Validate socket filters against BPF_MAXINSNS in one spot.
Currently the checks are scattered all over and this leads
to inconsistencies and even cases where the check is not made.
Based upon a patch from Kris Katterjohn.
Signed-off-by: David S. Miller <davem@davemloft.net>
YOSHIFUJI Hideaki [Tue, 27 Dec 2005 21:35:15 +0000 (13:35 -0800)]
[IPV6]: Fix addrconf dead lock.
We need to release idev->lcok before we call addrconf_dad_stop().
It calls ipv6_addr_del(), which will hold idev->lock.
Bug spotted by Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Russell King [Tue, 27 Dec 2005 11:10:34 +0000 (11:10 +0000)]
[SERIAL] Fix AMBA PL011 sysrq character handling
We only want the received character without the status bits for
sysrq handling.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
David Kimdon [Tue, 27 Dec 2005 01:27:10 +0000 (17:27 -0800)]
[BR_NETFILTER]: Fix leak if skb traverses > 1 bridge
Call nf_bridge_put() before allocating a new nf_bridge structure and
potentially overwriting the pointer to a previously allocated one.
This fixes a memory leak which can occur when the bridge topology
allows for an skb to traverse more than one bridge.
Signed-off-by: David Kimdon <david.kimdon@devicescape.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
David L Stevens [Tue, 27 Dec 2005 01:03:46 +0000 (17:03 -0800)]
[IPV6]: Increase default MLD_MAX_MSF to 64.
The existing default of 10 is just way too low.
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
James Bottomley [Mon, 26 Dec 2005 15:58:49 +0000 (09:58 -0600)]
[PATCH] Fix Fibre Channel boot oops
The oops is characteristic of the underlying device being removed from
visibility before the class device, and sure enough we do device_del()
before transport_unregister() in the scsi_target_reap() routines. I've
no idea why this is suddenly showing up, since the code has been in
there since that function was first invented. However, I've confirmed
this fixes Andrew Vasquez's boot oops.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 24 Dec 2005 23:47:48 +0000 (15:47 -0800)]
Linux v2.6.15-rc7
Ho ho ho.
Kurt Huwig [Sat, 24 Dec 2005 23:13:08 +0000 (00:13 +0100)]
[PATCH] n_r3964: fixed usage of HZ; removed bad include
Fix n_r3964 timeouts (hardcoded for 100Hz)
Also the include of <asm/termios.h> in 'n_r3964.h' is unnecessary and
prevents using the header file in any application that has to include
<termios.h> due to duplicate definition of 'struct termio'.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 24 Dec 2005 20:40:43 +0000 (12:40 -0800)]
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev
Linus Torvalds [Sat, 24 Dec 2005 20:32:55 +0000 (12:32 -0800)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Sat, 24 Dec 2005 20:30:42 +0000 (12:30 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Ben Collins [Fri, 23 Dec 2005 14:10:03 +0000 (09:10 -0500)]
[PATCH] Fix typo in x86_64 __build_write_lock_const assembly
Based on __build_read_lock_const, this looked like a bug.
[ Indeed. Maybe nobody uses this version? Worth fixing up anyway ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ravikiran G Thirumalai [Thu, 22 Dec 2005 22:21:34 +0000 (14:21 -0800)]
[PATCH] x86_64/ia64 : Fix compilation error for node_to_first_cpu
Fixes a compiler error in node_to_first_cpu, __ffs expects unsigned long as
a parameter; instead cpumask_t was being passed. The macro
node_to_first_cpu was not yet used in x86_64 and ia64 arches, and so we never
hit this. This patch replaces __ffs with first_cpu macro, similar to other
arches.
Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
Signed-off-by: Ravikiran G Thirumalai <kiran@scalex86.org>
Signed-off-by: Shai Fultheim <shai@scalex86.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 24 Dec 2005 20:19:38 +0000 (12:19 -0800)]
Fix silly typo ("smb" vs "smp")
Introduced by commit
6003a93e7bf6c02f33c02976ff364785d4273295