summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] scsi_ioctl: only warn for rejected commandsJens Axboe2005-10-081-4/+4
| | | | | | | | We should not be warning about commands that we allow, even if they are unknown. So move the if-root-allow check up a notch. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds2005-10-0819-53/+115
|\
| * [ALSA] usb-audio: add MIDI quirk for Hercules DJ ConsoleClemens Ladisch2005-10-071-0/+21
| | | | | | | | | | | | | | | | USB generic driver Add a quirk entry for the external MIDI ports of the Windows Edition of the Hercules DJ Console. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] usb-audio: add another ID for Hercules DJ ConsoleClemens Ladisch2005-10-071-1/+6
| | | | | | | | | | | | | | | | USB generic driver Add a mixer quirk entry for the Hercules DJ Console (Windows Edition) that uses a different USB product ID. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] ali5451 - Don't build non-existing modem PCMTakashi Iwai2005-10-071-2/+4
| | | | | | | | | | | | | | ALI5451 driver Don't build the modem PCM if the corresponding codec isn't detected. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] emu10k1 - Fix handling of ac97_chip=2Takashi Iwai2005-10-071-9/+10
| | | | | | | | | | | | | | | | | | EMU10K1/EMU10K2 driver Fixed the handling of ac97_chip=2 capability type. The error occurs in snd_ac97_mixer(), not in snd_ac97_bus(). Also, release the unnecessary ac97_bus object in the error path. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] korg1212: fix typoClemens Ladisch2005-10-071-1/+1
| | | | | | | | | | | | | | KORG1212 driver Add a missing comma that made the stateName array one entry too short. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] emu10k1 - Fix loading of SBLive Game boardTakashi Iwai2005-10-073-4/+13
| | | | | | | | | | | | | | | | | | EMU10K1/EMU10K2 driver Fixed the error at loading SBLive Game board (and possible other models). The PCI SSIDs of this board conflicts with SB Live 5.1 Platinum, which has no AC97 chip. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] via82xx - dxs_support entry for an ASUS moboTakashi Iwai2005-10-071-0/+1
| | | | | | | | | | | | | | VIA82xx driver Addded a dxs_support entry for an ASUS mobo. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] Fix confliction of capture controls on ALC880 test modelTakashi Iwai2005-10-071-12/+0
| | | | | | | | | | | | | | HDA Codec driver Fixed the confliction of capture controls on ALC880 'test' model. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] fix HD audio ALC882 lfe (un)muteJohn W. Linville2005-10-071-1/+1
| | | | | | | | | | | | | | | | | | HDA Codec driver Mark the ALC882 'LFE Playback Switch' as an input, like the other playback switch settings. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] fix alc880_test_mixer typoJohn W. Linville2005-10-071-2/+2
| | | | | | | | | | | | | | | | HDA Codec driver Fix a typo (cut & paste) in the alc880_test_mixer structure. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] fix HD audio ALC260 mono (un)muteJohn W. Linville2005-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | HDA Codec driver The ALC260 'Mono Playback Switch' is marked as an output in patch_realtek.c. It actually does not work unless it is marked as an input. Go figure... This was tested and confirmed on an HP xw4300. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] usb-audio: increase max buffer sizeClemens Ladisch2005-10-071-4/+4
| | | | | | | | | | | | | | | | | | USB generic driver Increase the maximum PCM buffer size to 1 MB. The USB driver doesn't have any inherent buffer size limit, and big multichannel interfaces may benefit from this. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] usb-audio: add another ID for the TerraTec PHASE26Clemens Ladisch2005-10-071-1/+11
| | | | | | | | | | | | | | | | USB generic driver There is another revision of the PHASE26 with a different product ID; add a quirk entry for that, too. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] usb-audio: add more Yamaha USB MIDI devicesClemens Ladisch2005-10-071-0/+4
| | | | | | | | | | | | | | USB generic driver Add quirk entries for four unknown Yamaha USB MIDI devices. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] Add iBook 1.33GHz supportTakashi Iwai2005-10-071-0/+1
| | | | | | | | | | | | | | PPC PMAC driver Added the support of iBook 1.33GHz. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] usb-audio: add Roland RD-700SX supportClemens Ladisch2005-10-071-0/+13
| | | | | | | | | | | | | | | | USB generic driver Add a quirk entry for the Roland RD-700SX. This should work for the RD-300SX, too. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] via82xx - Add a dxs whitelist entryTakashi Iwai2005-10-071-0/+1
| | | | | | | | | | | | | | VIA82xx driver Added a dxs whitelist entry for an ECS mobo. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] clean suspend/resume calls for ac97_bus_typeNicolas Pitre2005-10-071-13/+3
| | | | | | | | | | | | | | | | | | | | | | AC97 Codec A single call to the driver suspend/resume method for each device is enough. The level and SUSPEND_*/RESUME_* arguments are deprecated and said to be removed eventually anyway (no other subsystem are using them anymore except platform devices). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] remove redundent assignment to the ac97 device structureNicolas Pitre2005-10-072-1/+2
| | | | | | | | | | | | | | | | | | | | | | AC97 Codec Don't use dev.platform_data to store a reference to the containing ac97_t structure. Such assignment is redundent since we can deduce the ac97_t structure location from the contained device structure. This sets platform_data free for other purposes. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] remove bogus match method for ac97_busNicolas Pitre2005-10-071-3/+4
| | | | | | | | | | | | | | | | | | | | AC97 Codec The bus_id is initialized with a generic identifier string which is not really useful for proper driver matching. Let the driver decide what it needs via its probe method instead. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] usb-audio: ignore Hercules DJ Console mixer errorsClemens Ladisch2005-10-071-0/+5
| | | | | | | | | | | | | | | | USB generic driver Add a quirk entry for the Hercules DJ Console to ignore timeouts on some mixer control transfers. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
| * [ALSA] Fix pm_message_t in PXA2XX-AC97 driverDirk Opfer2005-10-071-1/+1
| | | | | | | | | | | | | | ARM PXA2XX driver Fix pm_message_t in PXA2XX-AC97 driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] hda-intel - Disable DMA position auto-correctionTakashi Iwai2005-10-071-0/+5
| | | | | | | | | | | | | | | | HDA Intel driver Disable the auto-correction of DMA position temporarily. It doesn't work as expected yet... Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] hda-codec - 'empty' generic mfg-only codecSasha Khapyorsky2005-10-071-4/+2
| | | | | | | | | | | | | | | | HDA generic driver This creates 'empty' hda generic for unknown MFG-only codecs. Signed-off-by: Sasha Khapyorsky <sashak@smlink.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] no templated index for si3036 modem controlsSasha Khapyorsky2005-10-071-1/+5
| | | | | | | | | | | | | | | | AC97 Codec No index is templated for si3036 modem controls. Signed-off-by: Sasha Khapyorsky <sashak@smlink.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] no templated index for mc97 controlsSasha Khapyorsky2005-10-071-1/+1
| | | | | | | | | | | | | | | | AC97 Codec No index is templated for mdoem controls. Signed-off-by: Sasha Khapyorsky <sashak@smlink.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * [ALSA] snd_opl3sa2: add missing pnp_unregister_driver() callsDaniel Ritz2005-10-071-0/+2
| | | | | | | | | | | | | | OPL3SA2 driver Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2005-10-081-67/+172
|\ \
| * | [WATCHDOG] pcwd_pci.c add debug module_paramWim Van Sebroeck2005-09-291-0/+64
| | | | | | | | | | | | | | | | | | Add debugging code for the pcwd_pci driver. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] pcwd_pci.c control status + boot-code clean-upWim Van Sebroeck2005-09-291-67/+108
| | | | | | | | | | | | | | | | | | | | | | | | * Clean-up control status code (use control status defines + change pcipcwd_clear_status) * Clean-up boot-code (move card info to pcipcwd_show_card_info() ) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-10-087-61/+319
|\ \ \
| * | | [ATM]: [br2684] if we free the skb, we should return 0Jean-Denis Boyer2005-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | From: "Jean-Denis Boyer" <jdboyer@mediatrix.com> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [ATM]: add support for LECS addresses learned from networkEric Kinzie2005-10-064-23/+70
| | | | | | | | | | | | | | | | | | | | | | | | From: Eric Kinzie <ekinzie@cmf.nrl.navy.mil> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP] Fix SCTP socket options to work with 32-bit apps on 64-bit kernels.Sridhar Samudrala2005-10-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds alignment attribute to a few structures used with SCTP socket options so that the sizes and offsets remain the same when built using either 32 or 64 bit tools. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP] Fix sctp_get{pl}addrs() API to work with 32-bit apps on 64-bit kernels.Ivan Skytte Jørgensen2005-10-062-32/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old socket options are marked with a _OLD suffix so that the existing 32-bit apps on 32-bit kernels do not break. Signed-off-by: Ivan Skytte Jørgensen <isj-sctp@i1.dk> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-10-087-37/+90
|\ \ \ \
| * | | | [SPARC64]: Fix userland FPU state corruption.David S. Miller2005-10-073-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use stricter memory barriers around the block load and store instructions we use to save and restore the FPU register file. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC]: Fix p9100 framebuffer in 2.6Tom 'spot' Callaway2005-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attached patch fixes the p9100 framebuffer so that text is viewable (not black on black, like it was before the patch). The linux logo displays for a very short period of time, then is replaced by a grey box. This leads me to believe that this framebuffer would have problems in X, but since there hasn't been a weitek driver for X in several millennia, this isn't something that I can confirm or deny. But this patch does get color console working on my SPARCbook 3TX. Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC32]: Enable generic IOMAP.Tom 'spot' Callaway2005-10-062-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps some PCI stuff build. Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Probe for power device on ISA bus too.David S. Miller2005-10-061-13/+51
| |/ / / | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | [PATCH] Keys: Possessor permissions should be additiveDavid Howells2005-10-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the possessor permissions on a key additive with user/group/other permissions on the same key. This permits extra rights to be granted to the possessor of a key without taking away any rights conferred by them owning the key or having common group membership. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | [PATCH] Keys: Split key permissions checking into a .c fileDavid Howells2005-10-083-86/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attached patch splits key permissions checking out of key-ui.h and moves it into a .c file. It's quite large and called quite a lot, and it's about to get bigger with the addition of LSM support for keys... key_any_permission() is also discarded as it's no longer used. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | [PATCH] Keys: Add request-key process documentationDavid Howells2005-10-084-7/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attached patch adds documentation for the process by which request-key works, including how it permits helper processes to gain access to the requestor's keyrings. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | [PATCH] key: plug request_key_auth memleakDavid Howells2005-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plug request_key_auth memleak. This can be triggered by unprivileged users, so is local DoS. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | [PATCH] yenta: fix build if YENTA && !CARDBUSDavid Vrabel2005-10-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (struct pcmcia_socket).tune_bridge only exists if CONFIG_CARDBUS is set but building yenta_socket without CardBus is valid. Signed-off-by: David Vrabel <dvrabel@arcom.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | [PATCH] fix do_coredump() vs SIGSTOP raceOleg Nesterov2005-10-081-1/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's suppose we have 2 threads in thread group: A - does coredump B - has pending SIGSTOP thread A thread B do_coredump: get_signal_to_deliver: lock(->sighand) ->signal->flags = SIGNAL_GROUP_EXIT unlock(->sighand) lock(->sighand) signr = dequeue_signal() ->signal->flags |= SIGNAL_STOP_DEQUEUED return SIGSTOP; do_signal_stop: unlock(->sighand) coredump_wait: zap_threads: lock(tasklist_lock) send SIGKILL to B // signal_wake_up() does nothing unlock(tasklist_lock) lock(tasklist_lock) lock(->sighand) re-check sig->flags & SIGNAL_STOP_DEQUEUED, yes set_current_state(TASK_STOPPED); finish_stop: schedule(); // ->state == TASK_STOPPED wait_for_completion(&startup_done) // waits for complete() from B, // ->state == TASK_UNINTERRUPTIBLE We can't wake up 'B' in any way: SIGCONT will be ignored because handle_stop_signal() sees ->signal->flags & SIGNAL_GROUP_EXIT. sys_kill(SIGKILL)->__group_complete_signal() will choose uninterruptible 'A', so it can't help. sys_tkill(B, SIGKILL) will be ignored by specific_send_sig_info() because B already has pending SIGKILL. This scenario is not possbile if 'A' does do_group_exit(), because it sets sig->flags = SIGNAL_GROUP_EXIT and delivers SIGKILL to subthreads atomically, holding both tasklist_lock and sighand->lock. That means that do_signal_stop() will notice !SIGNAL_STOP_DEQUEUED after re-locking ->sighand. And it is not possible to any other thread to re-add SIGNAL_STOP_DEQUEUED later, because dequeue_signal() can only return SIGKILL. I think it is better to change do_coredump() to do sigaddset(SIGKILL) and signal_wake_up() under sighand->lock, but this patch is much simpler. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Avoid 'names_cache' memory leak with CONFIG_AUDITSYSCALLLinus Torvalds2005-10-061-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nameidata "last.name" is always allocated with "__getname()", and should always be free'd with "__putname()". Using "putname()" without the underscores will leak memory, because the allocation will have been hidden from the AUDITSYSCALL code. Arguably the real bug is that the AUDITSYSCALL code is really broken, but in the meantime this fixes the problem people see. Reported by Robert Derr, patch by Rick Lindsley. Acked-by: Al Viro <viro@ftp.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge branch 'release' of ↵Linus Torvalds2005-10-061-0/+5
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
OpenPOWER on IntegriCloud