summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ALSA] Fix and clean-up of vxpocket driverTakashi Iwai2005-07-285-122/+379
| | | | | | | | | | Documentation,PCMCIA Kconfig,Digigram VX Pocket driver - Fixed Oops with request_firmware() - Detect the card type in runtime (vxpoocket v2 or 440) - snd-vxp440 driver is merged to snd-vxpocket - Clean up the code Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Use kstrdupTakashi Iwai2005-07-281-1/+1
| | | | | | | HDA Codec driver Use the new kstrdup() function instead of in-house one. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Fix dependency of GUS driverTakashi Iwai2005-07-281-1/+1
| | | | | | | ALSA sequencer Add the missing snd-seq-midi-emul to SND_GUS_SYNTH list. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] cleanup and typo-correctionHenrik Kretzschmar2005-07-281-14/+17
| | | | | | | | | | | | | ALSA Core This patch changes, adds and remove some comments, which will make now more sense and fit on a 80-char line. It also changes the order of snd_power_wait() to make the file more readable. It removes the device.c comment in front of _snd_minor, cause snd_minor has nothing to do with device.c. The both typos in the kernel-docs were corrected too. Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Fix two typos and changes on snd_assert()Henrik Kretzschmar2005-07-281-6/+9
| | | | | | | | | | | ALSA Core Both typos were in the kerneldocs. I splitted the snd_assert() calls in one-expression-per-call for better debugging. Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] hda-codec - Add entry for Acer APFVTakashi Iwai2005-07-281-1/+2
| | | | | | | HDA Codec driver Added the model entry for Acer APFV. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] hda-codec - Add 6stack model for ALC880Takashi Iwai2005-07-282-1/+18
| | | | | | | | | Documentation,HDA Codec driver - Added a new '6stack' model for ALC880. - Fixed the typo in 6stack-digout model name. - Added description for missing models in ALSA-Configuration.txt. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Add new pci device id (SB400) to atiixp-modemHarald Welte2005-07-281-0/+1
| | | | | | | | ATIIXP-modem driver I didn't actually test whether the modem works, but at least the driver loads and initializes fine. Please consider inclusion. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] trident - Shut up compile warningsTakashi Iwai2005-07-281-0/+1
| | | | | | | Trident driver Shut up compile warnings about uninitialized variables. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] hda-codec - SigmaTel HDA resume supportMatt2005-07-281-0/+21
| | | | | | | | HDA Codec driver Adds resume support to the SigmaTel HDA patch. Please apply. Signed-off-by: Matt <matt@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] hda-codec - SigmaTel HDA multichannel supportMatt2005-07-281-237/+496
| | | | | | | | HDA Codec driver Adds 6/8 channel support to the SigmaTel HDA patch. Please apply. Signed-off-by: Matt <matt@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] usb-audio - fix capture of non-48k sample rates on Audigy 2 NXClemens Ladisch2005-07-281-2/+1
| | | | | | | | USB generic driver On the SB Audigy 2 NX, capturing with sample rates that are not a multiple of 48 kHz does not seem to work, so disable it. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* [ALSA] usb-audio - high speed audio supportClemens Ladisch2005-07-281-12/+25
| | | | | | | | USB generic driver Add support for endpoints with bInterval > 1, and decoding of the wMaxPacketSize field of high-speed endpoints. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* [ALSA] hda-codec - Fix oops with ALC880Takashi Iwai2005-07-281-4/+7
| | | | | | | | HDA Codec driver - Fixed oops with ALC880 auto-config mode - Fixed a wrong config table entry for ALC880 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ak4114: removed duplicate wake_up()Jaroslav Kysela2005-07-281-1/+0
| | | | | | | AK4114 receiver - wake_up(&runtime->sleep) is already called in snd_pcm_post_stop() Signed-off-by: Jaroslav Kysela <perex@suse.cz>
* [PATCH] new alpha syscallsRichard Henderson2005-07-272-1/+11
| | | | Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-07-275-18/+29
|\
| * [SPARC64]: Fix ugly dependency on NR_CPUS being a power-of-2.David S. Miller2005-07-271-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | The page->flags D-cache dirty state tracking depended upon NR_CPUS being a power-of-2 via it's "NR_CPUS - 1" masking. Fix that to use a fixed (256 - 1) mask as that is the limit imposed by thread_info->cpu which is a "u8". Finally, add a compile time check that NR_CPUS is not greater than 256. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SPARC]: Add inotify syscall entries.David S. Miller2005-07-274-12/+12
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | Fix up qla2xxx configuration bogosityLinus Torvalds2005-07-272-2/+0
| | | | | | | | | | | | | | | | | | If we haven't configured the qla24xx driver, then the Makefile shouldn't do it for us. This also means that we can avoid the unnecessary selection of FC_ATTRS. Debugged by James Bottomley
* | [PATCH] Avoid device suspend on rebootAndrew Morton2005-07-271-1/+0
| | | | | | | | | | | | | | My fairly ordinary x86 test box gets stuck during reboot on the wait_for_completion() in ide_do_drive_cmd(): Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge head 'for-linus' of ↵Linus Torvalds2005-07-274-31/+42
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
| * | JFS: Fix i_blocks accounting when allocation failsDave Kleikamp2005-07-261-4/+9
| | | | | | | | | | | | | | | | | | | | | A failure in dbAlloc caused a directory's i_blocks to be incorrectly incremented, causing jfs_fsck to find the inode to be corrupt. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | JFS: Don't set log_SYNCBARRIER when log->active == 0Dave Kleikamp2005-07-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a metadata page is kept active, it is possible that the sync barrier logic continues to trigger, even if all active transactions have been phyically written to the journal. This can cause a hang, since the completion of the journal I/O is what unsets the sync barrier flag to allow new transactions to be created. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | JFS: Fix typo in last patchDave Kleikamp2005-07-221-1/+1
| | | | | | | | | | | | Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | Merge with /home/shaggy/git/linus-clean/Dave Kleikamp2005-07-1965-1412/+2939
| |\ \ | | | | | | | | | | | | Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | | JFS: fsync wrong behavior when I/O failure occursQu Fuping2005-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is half of a patch that Qu Fuping submitted in April. The first part was applied to fs/mpage.c in 2.6.12-rc4. jfs_fsync should return error, but it doesn't wait for the metadata page to be uptodate, e.g.: jfs_fsync->jfs_commit_inode->txCommit->diWrite->read_metapage-> __get_metapage->read_cache_page reads a page from disk. Because read is async, when read_cache_page: err = filler(data, page), filler will not return error, it just submits I/O request and returns. So, page is not uptodate. Checking only if(IS_ERROR(mp->page)) is not enough, we should add "|| !PageUptodate(mp->page)" Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | | JFS: Remove assert statement in dbJoin & return -EIO insteadDave Kleikamp2005-07-151-16/+30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | | JFS: Remove bogus WARN_ON statement and some dead codeDave Kleikamp2005-07-141-9/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-07-277-89/+64
|\ \ \ \
| * | | | [NET]: Move in_aton from net/ipv4/utils.c to net/core/utils.cMatt Mackall2005-07-274-62/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move in_aton to allow netpoll and pktgen to work without the rest of the IPv4 stack. Fix whitespace and add comment for the odd placement. Delete now-empty net/ipv4/utils.c Re-enable netpoll/netconsole without CONFIG_INET Signed-off-by: Matt Mackall <mpm@selenic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [NETFILTER]: Fix -Wunder error in ip_conntrack_core.cNick Sillik2005-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nick Sillik <n.sillik@temple.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [NET]: Fix setsockopt locking bugKyle Moffett2005-07-271-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Sparc, SO_DONTLINGER support resulted in sock_reset_flag being called without lock_sock(). Signed-off-by: Kyle Moffett <mrmacman_g4@mac.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [NET]: Improve presentation of networking driver families.Randy Dunlap2005-07-271-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggestion from Sam Ravnborg <sam@ravnborg.org> It causes all driver families to be displayed aligned immediately under the main network drivers heading (in menuconfig/xconfig/gconfig) instead of not being subordinate to (i.e., not indented) the Network device support heading at all. The improved network driver families are: token ring, wireless, PCMCIA, WAN, ATM, and S390. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [IPV4]: Fix Kconfig syntax errorHans-Juergen Tappe (SYSGO AG)2005-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: "Hans-Juergen Tappe (SYSGO AG)" <hjt@sysgo.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6Linus Torvalds2005-07-273-9/+12
|\ \ \ \ \
| * | | | | [IA64] unwind.c uses wrong unat from switch_stackKeith Owens2005-07-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unwind.c can read the wrong unat bits from switch_stack. sw->caller_unat is the value of ar.unat when the task was blocked. sw->ar_unat is the value of ar.unat after doing st8.spill for r4-7. IOW, ar_unat is caller_unat with 4 bits changed. unw_access_gr() uses sw->ar_unat for r4-7 (correct), but it also uses sw->ar_unat for other scratch registers (incorrect). sw->ar_unat should only be used for r4-7, everything else should use sw->caller_unat, unless modified by unwind info. Using sw->ar_unat risks picking up the 4 bits that were overwritten when r4-7 were saved. Also this line is wrong unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_UNAT); and should be unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_PFS); Signed-off-by: Keith Owens <kaos@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | | | | [IA64] inotify: ia64 syscalls.Robert Love2005-07-272-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attached patch adds the inotify syscalls to ia64. Signed-off-by: Robert Love <rml@novell.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | | | | Auto merge with /home/aegl/GIT/linusTony Luck2005-07-27204-31249/+36367
| |\ \ \ \ \ | | |/ / / /
| * | | | | Auto merge with /home/aegl/GIT/linusTony Luck2005-07-25102-1220/+960
| |\ \ \ \ \
| * \ \ \ \ \ Auto merge with ↵Tony Luck2005-07-1747-1265/+2743
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
| * | | | | | Auto merge with /home/aegl/GIT/linusTony Luck2005-07-1535-380/+450
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge master.kernel.org:/home/rmk/linux-2.6-arm-smpLinus Torvalds2005-07-271-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | [ARM SMP] Fix data corruption in test_* bitopsRussell King2005-07-271-3/+3
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we found that the bit was already in the desired state, we would skip performing the operation, and write random data back. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | | | | | [PATCH] ppc32: 8xx remove BROKEN Kconfig entryMarcelo Tosatti2005-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8xx is not BROKEN anymore. Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | | [PATCH] ppc32: 8xx avoid icbi misbehaviour in __flush_dcache_icache_physAnton Wöllert2005-07-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 8xx, in the case where a pagefault happens for a process who's not the owner of the vma in question (ptrace for instance), the flush operation is performed via the physical address. Unfortunately, that results in a strange, unexplainable "icbi" instruction fault, most likely due to a CPU bug (see oops below). Avoid that by flushing the page via its kernel virtual address. Oops: kernel access of bad area, sig: 11 [#2] NIP: C000543C LR: C000B060 SP: C0F35DF0 REGS: c0f35d40 TRAP: 0300 Not tainted MSR: 00009022 EE: 1 PR: 0 FP: 0 ME: 1 IR/DR: 10 DAR: 00000010, DSISR: C2000000 TASK = c0ea8430[761] 'gdbserver' THREAD: c0f34000 Last syscall: 26 GPR00: 00009022 C0F35DF0 C0EA8430 00F59000 00000100 FFFFFFFF 00F58000 00000001 GPR08: C021DAEF C0270000 00009032 C0270000 22044024 10025428 01000800 00000001 GPR16: 007FFF3F 00000001 00000000 7FBC6AC0 00F61022 00000001 C0839300 C01E0000 GPR24: 00CD0889 C082F568 3000AC18 C02A7A00 C0EA15C8 00F588A9 C02ACB00 C02ACB00 NIP [c000543c] __flush_dcache_icache_phys+0x38/0x54 LR [c000b060] flush_dcache_icache_page+0x20/0x30 Call trace: [c000b154] update_mmu_cache+0x7c/0xa4 [c005ae98] do_wp_page+0x460/0x5ec [c005c8a0] handle_mm_fault+0x7cc/0x91c [c005ccec] get_user_pages+0x2fc/0x65c [c0027104] access_process_vm+0x9c/0x1d4 [c00076e0] sys_ptrace+0x240/0x4a4 [c0002bd0] ret_from_syscall+0x0/0x44 Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | | [PATCH] Update CREDITS entry and listings in source files for Jesper JuhlJesper Juhl2005-07-273-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) update entry in CREDITS for Jesper Juhl b) remove email address from source files so it's only listed in credits. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | | [PATCH] clean up inline static vs static inlineJesper Juhl2005-07-2746-168/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `gcc -W' likes to complain if the static keyword is not at the beginning of the declaration. This patch fixes all remaining occurrences of "inline static" up with "static inline" in the entire kernel tree (140 occurrences in 47 files). While making this change I came across a few lines with trailing whitespace that I also fixed up, I have also added or removed a blank line or two here and there, but there are no functional changes in the patch. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | | [PATCH] fbdev: update info->cmap when setting cmap from user-/kernelspace.Michal Januszewski2005-07-271-60/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fb_info struct, as defined in include/linux/fb.h, contains an element that is supposed to hold the current color map: struct fb_cmap cmap; /* Current cmap */ This cmap is currently never updated when either fb_set_cmap() or fb_set_user_cmap() are called. As a result, info->cmap contains the default cmap that was set by a device driver/fbcon and a userspace application using the FBIOGETCMAP ioctl will not always get the *currently* used color map. The patch fixes this by making sure the cmap is copied to info->cmap after it is set correctly. It moves most of the code that is responsible for setting the cmap to fb_set_cmap() and out of fb_set_user_cmap() to avoid code-duplication. Signed-off-by: Michal Januszewski <spock@gentoo.org> Cc: <linux-fbdev-devel@lists.sourceforge.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | | [PATCH] fbcon: don't repaint the cursor when it is disabled.Michal Januszewski2005-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently even when the cursor is disabled (`setterm -cursor off`), it is still repainted as a black rectangle the size of a single char. This can be seen, for example, by chvt'ing to a free tty, disabling the cursor and doing `dd if=3D/dev/urandom of=3D/dev/fb0`. The patch changes this behaviour by avoiding painting anything when the cursor is disabled. Signed-off-by: Michal Januszewski <spock@gentoo.org> Cc: <linux-fbdev-devel@lists.sourceforge.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
OpenPOWER on IntegriCloud