aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* pata_cs5520: Fix probe bug regression introduced in 2.6.22Alan Cox2007-07-20
| | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linux Torvalds <torvalds@linux-foundation.org>
* splice: fix bad unlock_page() in error caseJens Axboe2007-07-20
| | | | | | | | | | | | | If add_to_page_cache_lru() fails, the page will not be locked. But splice jumps to an error path that does a page release and unlock, causing a BUG() in unlock_page(). Fix this by adding one more label that just releases the page. This bug was actually triggered on EL5 by gurudas pai <gurudas.pai@oracle.com> using fio. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* lguest: override sched_clockRusty Russell2007-07-20
| | | | | | | | | | | Guests currently use the default scheduler clock: this means they always use jiffies even if TSC is actually available. It doesn't make any noticeable difference here, but it's a better thing to do. Also remove commented-out asm/sched-clock.h from -mm tree. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* lguest: trivial: We now have asm/processor-flags.h, so use it.Rusty Russell2007-07-20
| | | | | Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* lguest: fix sense if IF flag on interrupt injectionRusty Russell2007-07-20
| | | | | | | | | | | | The sense of the IF bit is backwards in the host interrupt handling. This means we always save "IF=1" on the stack when injecting an interrupt. It turns out this is almost always correct (unless the guest is taking a page fault in an interrupt due to an unpopulated vmalloc mapping), so went unnoticed. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* AFS: Use patched rxrpc_kernel_send_data() correctlyDavid Howells2007-07-20
| | | | | | | | | | | | | Fix afs_send_simple_reply() to accept a greater-than-zero return value from rxrpc_kernel_send_data() as being a successful return rather than thinking it an error and aborting the call. rxrpc_kernel_send_data() previously returned zero incorrectly when it worked successfully, but has been patched to return the number of bytes it transmitted. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2007-07-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits) sh: intc - add support for SH7750 and its variants sh: Move entry point code to .text.head. sh: heartbeat: Shut up resource size warning. sh: update r2d defconfig and fix SH7751R pci compliation sh: Many symbol exports for nommu allmodconfig. sh: zero terminate 8250 platform data for r2d board sh: cpufreq: Fix up the build for SH-2. sh: Make on-chip DMA channel selection explicit. sh: Fix up CPU dependencies for on-chip DMAC. sh: cpufreq: clock framework support. sh: Support rate rounding for SH7722 FRQCR clocks. sh: Implement clk_round_rate() in the clock framework. sh: Fix up PCI section mismatch warnings. sh: Wire up fallocate() syscall. sh: intc - add support for 7780 sh: intc - improve group support sh: Fix up SH-3 and SH-4 driver dependencies. sh: push-switch: Correct license string. sh: cpufreq: Fix driver dependencies and flag as broken. sh: IPR/INTC2 IRQ setup consolidation. ...
| * sh: intc - add support for SH7750 and its variantsMagnus Damm2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the cpu specific 7750 setup code to use the new intc controller. Many new vectors are added and multiple processor variants including 7091, 7750, 7750s, 7750r, 7751 and 7751r should all have the correct vectors hooked up. IRLM interrupts can be enabled using ipr_irq_enable_irlm() which now is marked as __init. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Move entry point code to .text.head.Paul Mundt2007-07-20
| | | | | | | | | | | | | | | | | | | | | | Follow Al Viro's m68k change from l-k: i.e. tell modpost that entry point code (that has to be outside of .init.text for external reasons) is OK to refer to .init.* Shuts up some section mismatch warnings from modpost. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: heartbeat: Shut up resource size warning.Paul Mundt2007-07-20
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: update r2d defconfig and fix SH7751R pci compliationMagnus Damm2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the r2d board support in a few ways: - CPU_SUBTYPE_SH7751R is selected in the defconfig to play well with the r2d board Kconfig entry. Without this the defconfig results in no board enabled. - Enable EARLY_PRINTK. - Enable SH_STANDARD_BIOS - this works well for early printk on the r2d board. - Add "earlyprink=bios" to the cmdline for early serial port output by default. - CONFIG_SUBTYPE_SH7751R support is added to the sh-specific pci makefile. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Many symbol exports for nommu allmodconfig.Paul Mundt2007-07-20
| | | | | | | | | | | | | | | | allmodconfig generates a lot of interesting code, a lot of the generated symbols we've never exported before, so this fixes those up. Verified with both GCC3 and GCC4 toolchains. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: zero terminate 8250 platform data for r2d boardMagnus Damm2007-07-20
| | | | | | | | | | | | | | struct plat_serial8250_port should contain a terminating zero entry Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: cpufreq: Fix up the build for SH-2.Paul Mundt2007-07-20
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Make on-chip DMA channel selection explicit.Paul Mundt2007-07-20
| | | | | | | | | | | | | | | | | | | | | | Currently this has a prompt to allow users to change it. There's no reason to do this, and it has caused breakage and confusion in the past, so remove it entirely. We'll get rid of this when the whole driver is tidied for the driver model. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Fix up CPU dependencies for on-chip DMAC.Paul Mundt2007-07-20
| | | | | | | | | | | | | | We only handle SH-3 and SH-4 at present, don't expose it to the other CPUs. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * Merge branch 'clkfwk'Paul Mundt2007-07-20
| |\
| | * sh: cpufreq: clock framework support.Paul Mundt2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets the SH cpufreq working again. We follow the changes in the AVR32 implementation for wrapping in to the clock framework. CPUs that wish to use this are required to define rate rounding primitives in order to satisfy clk_round_rate(). This works well enough for the common case, though we should look at unifying this driver across all of the platforms that implement clock framework support in one capacity or another. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: Support rate rounding for SH7722 FRQCR clocks.Paul Mundt2007-07-20
| | | | | | | | | | | | | | | | | | | | | Now that the round_rate() op is supported, hook it up on SH7722 for the FRQCR (CPU, PCLK, etc.) clocks. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: Implement clk_round_rate() in the clock framework.Paul Mundt2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | This is an optional component of the clock framework. However, as we're going to be using this in the cpufreq drivers, add support for it to the framework. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix up PCI section mismatch warnings.Paul Mundt2007-07-20
| | | | | | | | | | | | | | | | | | | | | Flag pcibios_setup() and pcibios_fixup_bus() as __devinit. Follows the sh64 change. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Wire up fallocate() syscall.Paul Mundt2007-07-19
| |/ | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: intc - add support for 7780Magnus Damm2007-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the cpu specific 7780 setup code to use the new intc controller. Many new vectors are added and also support for external interrupt sense configuration. So with this patch it is now possible to configure external interrupt pins as edge or level triggered using set_irq_type(). No external interrupts are registered by default. Use plat_irq_setup_pins() to select between IRQ or IRL mode. This patch also fixes the Alarm IRQ for the RTC. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: intc - improve group supportMagnus Damm2007-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch improves intc group support, ie it makes it possible to group interrupts together and mask / unmask the entire group. This also works with priorities, so setting a priority for an entire group is also possible. This patch is needed to properly support certain processors such as the 7780. Fixes for NULL pointers in DECLARE_INTC_DESC() are also included. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Fix up SH-3 and SH-4 driver dependencies.Paul Mundt2007-07-19
| | | | | | | | | | | | | | | | Both shwdt and rtc-sh are only supported on SH-3 and SH-4 at the moment, don't allow them to break the SH-2 and SH-5 (sh64) builds. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: push-switch: Correct license string.Paul Mundt2007-07-19
| | | | | | | | | | | | | | | | This was accidentally set as "GPLv2", whereas the kernel expects v2 to be written "GPL v2", this caused complaints regarding the use of the platform device APIs when built as a module. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: cpufreq: Fix driver dependencies and flag as broken.Paul Mundt2007-07-19
| | | | | | | | | | | | | | | | This is only supported on SH-4, so don't expose it for the other CPUs. Additionally, it's suffered some bitrot, so add a BROKEN dependency as well until we fix it up. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: IPR/INTC2 IRQ setup consolidation.Magnus Damm2007-07-19
| | | | | | | | | | | | | | | | | | | | This patch unifies the cpu specific interrupt setup functions for interrupt controller blocks such as ipr, intc2 and intc. There is no point in having separate functions for each interrupt controller, so let's clean this up. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: clean up interrupt code for solution engine 7722 boardMagnus Damm2007-07-19
| | | | | | | | | | | | | | | | | | | | | | This patch cleans up solution engine 7722 specific interrupt code. The main purpose is to replace the mux function with use of set_irq_chained_handler() and replace hard coded register poking code with set_irq_type(). The board specific interrupts are also moved to start from SE7722_FPGA_IRQ_BASE. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: intc - add support for 7722 processorMagnus Damm2007-07-19
| | | | | | | | | | | | | | | | | | | | | | This patch converts the cpu specific 7722 setup code to use the new intc controller. Many new vectors are added and also support for external interrupt sense configuration. So with this patch it is now possible to configure external interrupt pins as edge or level triggered using set_irq_type(). Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: intc - shared IPR and INTC2 controllerMagnus Damm2007-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the second version of the shared interrupt controller patch for the sh architecture, fixing up handling of intc_reg_fns[]. The three main advantages with this controller over the existing ones are: - Both priority (ipr) and bitmap (intc2) registers are supported - External pin sense configuration is supported, ie edge vs level triggered - CPU/Board specific code maps 1:1 with datasheet for easy verification This controller can easily coexist with the current IPR and INTC2 controllers, but the idea is that CPUs/Boards should be moved over to this controller over time so we have a single code base to maintain. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Fix irq assignment for uarts on sh7722Magnus Damm2007-07-19
| | | | | | | | | | | | | | | | | | This patch contains two serial port related fixes for sh7722: - Make sure the irqs for the first serial port is correct - Add the second and third serial port to the platform data Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: hd64461 tidying.Kristoffer Ericson2007-07-19
| | | | | | | | | | | | | | | | | | | | Kill off the hd64461 io.c, as all of the hd64461 users are now using the generic I/O routines. [ hd64461/ moved to hd64461.c by Paul ] Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: r7780rp: Add R8A66597 and M66592 support.Yoshihiro Shimoda2007-07-19
| | | | | | | | | | | | | | | | This wires up the platform devices for the USB expansion boards for the Highlander boards. Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds2007-07-20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (102 commits) [ALSA] version 1.0.14 [ALSA] remove duplicate Logitech Quickcam USB ID in usbquirks.h [ALSA] hda-codec - Fix input with STAC92xx [ALSA] hda-intel: support for iMac 24'' released on 09/2006 [ALSA] hda-codec - Add quirk for Asus P5LD2 [ALSA] snd-ca0106: Add support for X-Fi Extreme Audio. [ALSA] snd-emu10k1:Enable E-Mu 1616m notebook firmware loading. [ALSA] snd-emu10k1: Initial support for E-Mu 1616 and 1616m. [ALSA] cs46xx - Fix PM resume [ALSA] hda: Enable SPDIF in/out on some stac9205 boards [ALSA] timer: check for incorrect device state in non-debug compiles, too [ALSA] snd-aoa-codec-onyx: fix typo [ALSA] hda-codec - Add quirks for HP dx2200/dx2250 [ALSA] hda-codec - Rename HP model-specific quirks [ALSA] hda-codec - Add quirk for HP Samba [ALSA] hda-codec - Add LG LW20 line-in capture source [ALSA] usb-audio - Fix AC3 with M-Audio Audiophile USB [ALSA] hda: stac9202 mixer fix [ALSA] Make s3c24xx_i2s_set_clkdiv() change the correct bits [ALSA] hda-codec - Add LG LW20 si3054 modem id ...
| * | [ALSA] version 1.0.14Jaroslav Kysela2007-07-20
| | | | | | | | | | | | Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] remove duplicate Logitech Quickcam USB ID in usbquirks.hJaroslav Kysela perex@suse.cz2007-07-20
| | | | | | | | | | | | Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] hda-codec - Fix input with STAC92xxTakashi Iwai2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | The recent fix for STAC92xx surround outputs broke the input pin setting for shared line-in and mic jacks. This patch fixes the breakage. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] hda-intel: support for iMac 24'' released on 09/2006Nicola Fagnani2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic audio support for the iMac 24'' model released on 09/2006, including headphone jack detection with automatic speaker muting. This iMac uses the Realtek ALC885 codec, not a Sigmatel one as in other models. Functionality has been tested for internal speakers, headphone and microphone. Signed-off-by: Nicola Fagnani <nicfagn@iol.it> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] hda-codec - Add quirk for Asus P5LD2Claudio Matsuoka2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the proper model setting, the Asus P5LD2 rear outputs remain completely silent unlike other systems where the front speakers usually work. This patch adds the P5LD2 to the quirk table. Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] snd-ca0106: Add support for X-Fi Extreme Audio.James Courtier-Dutton2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | This card is just a normal SB Live 24bit, but under a different marketing name. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] snd-emu10k1:Enable E-Mu 1616m notebook firmware loading.James Courtier-Dutton2007-07-20
| | | | | | | | | | | | | | | Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] snd-emu10k1: Initial support for E-Mu 1616 and 1616m.James Courtier-Dutton2007-07-20
| | | | | | | | | | | | | | | Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] cs46xx - Fix PM resumeTakashi Iwai2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | Fixed PM resume of cs46xx devices. It now restores properly the DSP image and kick-off the DSP. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] hda: Enable SPDIF in/out on some stac9205 boardsMatthew Ranostay2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for some boards with SPDIF in/out, and cleaned up the GPIO enable function. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] timer: check for incorrect device state in non-debug compiles, tooClemens Ladisch2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the snd_assert()s to simple if()s to prevent crashes when one of the timer instance ioctls is called before the file is bound to a timer device. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] snd-aoa-codec-onyx: fix typoYoann Padioleau2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Parse error in ifdef or bad use of macro. Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] hda-codec - Add quirks for HP dx2200/dx2250Claudio Matsuoka2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HP dx2200 and dx2250 use Micro-Star International (MSI) motherboards (models MS-7254 and MS-7297 respectively) with an ALC862 codec in threestack configuration. Adding this quirk allows correct 5.1 sound output in these systems. Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] hda-codec - Rename HP model-specific quirksClaudio Matsuoka2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename ALC888_HP_NETTLE and ALC888_HP_LUCKNOW models to the more generic names ALC888_6ST_HP and ALC888_3ST_HP since HP seems to be consistent in the wiring of their 3stack and 6stack ALC888-based systems. Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | [ALSA] hda-codec - Add quirk for HP SambaClaudio Matsuoka2007-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes 5.1 surround output for the HP Samba using the same quirk as the HP Lucknow. If HP machines are uniform in their wiring, we should rename ALC888_HP_NETTLE to ALC888_6ST_HP and ALC888_HP_LUCKNOW to ALC888_3ST_HP for generic HP 6stack and 3stack configurations. Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-30 09:30:26 -0400