1. 17 Nov, 2011 8 commits
  2. 12 Nov, 2011 16 commits
    • Rafael J. Wysocki's avatar
      ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression) · 3439a8da
      Rafael J. Wysocki authored
      After commit e978aa7d
       ("cpuidle: Move dev->last_residency update to
      driver enter routine; remove dev->last_state") setting acpi_idle_suspend
      to 1 by acpi_processor_suspend() causes the ACPI cpuidle routines to
      return error codes continuously, which in turn causes cpuidle to lock up
      However, acpi_idle_suspend doesn't appear to be useful for any
      particular purpose (it's racy and doesn't really provide any real
      protection), so it can be removed, which makes the problem go away.
      Reported-and-tested-by: default avatarTomas M. <tmezzadra@gmail.com>
      Reported-and-tested-by: default avatarFerenc Wagner <wferi@niif.hu>
      Tested-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 5b34b089
      Linus Torvalds authored
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm/imx: fix imx6q mmc error when mounting rootfs
        arm/imx: fix AUTO_ZRELADDR selection
        arm/imx: fix the references to ARCH_MX3
        ARM: mx51/53: set pwm clock parent to ipg_perclk
        arm/tegra: enable headphone detection gpio on seaboard
        arm/dt: Fix ventana SDHCI power-gpios
        arm/tegra: Don't create duplicate gpio and pinmux devices
        ARM: at91: Fix USBA gadget registration
        atmel/spi: fix missing probe
        at91/yl-9200: Fix section mismatch
        at91: vmalloc fix missing AT91_VIRT_BASE define
        ARM: at91: usart: drop static map regs for dbgu
        ARM: picoxcell: add extra temp register to addruart
        ARM: msm: fix compilation flags for MSM_SCM
        arm/mxs: fix mmc device adding for mach-mx28evk
        ARM: mxc: Remove test_for_ltirq
        ARM:i.MX: fix build error in clock-mx51-mx53.c
        ARM:i.MX: fix build error in tzic/avic.c
        ARM: mxc: fix local timer interrupt handling
        msm: boards: Fix fallout from removal of machine_desc in fixup
    • Axel Lin's avatar
      [CPUFREQ] db8500: fix build error due to undeclared i variable · eb0b38a5
      Axel Lin authored
      The variable i is removed by commit ded84337
      "[CPUFREQ] db8500: remove unneeded for loop iteration over freq_table",
      but current code to print available frequencies still uses the i variable.
      Thus add the i variable back to fix below buld error:
        CC      drivers/cpufreq/db8500-cpufreq.o
      drivers/cpufreq/db8500-cpufreq.c: In function 'db8500_cpufreq_init':
      drivers/cpufreq/db8500-cpufreq.c:123: error: 'i' undeclared (first use in this function)
      drivers/cpufreq/db8500-cpufreq.c:123: error: (Each undeclared identifier is reported only once
      drivers/cpufreq/db8500-cpufreq.c:123: error: for each function it appears in.)
      make[2]: *** [drivers/cpufreq/db8500-cpufreq.o] Error 1
      make[1]: *** [drivers/cpufreq] Error 2
      make: *** [drivers] Error 2
      This patch also fixes using uninitialized i variable as array index.
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarDave Jones <davej@redhat.com>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 8f042aa7
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (29 commits)
        m68k/mac: Remove mac_irq_{en,dis}able() wrappers
        m68k/irq: Remove obsolete support for user vector interrupt fixups
        m68k/irq: Remove obsolete m68k irq framework
        m68k/q40: Convert Q40/Q60 to genirq
        m68k/sun3: Convert Sun3/3x to genirq
        m68k/sun3: Use the kstat_irqs_cpu() wrapper
        m68k/apollo: Convert Apollo to genirq
        m68k/vme: Convert VME to genirq
        m68k/hp300: Convert HP9000/300 and HP9000/400 to genirq
        m68k/mac: Optimize interrupts using chain handlers
        m68k/mac: Convert Mac to genirq
        m68k/amiga: Optimize interrupts using chain handlers
        m68k/amiga: Convert Amiga to genirq
        m68k/amiga: Refactor amiints.c
        m68k/atari: Remove code and comments about different irq types
        m68k/atari: Convert Atari to genirq
        m68k/irq: Add genirq support
        m68k/irq: Remove obsolete IRQ_FLG_* users
        m68k/irq: Rename {,__}m68k_handle_int()
        m68k/irq: Add m68k_setup_irq_controller()
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · e6f1227e
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] v4l2-ctrl: Send change events to all fh for auto cluster slave controls
        [media] v4l2-event: Don't set sev->fh to NULL on unsubscribe
        [media] v4l2-event: Remove pending events from fh event queue when unsubscribing
        [media] v4l2-event: Deny subscribing with a type of V4L2_EVENT_ALL
        [media] MAINTAINERS: add a maintainer for s5p-mfc driver
        [media] v4l: s5p-mfc: fix reported capabilities
        [media] media: vb2: reset queued list on REQBUFS(0) call
        [media] media: vb2: set buffer length correctly for all buffer types
        [media] media: vb2: add a check for uninitialized buffer
        [media] mxl111sf: fix build warning
        [media] mxl111sf: remove pointless if condition in mxl111sf_config_spi
        [media] mxl111sf: check for errors after mxl111sf_write_reg in mxl111sf_idac_config
        [media] mxl111sf: fix return value of mxl111sf_idac_config
        [media] uvcvideo: GET_RES should only be checked for BITMAP type menu controls
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 3455229f
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/kvm: Fix build failure with HV KVM and CBE
        powerpc/ps3: Fix lv1_gpu_attribute hcall
        powerpc/ps3: Fix PS3 repository build warnings
        powerpc/ps3: irq: Remove IRQF_DISABLED
        powerpc/irq: Remove IRQF_DISABLED
        powerpc/numa: NUMA topology support for PowerNV
        powerpc: Add System RAM to /proc/iomem
        powerpc: Add KVM as module to defconfigs
        powerpc/kvm: Fix build with older toolchains
        powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.
        powerpc/5200: add support for charon board
    • Linus Torvalds's avatar
    • William Douglas's avatar
      bma023: Add SFI translation for this device · 9f80d8b6
      William Douglas authored
      This needed the sfi IRQ 0xFF fix to go in first. It simply plumbs in the
      bma023 driver with the firmware naming of it.
      Signed-off-by: default avatarWilliam Douglas <william.douglas@intel.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Feng Tang's avatar
      vrtc: change its year offset from 1960 to 1972 · 57e6319d
      Feng Tang authored
      Real world year equals the value in vrtc YEAR register plus an offset.
      We used 1960 as the offset to make leap year consistent, but for a
      device's first use, its YEAR register is 0 and the system year will
      be parsed as 1960 which is not a valid UNIX time and will cause many
      applications to fail mysteriously. So we use 1972 instead to fix this
      Updated patch which adds a sanity check suggested by Mathias
      This isn't a change in behaviour for systems, because 1972 is the one we
      actually use. It's the old version in upstream which is out of sync with
      all devices.
      Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Zhang Rui's avatar
      ce4100: fix a build error · f2ee4421
      Zhang Rui authored
      Fix a build error. CE4100 with no serial errors because the alternate
      function is only a prototype not a null function as intended.
      Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev · 87618e00
      Linus Torvalds authored
      * 'upstream-linus' of git://github.com/jgarzik/libata-dev:
        pata_of_platform: Don't use NO_IRQ
        [libata] ahci: Add ASMedia ASM1061 support
        [libata] Issue SRST to Sil3726 PMP
        sata_sis.c: trivial spelling fix
        ahci_platform: use dev_get_platdata()
        [libata] libata-scsi.c: Add function parameter documentation
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · c1f42467
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: rename the option to nospace_cache
        Btrfs: handle bio_add_page failure gracefully in scrub
        Btrfs: fix deadlock caused by the race between relocation
        Btrfs: only map pages if we know we need them when reading the space cache
        Btrfs: fix orphan backref nodes
        Btrfs: Abstract similar code for btrfs_block_rsv_add{, _noflush}
        Btrfs: fix unreleased path in btrfs_orphan_cleanup()
        Btrfs: fix no reserved space for writing out inode cache
        Btrfs: fix nocow when deleting the item
        Btrfs: tweak the delayed inode reservations again
        Btrfs: rework error handling in btrfs_mount()
        Btrfs: close devices on all error paths in open_ctree()
        Btrfs: avoid null dereference and leaks when bailing from open_ctree()
        Btrfs: fix subvol_name leak on error in btrfs_mount()
        Btrfs: fix memory leak in btrfs_parse_early_options()
        Btrfs: fix our reservations for updating an inode when completing io
        Btrfs: fix oops on NULL trans handle in btrfs_truncate
        btrfs: fix double-free 'tree_root' in 'btrfs_mount()'
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · fe10e6f4
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: Use kmemdup rather than duplicating its implementation
        ALSA: hda - Re-enable the check NO_PRESENCE misc bit
        ALSA: vmaster - Free slave-links when freeing the master element
        ALSA: hda - Don't add elements of other codecs to vmaster slave
        ALSA: intel8x0: improve virtual environment detection
        ALSA: intel8x0: move virtual environment detection code into one place
        ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384
        ALSA: hda - fix internal mic on Dell Vostro 3500 laptop
        ALSA: HDA: Remove quirk for Toshiba T110
        ALSA: usb-audio - Fix the missing volume quirks at delayed init
        ALSA: hda - Mute unused capture sources for Realtek codecs
        ALSA: intel8x0: Improve comments for VM optimization
        ASoC: Ensure we get an impedence reported for WM8958 jack detect
        ASoC: Don't use wm8994->control_data when requesting IRQs
        ASoC: Don't use wm8994->control_data in wm8994_readable_register()
        ASoC: Update git repository URL
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · f28ad3b4
      Linus Torvalds authored
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (42 commits)
        drm/radeon/kms/pm: switch to dynamically allocating clock mode array
        drm/radeon/kms: optimize r600_pm_profile_init
        drm/radeon/kms/pm: add a proper pm profile init function for fusion
        drm/radeon/kms: remove extraneous calls to radeon_pm_compute_clocks()
        drm/exynos: added padding to be 64-bit align.
        drm: fix kconfig unmet dependency warning
        drm: add some comments to drm_wait_vblank and drm_queue_vblank_event
        drm/radeon/benchmark: signedness bug in radeon_benchmark_move()
        drm: do not sleep on vblank while holding a mutex
        MAINTAINERS: exynos: Add EXYNOS DRM maintainer entry
        drm: try to restore previous CRTC config if mode set fails
        drm/radeon/kms: make an aux failure debug only
        drm: drop select of SLOW_WORK
        drm: serialize access to list of debugfs files
        drm/radeon/kms: fix use of vram scratch page on evergreen/ni
        drm/radeon: Make sure CS mutex is held across GPU reset.
        drm: Ensure string is null terminated.
        vmwgfx: Only allow 64x64 cursors
        vmwgfx: Initialize clip rect loop correctly in surface dirty
        vmwgfx: Close screen object system
    • Linus Torvalds's avatar
      Merge git://github.com/herbertx/crypto · 42a0ddcd
      Linus Torvalds authored
      * git://github.com/herbertx/crypto:
        crypto: algapi - Fix build problem with NET disabled
        crypto: user - Fix rwsem leak in crypto_user
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 53e3ccfd
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: fix force shutdown handling in xfs_end_io
        xfs: constify xfs_item_ops
        xfs: Fix possible memory corruption in xfs_readlink
  3. 11 Nov, 2011 16 commits