1. 18 Mar, 2011 35 commits
    • Alan Cox's avatar
      MAINTAINERS: Add serial · ca749e2a
      Alan Cox authored
      Add an entry for serial maintainers.
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ca749e2a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · d3e458d7
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)
        ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
        ALSA: aloop - Fix possible IRQ lock inversion
        ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
        ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
        ALSA: firewire - msleep needs delay.h
        ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
        ALSA: firewire-lib: allocate DMA buffer separately
        ALSA: firewire-lib: use no-info SYT for packets without SYT sample
        ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
        ALSA: hda - Remove an unused variable in patch_realtek.c
        ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
        ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
        ALSA: hda - Move default input-src selection to init part
        ALSA: hda - Initialize special cases for input src in init phase
        ALSA: ctxfi - Clear input settings before initialization
        ALSA: ctxfi - Fix SPDIF status retrieval
        ALSA: ctxfi - Fix incorrect SPDIF status bit mask
        ALSA: ctxfi - Fix microphone boost codes/comments
        ALSA: atiixp - Fix wrong time-out checks during ac-link reset
        ALSA: intel8x0m: append 'm' to "r_intel8x0"
        ...
      d3e458d7
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · f2e1fbb5
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Flush TLB if PGD entry is changed in i386 PAE mode
        x86, dumpstack: Correct stack dump info when frame pointer is available
        x86: Clean up csum-copy_64.S a bit
        x86: Fix common misspellings
        x86: Fix misspelling and align params
        x86: Use PentiumPro-optimized partial_csum() on VIA C7
      f2e1fbb5
    • Linus Torvalds's avatar
      Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of... · 508996b6
      Linus Torvalds authored
      Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Fix incorrect unlock in __setup_irq()
        cris: Use generic show_interrupts()
        genirq: show_interrupts: Check desc->name before printing it blindly
        cris: Use accessor functions to set IRQ_PER_CPU flag
        cris: Fix irq conversion fallout
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched, kernel-doc: Fix runqueue_is_locked() description
      508996b6
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · 61929785
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
        trace, filters: Initialize the match variable in process_ops() properly
        trace, documentation: Fix branch profiling location in debugfs
        oprofile, s390: Cleanups
        oprofile, s390: Remove hwsampler_files.c and merge it into init.c
        perf: Fix tear-down of inherited group events
        perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds
        perf: Handle stopped state with tracepoints
        perf: Fix the software events state check
        perf, powerpc: Handle events that raise an exception without overflowing
        perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints
        perf, x86: Clean up SandyBridge PEBS events
        perf lock: Fix sorting by wait_min
        perf tools: Version incorrect with some versions of grep
        perf evlist: New command to list the names of events present in a perf.data file
        perf script: Add support for H/W and S/W events
        perf script: Add support for dumping symbols
        perf script: Support custom field selection for output
        perf script: Move printing of 'common' data from print_event and rename
        perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse
        perf script: Change process_event prototype
        ...
      61929785
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · e16b396c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
        doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
        Update cpuset info & webiste for cgroups
        dcdbas: force SMI to happen when expected
        arch/arm/Kconfig: remove one to many l's in the word.
        asm-generic/user.h: Fix spelling in comment
        drm: fix printk typo 'sracth'
        Remove one to many n's in a word
        Documentation/filesystems/romfs.txt: fixing link to genromfs
        drivers:scsi Change printk typo initate -> initiate
        serial, pch uart: Remove duplicate inclusion of linux/pci.h header
        fs/eventpoll.c: fix spelling
        mm: Fix out-of-date comments which refers non-existent functions
        drm: Fix printk typo 'failled'
        coh901318.c: Change initate to initiate.
        mbox-db5500.c Change initate to initiate.
        edac: correct i82975x error-info reported
        edac: correct i82975x mci initialisation
        edac: correct commented info
        fs: update comments to point correct document
        target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
        ...
      
      Trivial conflict in fs/eventpoll.c (spelling vs addition)
      e16b396c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7fd23a24
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
        HID: add support for Logitech Driving Force Pro wheel
        HID: hid-ortek: remove spurious reference
        HID: add support for Ortek PKB-1700
        HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
        HID: hid-ntrig: init settle and mode check
        HID: merge hid-egalax into hid-multitouch
        HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
        HID: ntrig remove if and drop an indent
        HID: ACRUX - activate the device immediately after binding
        HID: ntrig: apply NO_INIT_REPORTS quirk
        HID: hid-magicmouse: Correct touch orientation direction
        HID: ntrig don't dereference unclaimed hidinput
        HID: Do not create input devices for feature reports
        HID: bt hidp: send Output reports using SET_REPORT on the Control channel
        HID: hid-sony.c: Fix sending Output reports to the Sixaxis
        HID: add support for Keytouch IEC 60945
        HID: Add HID Report Descriptor to sysfs
        HID: add IRTOUCH infrared USB to hid_have_special_driver
        HID: kernel oops in out_cleanup in function hidinput_connect
        HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
        ...
      7fd23a24
    • Ingo Molnar's avatar
      trace, filters: Initialize the match variable in process_ops() properly · 1ef1d1c2
      Ingo Molnar authored
      Make sure the 'match' variable always has a value.
      
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      1ef1d1c2
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 0a95d92c
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (62 commits)
        powerpc/85xx: Fix signedness bug in cache-sram
        powerpc/fsl: 85xx: document cache sram bindings
        powerpc/fsl: define binding for fsl mpic interrupt controllers
        powerpc/fsl_msi: Handle msi-available-ranges better
        drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak
        powerpc/85xx: Fix SPE float to integer conversion failure
        powerpc/85xx: Update sata controller compatible for p1022ds board
        ATA: Add FSL sata v2 controller support
        powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable
        powerpc/8xx: remove obsolete mgsuvd board
        powerpc/82xx: rename and update mgcoge board support
        powerpc/83xx: rename and update kmeter1
        powerpc/85xx: Workaroudn e500 CPU erratum A005
        powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x
        powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e
        powerpc/pseries: Disable MSI using new interface if possible
        powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED.
        powerpc: core irq_data conversion.
        powerpc: sysdev/xilinx_intc irq_data conversion.
        powerpc: sysdev/uic irq_data conversion.
        ...
      
      Fix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of
      of_platform_driver in arch/powerpc)
      0a95d92c
    • Shaohua Li's avatar
      x86: Flush TLB if PGD entry is changed in i386 PAE mode · 4981d01e
      Shaohua Li authored
      According to intel CPU manual, every time PGD entry is changed in i386 PAE
      mode, we need do a full TLB flush. Current code follows this and there is
      comment for this too in the code.
      
      But current code misses the multi-threaded case. A changed page table
      might be used by several CPUs, every such CPU should flush TLB. Usually
      this isn't a problem, because we prepopulate all PGD entries at process
      fork. But when the process does munmap and follows new mmap, this issue
      will be triggered.
      
      When it happens, some CPUs keep doing page faults:
      
        http://marc.info/?l=linux-kernel&m=129915020508238&w=2
      
      Reported-by: Yasunori Goto<y-goto@jp.fujitsu.com>
      Tested-by: Yasunori Goto<y-goto@jp.fujitsu.com>
      Reviewed-by: default avatarRik van Riel <riel@redhat.com>
      Signed-off-by: Shaohua Li<shaohua.li@intel.com>
      Cc: Mallick Asit K <asit.k.mallick@intel.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: linux-mm <linux-mm@kvack.org>
      Cc: stable <stable@kernel.org>
      LKML-Reference: <1300246649.2337.95.camel@sli10-conroe>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      4981d01e
    • Namhyung Kim's avatar
      x86, dumpstack: Correct stack dump info when frame pointer is available · e8e999cf
      Namhyung Kim authored
      Current stack dump code scans entire stack and check each entry
      contains a pointer to kernel code. If CONFIG_FRAME_POINTER=y it
      could mark whether the pointer is valid or not based on value of
      the frame pointer. Invalid entries could be preceded by '?' sign.
      
      However this was not going to happen because scan start point
      was always higher than the frame pointer so that they could not
      meet.
      
      Commit 9c0729dc ("x86: Eliminate bp argument from the stack
      tracing routines") delayed bp acquisition point, so the bp was
      read in lower frame, thus all of the entries were marked
      invalid.
      
      This patch fixes this by reverting above commit while retaining
      stack_frame() helper as suggested by Frederic Weisbecker.
      
      End result looks like below:
      
      before:
      
       [    3.508329] Call Trace:
       [    3.508551]  [<ffffffff814f35c9>] ? panic+0x91/0x199
       [    3.508662]  [<ffffffff814f3739>] ? printk+0x68/0x6a
       [    3.508770]  [<ffffffff81a981b2>] ? mount_block_root+0x257/0x26e
       [    3.508876]  [<ffffffff81a9821f>] ? mount_root+0x56/0x5a
       [    3.508975]  [<ffffffff81a98393>] ? prepare_namespace+0x170/0x1a9
       [    3.509216]  [<ffffffff81a9772b>] ? kernel_init+0x1d2/0x1e2
       [    3.509335]  [<ffffffff81003894>] ? kernel_thread_helper+0x4/0x10
       [    3.509442]  [<ffffffff814f6880>] ? restore_args+0x0/0x30
       [    3.509542]  [<ffffffff81a97559>] ? kernel_init+0x0/0x1e2
       [    3.509641]  [<ffffffff81003890>] ? kernel_thread_helper+0x0/0x10
      
      after:
      
       [    3.522991] Call Trace:
       [    3.523351]  [<ffffffff814f35b9>] panic+0x91/0x199
       [    3.523468]  [<ffffffff814f3729>] ? printk+0x68/0x6a
       [    3.523576]  [<ffffffff81a981b2>] mount_block_root+0x257/0x26e
       [    3.523681]  [<ffffffff81a9821f>] mount_root+0x56/0x5a
       [    3.523780]  [<ffffffff81a98393>] prepare_namespace+0x170/0x1a9
       [    3.523885]  [<ffffffff81a9772b>] kernel_init+0x1d2/0x1e2
       [    3.523987]  [<ffffffff81003894>] kernel_thread_helper+0x4/0x10
       [    3.524228]  [<ffffffff814f6880>] ? restore_args+0x0/0x30
       [    3.524345]  [<ffffffff81a97559>] ? kernel_init+0x0/0x1e2
       [    3.524445]  [<ffffffff81003890>] ? kernel_thread_helper+0x0/0x10
      
       -v5:
         * fix build breakage with oprofile
      
       -v4:
         * use 0 instead of regs->bp
         * separate out printk changes
      
       -v3:
         * apply comment from Frederic
         * add a couple of printk fixes
      Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
      Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Soren Sandmann <ssp@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Robert Richter <robert.richter@amd.com>
      LKML-Reference: <1300416006-3163-1-git-send-email-namhyung@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      e8e999cf
    • Ingo Molnar's avatar
      x86: Clean up csum-copy_64.S a bit · 2c76397b
      Ingo Molnar authored
      The many stray whitespaces and other uncleanlinesses made this code
      almost unreadable to me - so fix those.
      
      No changes to the code.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      2c76397b
    • Lucas De Marchi's avatar
      x86: Fix common misspellings · 0d2eb44f
      Lucas De Marchi authored
      They were generated by 'codespell' and then manually reviewed.
      Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@profusion.mobi>
      Cc: trivial@kernel.org
      LKML-Reference: <1300389856-1099-3-git-send-email-lucas.demarchi@profusion.mobi>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      0d2eb44f
    • Lucas De Marchi's avatar
      x86: Fix misspelling and align params · a6c3270b
      Lucas De Marchi authored
      Fix 'upto' misspelling and align parameters.
      Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@profusion.mobi>
      Cc: trivial@kernel.org
      LKML-Reference: <1300389856-1099-2-git-send-email-lucas.demarchi@profusion.mobi>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      a6c3270b
    • Ingo Molnar's avatar
      Merge branch 'linus' into x86/urgent · 8dd8997d
      Ingo Molnar authored
      Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      8dd8997d
    • Takashi Iwai's avatar
      Merge branch 'topic/misc' into for-linus · d351cf46
      Takashi Iwai authored
      d351cf46
    • Dan Rosenberg's avatar
      ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl · 4a122c10
      Dan Rosenberg authored
      The user-supplied index into the adapters array needs to be checked, or
      an out-of-bounds kernel pointer could be accessed and used, leading to
      potentially exploitable memory corruption.
      Signed-off-by: default avatarDan Rosenberg <drosenberg@vsecurity.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      4a122c10
    • Takashi Iwai's avatar
      ALSA: aloop - Fix possible IRQ lock inversion · 98d21df4
      Takashi Iwai authored
      loopback_pos_update() can be called in the timer callback, thus the lock
      held should be irq-safe.  Otherwise you'll get AB/BA deadlock together
      with substream->self_group.lock.
      Reported-and-tested-by: default avatarKnut Petersen <Knut_Petersen@t-online.de>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      98d21df4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 08351fc6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (27 commits)
        arch/tile: support newer binutils assembler shift semantics
        arch/tile: fix deadlock bugs in rwlock implementation
        drivers/edac: provide support for tile architecture
        tile on-chip network driver: sync up with latest fixes
        arch/tile: support 4KB page size as well as 64KB
        arch/tile: add some more VMSPLIT options and use consistent naming
        arch/tile: fix some comments and whitespace
        arch/tile: export some additional module symbols
        arch/tile: enhance existing finv_buffer_remote() routine
        arch/tile: fix two bugs in the backtracer code
        arch/tile: use extended assembly to inline __mb_incoherent()
        arch/tile: use a cleaner technique to enable interrupt for cpu_idle()
        arch/tile: sync up with <arch/sim.h> and <arch/sim_def.h> changes
        arch/tile: fix reversed test of strict_strtol() return value
        arch/tile: avoid a simulator warning during bootup
        arch/tile: export <asm/hardwall.h> to userspace
        arch/tile: warn and retry if an IPI is not accepted by the target cpu
        arch/tile: stop disabling INTCTRL_1 interrupts during hypervisor downcalls
        arch/tile: fix __ndelay etc to work better
        arch/tile: bug fix: exec'ed task thought it was still single-stepping
        ...
      
      Fix up trivial conflict in arch/tile/kernel/vmlinux.lds.S (percpu
      alignment vs section naming convention fix)
      08351fc6
    • Linus Torvalds's avatar
      Merge branch 'omap-for-linus' of... · 0df0914d
      Linus Torvalds authored
      Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
        omap: zoom: host should not pull up wl1271's irq line
        arm: plat-omap: iommu: fix request_mem_region() error path
        OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
        omap4: mux: Remove duplicate mux modes
        omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
        omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
        omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
        omap4: board-omap4panda: Initialise the serial pads
        omap3: board-3430sdp: Initialise the serial pads
        omap4: board-4430sdp: Initialise the serial pads
        omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
        omap2+: mux: Remove the use of IDLE flag
        omap2+: Add separate list for dynamic pads to mux
        perf: add OMAP support for the new power events
        OMAP4: Add IVA OPP enteries.
        OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
        OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
        OMAP3+: OPP: Replace voltage values with Macros
        OMAP3: wdtimer: Fix CORE idle transition
        Watchdog: omap_wdt: add fine grain runtime-pm
        ...
      
      Fix up various conflicts in
       - arch/arm/mach-omap2/board-omap3evm.c
       - arch/arm/mach-omap2/clock3xxx_data.c
       - arch/arm/mach-omap2/usb-musb.c
       - arch/arm/plat-omap/include/plat/usb.h
       - drivers/usb/musb/musb_core.h
      0df0914d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm · 68996085
      Linus Torvalds authored
      * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits)
        msm: scm: Check for interruption immediately
        msm: scm: Fix improper register assignment
        msm: scm: Mark inline asm as volatile
        msm: iommu: Enable HTW L2 redirection on MSM8960
        msm: iommu: Don't read from write-only registers
        msm: iommu: Remove dependency on IDR
        msm: iommu: Use ASID tagging instead of VMID tagging
        msm: iommu: Rework clock logic and add IOMMU bus clock control
        msm: iommu: Clock control for the IOMMU driver
        msm: mdp: Set the correct pack pattern for XRGB/ARGB
        msm_fb: Fix framebuffer console
        msm: mdp: Add support for RGBX 8888 image format.
        video: msmfb: Put the partial update magic value into the fix_screen struct.
        msm: clock: Migrate to clkdev
        msm: clock: Remove references to clk_ops_pcom
        msm: headsmp.S: Fix section mismatch
        msm: Use explicit GPLv2 licenses
        msm: iommu: Enable IOMMU support for MSM8960
        msm: iommu: Generalize platform data for multiple targets
        msm: iommu: Create a Kconfig item for the IOMMU driver
        ...
      68996085
    • Linus Torvalds's avatar
      Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm · 411f5c7a
      Linus Torvalds authored
      * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
        davinci: DM644x EVM: register MUSB device earlier
        davinci: add spi devices on tnetv107x evm
        davinci: add ssp config for tnetv107x evm board
        davinci: add tnetv107x ssp platform device
        spi: add ti-ssp spi master driver
        mfd: add driver for sequencer serial port
        ARM: EXYNOS4: Implement Clock gating for System MMU
        ARM: EXYNOS4: Enhancement of System MMU driver
        ARM: EXYNOS4: Add support for gpio interrupts
        ARM: S5P: Add function to register gpio interrupt bank data
        ARM: S5P: Cleanup S5P gpio interrupt code
        ARM: EXYNOS4: Add missing GPYx banks
        ARM: S3C64XX: Fix section mismatch from cpufreq init
        ARM: EXYNOS4: Add keypad device to the SMDKV310
        ARM: EXYNOS4: Update clocks for keypad
        ARM: EXYNOS4: Update keypad base address
        ARM: EXYNOS4: Add keypad device helpers
        ARM: EXYNOS4: Add support for SATA on ARMLEX4210
        plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
        mach-u300: define a dummy filter function for coh901318
        ...
      
      Fix up various conflicts in
       - arch/arm/mach-exynos4/cpufreq.c
       - arch/arm/mach-mxs/gpio.c
       - drivers/net/Kconfig
       - drivers/tty/serial/Kconfig
       - drivers/tty/serial/Makefile
       - drivers/usb/gadget/fsl_mxc_udc.c
       - drivers/video/Kconfig
      411f5c7a
    • Linus Torvalds's avatar
      Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm · 6d7ed21d
      Linus Torvalds authored
      * 'defcfg' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: 6647/1: add Versatile Express defconfig
        ARM: 6644/1: mach-ux500: update the U8500 defconfig
      
      * 'drivers' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: 6764/1: pl011: factor out FIFO to TTY code
        ARM: 6763/1: pl011: add optional RX DMA to PL011 v2
        ARM: 6758/1: amba: support pm ops
        ARM: amba: make amba_driver id_table const
        ARM: amba: make internal ID table handling const
        ARM: amba: make probe() functions take const id tables
        ARM: 6662/1: amba: make amba_bustype non-static
        ARM: mmci: add dmaengine-based DMA support
        ARM: mmci: no need for separate host->data_xfered
        ARM: mmci: avoid unnecessary switch to data available PIO interrupts
        ARM: mmci: no need to call flush_dcache_page() with sg_miter API
        ARM: mmci: avoid reporting too many completed bytes on fifo overrun
        ALSA: AACI: make fifo variables more explanitory
        ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period
        ALSA: AACI: use snd_pcm_lib_period_bytes()
        ALSA: AACI: clean up AACI announcement printk
        ALSA: AACI: fix channel mask selection
        ALSA: AACI: fix number of channels for record
        ALSA: AACI: fix multiple IRQ claiming
      
      * 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm:
        VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()
        VIDEO: cyberpro: remove useless function extreg pointers
        VIDEO: cyberpro: update handling of device structures
        VIDEO: cyberpro: add support for video capture I2C
        VIDEO: cyberpro: make 'reg_b0_lock' always present
        VIDEO: cyberpro: add I2C support
        VIDEO: cyberpro: select lowest multipler/divisor for PLL
      6d7ed21d
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm · ec0afc93
      Linus Torvalds authored
      * 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (55 commits)
        KVM: unbreak userspace that does not sets tss address
        KVM: MMU: cleanup pte write path
        KVM: MMU: introduce a common function to get no-dirty-logged slot
        KVM: fix rcu usage in init_rmode_* functions
        KVM: fix kvmclock regression due to missing clock update
        KVM: emulator: Fix permission checking in io permission bitmap
        KVM: emulator: Fix io permission checking for 64bit guest
        KVM: SVM: Load %gs earlier if CONFIG_X86_32_LAZY_GS=n
        KVM: x86: Remove useless regs_page pointer from kvm_lapic
        KVM: improve comment on rcu use in irqfd_deassign
        KVM: MMU: remove unused macros
        KVM: MMU: cleanup page alloc and free
        KVM: MMU: do not record gfn in kvm_mmu_pte_write
        KVM: MMU: move mmu pages calculated out of mmu lock
        KVM: MMU: set spte accessed bit properly
        KVM: MMU: fix kvm_mmu_slot_remove_write_access dropping intermediate W bits
        KVM: Start lock documentation
        KVM: better readability of efer_reserved_bits
        KVM: Clear async page fault hash after switching to real mode
        KVM: VMX: Initialize vm86 TSS only once.
        ...
      ec0afc93
    • Linus Torvalds's avatar
      Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 804f1853
      Linus Torvalds authored
      * 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: use freeze/restore/thaw PM events for suspend/resume/chkpt
        xen: xenbus PM events support
      804f1853
    • Linus Torvalds's avatar
      Merge branches 'stable/irq.fairness' and 'stable/irq.ween_of_nr_irqs' of... · 5a39837f
      Linus Torvalds authored
      Merge branches 'stable/irq.fairness' and 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/irq.fairness' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: events: Remove redundant clear of l2i at end of round-robin loop
        xen: events: Make round-robin scan fairer by snapshotting each l2 word once only
        xen: events: Clean up round-robin evtchn scan.
        xen: events: Make last processed event channel a per-cpu variable.
        xen: events: Process event channels notifications in round-robin order.
      
      * 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: events: Fix compile error if CONFIG_SMP is not defined.
        xen: events: correct locking in xen_irq_from_pirq
        xen: events: propagate irq allocation failure instead of panicking
        xen: events: do not workaround too-small nr_irqs
        xen: events: remove use of nr_irqs as upper bound on number of pirqs
        xen: events: dynamically allocate irq info structures
        xen: events: maintain a list of Xen interrupts
        xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into irq_info init functions
        xen: events: turn irq_info constructors into initialiser functions
        xen: events: use per-cpu variable for cpu_evtchn_mask
        xen: events: refactor GSI pirq bindings functions
        xen: events: rename restore_cpu_pirqs -> restore_pirqs
        xen: events: remove unused public functions
        xen: events: fix xen_map_pirq_gsi error return
        xen: events: simplify comment
        xen: events: separate two unrelated halves of if condition
      
      Fix up trivial conflicts in drivers/xen/events.c
      5a39837f
    • Linus Torvalds's avatar
      Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 'stable/balloon'... · 514af9f7
      Linus Torvalds authored
      Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/hvc-console' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line.
      
      * 'stable/gntalloc.v6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: gntdev: fix build warning
        xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override
        xen-gntdev: Add cast to pointer
        xen-gntdev: Fix incorrect use of zero handle
        xen: change xen/[gntdev/gntalloc] to default m
        xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings
        xen-gntdev: Avoid double-mapping memory
        xen-gntdev: Avoid unmapping ranges twice
        xen-gntdev: Use map->vma for checking map validity
        xen-gntdev: Fix unmap notify on PV domains
        xen-gntdev: Fix memory leak when mmap fails
        xen/gntalloc,gntdev: Add unmap notify ioctl
        xen-gntalloc: Userspace grant allocation driver
        xen-gntdev: Support mapping in HVM domains
        xen-gntdev: Add reference counting to maps
        xen-gntdev: Use find_vma rather than iterating our vma list manually
        xen-gntdev: Change page limit to be global instead of per-open
      
      * 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (24 commits)
        xen-gntdev: Use ballooned pages for grant mappings
        xen-balloon: Add interface to retrieve ballooned pages
        xen-balloon: Move core balloon functionality out of module
        xen/balloon: Remove pr_info's and don't alter retry_count
        xen/balloon: Protect against CPU exhaust by event/x process
        xen/balloon: Migration from mod_timer() to schedule_delayed_work()
        xen/balloon: Removal of driver_pages
      514af9f7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · c55d267d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
        [SCSI] scsi_dh_rdac: Add MD36xxf into device list
        [SCSI] scsi_debug: add consecutive medium errors
        [SCSI] libsas: fix ata list corruption issue
        [SCSI] hpsa: export resettable host attribute
        [SCSI] hpsa: move device attributes to avoid forward declarations
        [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
        [SCSI] sd: Logical Block Provisioning update
        [SCSI] Include protection operation in SCSI command trace
        [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
        [SCSI] target: Fix volume size misreporting for volumes > 2TB
        [SCSI] bnx2fc: Broadcom FCoE offload driver
        [SCSI] fcoe: fix broken fcoe interface reset
        [SCSI] fcoe: precedence bug in fcoe_filter_frames()
        [SCSI] libfcoe: Remove stale fcoe-netdev entries
        [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
        [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
        [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
        [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
        [SCSI] libfc: Fixing a memory leak when destroying an interface
        [SCSI] megaraid_sas: Version and Changelog update
        ...
      
      Fix up trivial conflicts due to whitespace differences in
      drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}
      c55d267d
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 61ef46fd
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] pcc-cpufreq: remove duplicate statements
        [CPUFREQ] Remove the pm_message_t argument from driver suspend
        [CPUFREQ] Remove unneeded locks
        [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files
        [CPUFREQ] Remove deprecated sysfs file sampling_rate_max
        [CPUFREQ] powernow-k8: The table index is not worth displaying
        [CPUFREQ] calculate delay after dbs_check_cpu
        [CPUFREQ] Add documentation for sampling_down_factor
        [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons
      61ef46fd
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 77aa56ba
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        ext3: Always set dx_node's fake_dirent explicitly.
        ext3: Fix an overflow in ext3_trim_fs.
        jbd: Remove one to many n's in a word.
        ext3: skip orphan cleanup on rocompat fs
        ext2: Fix link count corruption under heavy link+rename load
        ext3: speed up group trim with the right free block count.
        ext3: Adjust trim start with first_data_block.
        quota: return -ENOMEM when memory allocation fails
      77aa56ba
    • Linus Torvalds's avatar
      Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 17919837
      Linus Torvalds authored
      * 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (54 commits)
        RPC: killing RPC tasks races fixed
        xprt: remove redundant check
        SUNRPC: Convert struct rpc_xprt to use atomic_t counters
        SUNRPC: Ensure we always run the tk_callback before tk_action
        sunrpc: fix printk format warning
        xprt: remove redundant null check
        nfs: BKL is no longer needed, so remove the include
        NFS: Fix a warning in fs/nfs/idmap.c
        Cleanup: Factor out some cut-and-paste code.
        cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions.
        NFS: account direct-io into task io accounting
        gss:krb5 only include enctype numbers in gm_upcall_enctypes
        RPCRDMA: Fix FRMR registration/invalidate handling.
        RPCRDMA: Fix to XDR page base interpretation in marshalling logic.
        NFSv4: Send unmapped uid/gids to the server when using auth_sys
        NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattr
        NFSv4: cleanup idmapper functions to take an nfs_server argument
        NFSv4: Send unmapped uid/gids to the server if the idmapper fails
        NFSv4: If the server sends us a numeric uid/gid then accept it
        NFSv4.1: reject zero layout with zeroed stripe unit
        ...
      17919837
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 374e5525
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        UDF: Fix compiler warning
        udf: Convert UDF to new truncate calling sequence
      374e5525
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 978ca164
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (38 commits)
        amd64_edac: Fix decode_syndrome types
        amd64_edac: Fix DCT argument type
        amd64_edac: Fix ranges signedness
        amd64_edac: Drop local variable
        amd64_edac: Fix PCI config addressing types
        amd64_edac: Fix DRAM base macros
        amd64_edac: Fix node id signedness
        amd64_edac: Drop redundant declarations
        amd64_edac: Enable driver on F15h
        amd64_edac: Adjust ECC symbol size to F15h
        amd64_edac: Simplify scrubrate setting
        PCI: Rename CPU PCI id define
        amd64_edac: Improve DRAM address mapping
        amd64_edac: Sanitize ->read_dram_ctl_register
        amd64_edac: Adjust sys_addr to chip select conversion routine to F15h
        amd64_edac: Beef up early exit reporting
        amd64_edac: Revamp online spare handling
        amd64_edac: Fix channel interleave removal
        amd64_edac: Correct node interleaving removal
        amd64_edac: Add support for interleaved region swapping
        ...
      
      Fix up trivial conflict in include/linux/pci_ids.h due to
      AMD_15H_NB_MISC being renamed as AMD_15H_NB_F3 next to the new
      AMD_15H_NB_LINK entry.
      978ca164
    • Linus Torvalds's avatar
      Merge branch 'for-linus/2639/i2c-1' of git://git.fluff.org/bjdooks/linux · 02e4c627
      Linus Torvalds authored
      * 'for-linus/2639/i2c-1' of git://git.fluff.org/bjdooks/linux:
        i2c-mpc: Add support for 64bit system
        i2c: add driver for Freescale i.MX28
        i2c: tegra: Add i2c support
      02e4c627
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 4b0e976c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        watchdog: booke_wdt: clean up status messages
        watchdog: cleanup spaces before tabs
        watchdog: convert to DEFINE_PCI_DEVICE_TABLE
        watchdog: Xen watchdog driver
        watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
        watchdog: jz4740_wdt - fix magic character checking
        watchdog: add JZ4740 watchdog driver
        watchdog: it87_wdt: Add support for IT8721F watchdog
        watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled
        watchdog: hpwdt: Fix a couple of typos
      4b0e976c
  2. 17 Mar, 2011 5 commits
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 19520fc1
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
        hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes
        hwmon/f71882fg: Add support for f71808e
        hwmon/f71882fg: Add support for f71869f and f71869e
        hwmon/f71882fg: Add support for f71889ed
        hwmon/f71882fg: Break out test for auto pwm's controlled by digital readings
        hwmon/f71882fg: Separate temp beep sysfs attr from the other temp sysfs attr
        hwmon/f71882fg: Remove bogus temp2_type for certain models
        hwmon/f71882fg: Make number of temps configurable
        hwmon/f71882fg: Make creation of in sysfs attributes more generic
        hwmon/f71882fg: Only allow negative auto point temps if fan_neg_temp is enabled
        hwmon/f71882fg: Fix temp1 sensor type reporting
        hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F
        hwmon: (w83627ehf) Add fan debounce support for NCT6775F and NCT6776F
        hwmon: (w83627ehf) Update Kconfig for W83677HG-B, NCT6775F and NCT6776F
        hwmon: (w83627ehf) Store rpm instead of raw fan speed data
        hwmon: (w83627ehf) Use 16 bit fan count registers if supported
        hwmon: (w83627ehf) Add support for Nuvoton NCT6775F and NCT6776F
        hwmon: (w83627ehf) Permit enabling SmartFan IV mode if configured at startup
        hwmon: (w83627ehf) Convert register arrays to 16 bit, and convert access to pointers
        hwmon: (w83627ehf) Remove references to datasheets which no longer exist
        ...
      19520fc1
    • Milton Miller's avatar
      smp_call_function_interrupt: use typedef and %pf · c8def554
      Milton Miller authored
      Use the newly added smp_call_func_t in smp_call_function_interrupt for
      the func variable, and make the comment above the WARN more assertive
      and explicit.  Also, func is a function pointer and does not need an
      offset, so use %pf not %pS.
      Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c8def554
    • Milton Miller's avatar
      smp_call_function_many: handle concurrent clearing of mask · 723aae25
      Milton Miller authored
      Mike Galbraith reported finding a lockup ("perma-spin bug") where the
      cpumask passed to smp_call_function_many was cleared by other cpu(s)
      while a cpu was preparing its call_data block, resulting in no cpu to
      clear the last ref and unlock the block.
      
      Having cpus clear their bit asynchronously could be useful on a mask of
      cpus that might have a translation context, or cpus that need a push to
      complete an rcu window.
      
      Instead of adding a BUG_ON and requiring yet another cpumask copy, just
      detect the race and handle it.
      
      Note: arch_send_call_function_ipi_mask must still handle an empty
      cpumask because the data block is globally visible before the that arch
      callback is made.  And (obviously) there are no guarantees to which cpus
      are notified if the mask is changed during the call; only cpus that were
      online and had their mask bit set during the whole call are guaranteed
      to be called.
      Reported-by: default avatarMike Galbraith <efault@gmx.de>
      Reported-by: default avatarJan Beulich <JBeulich@novell.com>
      Acked-by: default avatarJan Beulich <jbeulich@novell.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      723aae25
    • Milton Miller's avatar
      call_function_many: add missing ordering · 45a57919
      Milton Miller authored
      Paul McKenney's review pointed out two problems with the barriers in the
      2.6.38 update to the smp call function many code.
      
      First, a barrier that would force the func and info members of data to
      be visible before their consumption in the interrupt handler was
      missing.  This can be solved by adding a smp_wmb between setting the
      func and info members and setting setting the cpumask; this will pair
      with the existing and required smp_rmb ordering the cpumask read before
      the read of refs.  This placement avoids the need a second smp_rmb in
      the interrupt handler which would be executed on each of the N cpus
      executing the call request.  (I was thinking this barrier was present
      but was not).
      
      Second, the previous write to refs (establishing the zero that we the
      interrupt handler was testing from all cpus) was performed by a third
      party cpu.  This would invoke transitivity which, as a recient or
      concurrent addition to memory-barriers.txt now explicitly states, would
      require a full smp_mb().
      
      However, we know the cpumask will only be set by one cpu (the data
      owner) and any preivous iteration of the mask would have cleared by the
      reading cpu.  By redundantly writing refs to 0 on the owning cpu before
      the smp_wmb, the write to refs will follow the same path as the writes
      that set the cpumask, which in turn allows us to keep the barrier in the
      interrupt handler a smp_rmb instead of promoting it to a smp_mb (which
      will be be executed by N cpus for each of the possible M elements on the
      list).
      
      I moved and expanded the comment about our (ab)use of the rcu list
      primitives for the concurrent walk earlier into this function.  I
      considered moving the first two paragraphs to the queue list head and
      lock, but felt it would have been too disconected from the code.
      
      Cc: Paul McKinney <paulmck@linux.vnet.ibm.com>
      Cc: stable@kernel.org (2.6.32 and later)
      Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      45a57919
    • Milton Miller's avatar
      call_function_many: fix list delete vs add race · e6cd1e07
      Milton Miller authored
      Peter pointed out there was nothing preventing the list_del_rcu in
      smp_call_function_interrupt from running before the list_add_rcu in
      smp_call_function_many.
      
      Fix this by not setting refs until we have gotten the lock for the list.
      Take advantage of the wmb in list_add_rcu to save an explicit additional
      one.
      
      I tried to force this race with a udelay before the lock & list_add and
      by mixing all 64 online cpus with just 3 random cpus in the mask, but
      was unsuccessful.  Still, inspection shows a valid race, and the fix is
      a extension of the existing protection window in the current code.
      
      Cc: stable@kernel.org (v2.6.32 and later)
      Reported-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e6cd1e07