1. 23 May, 2012 34 commits
    • Linus Torvalds's avatar
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 59d0952b
      Linus Torvalds authored
      Pull libata update from Jeff Garzik:
       "Changes, all of them boring and minor:
      
        1) Ugly MSFT Hyper-V workaround in ata_piix
      
        2) Fix a longstanding error recovery delay caused by excessive
           re-re-retries, when media errors occur.
      
        3) Minor hw-specific workarounds and quirks
      
        4) New PATA driver for ep93xx"
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        PATA host controller driver for ep93xx
        [libata] Add " 2GB ATA Flash Disk"/"ADMA428M" to DMA blacklist
        ata_generic: Skip is_intel_ider() check when ata_generic=1 is set
        libata-eh don't waste time retrying media errors (v3)
        ata_piix: defer disks to the Hyper-V drivers by default
        libata: add a host flag to ignore detected ATA devices
      59d0952b
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 1259f6ee
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "New driver for INA219 and INA226, added support for IT8782F and
        IT8783E/F to it87 driver, plus cleanups in a couple of drivers."
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (it87) Make temp3 attribute conditional for IT8782F
        hwmon: (it87) Convert to use devm_kzalloc and devm_request_region
        hwmon: INA219 and INA226 support
        hwmon: (it87) Create voltage attributes only if voltage is enabled
        hwmon: (ntc_thermistor) Fix checkpatch warning
        hwmon: (ntc_thermistor) Optimize and fix build warning
        hwmon: (ntc_thermistor) Return error code from hwmon_device_register
        hwmon: (ntc_thermistor) Convert to devm_kzalloc
        hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT
        acpi_power_meter: clean up code around setup_attrs
        acpi_power_meter: drop meter_rw_attrs, use common meter_attrs
        acpi_power_meter: remove duplicate code between register_{ro,rw}_attrs
        acpi_power_meter: use a {RW,RO}_SENSOR_TEMPLATE macro to clean things up
        acpi_power_meter: use the same struct {rw,ro}_sensor_template for both
        hwmon: use module_pci_driver
        hwmon: (it87) Add support for IT8782F and IT8783E/F
      1259f6ee
    • Linus Torvalds's avatar
      Merge tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 468f4d1a
      Linus Torvalds authored
      Pull power management updates from Rafael Wysocki:
      
       - Implementation of opportunistic suspend (autosleep) and user space
         interface for manipulating wakeup sources.
      
       - Hibernate updates from Bojan Smojver and Minho Ban.
      
       - Updates of the runtime PM core and generic PM domains framework
         related to PM QoS.
      
       - Assorted fixes.
      
      * tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (25 commits)
        epoll: Fix user space breakage related to EPOLLWAKEUP
        PM / Domains: Make it possible to add devices to inactive domains
        PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format
        PM / Domains: Fix computation of maximum domain off time
        PM / Domains: Fix link checking when add subdomain
        PM / Sleep: User space wakeup sources garbage collector Kconfig option
        PM / Sleep: Make the limit of user space wakeup sources configurable
        PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo
        PM / Domains: Cache device stop and domain power off governor results, v3
        PM / Domains: Make device removal more straightforward
        PM / Sleep: Fix a mistake in a conditional in autosleep_store()
        epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready
        PM / QoS: Create device constraints objects on notifier registration
        PM / Runtime: Remove device fields related to suspend time, v2
        PM / Domains: Rework default domain power off governor function, v2
        PM / Domains: Rework default device stop governor function, v2
        PM / Sleep: Add user space interface for manipulating wakeup sources, v3
        PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
        PM / Sleep: Implement opportunistic sleep, v2
        PM / Sleep: Add wakeup_source_activate and wakeup_source_deactivate tracepoints
        ...
      468f4d1a
    • Linus Torvalds's avatar
      Merge tag 'regmap-domain-deps' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · eb2689e0
      Linus Torvalds authored
      Pull a regmap kconfig dependency fix from Mark Brown:
       "Fix the dependency on IRQ_DOMAIN for REGMAP_IRQ in the core
      
        Fixes a missing select from the Palmas driver a bit more throoughly."
      
      * tag 'regmap-domain-deps' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Use select .. if to get IRQ_DOMAIN enabled
      eb2689e0
    • Linus Torvalds's avatar
      Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 2e341ca6
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "This is the first big chunk for 3.5 merges of sound stuff.
      
        There are a few big changes in different areas.  First off, the
        streaming logic of USB-audio endpoints has been largely rewritten for
        the better support of "implicit feedback".  If anything about USB got
        broken, this change has to be checked.
      
        For HD-audio, the resume procedure was changed; instead of delaying
        the resume of the hardware until the first use, now waking up
        immediately at resume.  This is for buggy BIOS.
      
        For ASoC, dynamic PCM support and the improved support for digital
        links between off-SoC devices are major framework changes.
      
        Some highlights are below:
      
        * HD-audio
         - Avoid accesses of invalid pin-control bits that may stall the codec
         - V-ref setup cleanups
         - Fix the races in power-saving code
         - Fix the races in codec cache hashes and connection lists
         - Split some common codes for BIOS auto-parser to hda_auto_parser.c
         - Changed the PM resume code to wake up immediately for buggy BIOS
         - Creative SoundCore3D support
         - Add Conexant CX20751/2/3/4 codec support
      
        * ASoC
         - Dynamic PCM support, allowing support for SoCs with internal
           routing through components with tight sequencing and formatting
           constraints within their internal paths or where there are multiple
           components connected with CPU managed DMA controllers inside the
           SoC.
         - Greatly improved support for direct digital links between off-SoC
           devices, providing a much simpler way of connecting things like
           digital basebands to CODECs.
         - Much more fine grained and robust locking, cleaning up some of the
           confusion that crept in with multi-component.
         - CPU support for nVidia Tegra 30 I2S and audio hub controllers and
           ST-Ericsson MSP I2S controolers
         - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,
           Texas Instruments LM49453.
         - Some regmap changes needed by the Tegra I2S driver.
         - mc13783 audio support.
      
        * Misc
         - Rewrite with module_pci_driver()
         - Xonar DGX support for snd-oxygen
         - Improvement of packet handling in snd-firewire driver
         - New USB-endpoint streaming logic
         - Enhanced M-audio FTU quirks and relevant cleanups
         - Increment the support of OSS devices to 256
         - snd-aloop accuracy improvement
      
        There are a few more pending changes for 3.5, but they will be sent
        slightly later as partly depending on the changes of DRM."
      
      Fix up conflicts in regmap (due to duplicate patches, with some further
      updates then having already come in from the regmap tree).  Also some
      fairly trivial context conflicts in the imx and mcx soc drivers.
      
      * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)
        ALSA: snd-usb: fix stream info output in /proc
        ALSA: pcm - Add proper state checks to snd_pcm_drain()
        ALSA: sh: Fix up namespace collision in sh_dac_audio.
        ALSA: hda/realtek - Fix unused variable compile warning
        ASoC: sh: fsi: enable chip specific data transfer mode
        ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()
        ASoC: sh: fsi: use same format for IN/OUT
        ASoC: sh: fsi: add fsi_version() and removed meaningless version check
        ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC
        ASoC: tegra: Add machine driver for WM8753 codec
        ALSA: hda - Fix possible races of accesses to connection list array
        ASoC: OMAP: HDMI: Introduce codec
        ARM: mx31_3ds: Add sound support
        ASoC: imx-mc13783 cleanup
        mx31moboard: Add sound support
        ASoC: mc13783 codec cleanups
        ASoC: add imx-mc13783 sound support
        ASoC: Add mc13783 codec
        mfd: mc13xxx: add codec platform data
        ASoC: don't flip master of DT-instantiated DAI links
        ...
      2e341ca6
    • Linus Torvalds's avatar
      Merge tag 'ktest-v3.5-spelling' of... · 927ad551
      Linus Torvalds authored
      Merge tag 'ktest-v3.5-spelling' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
      
      Pull trivial ktest spelling fix from Steven Rostedt:
       "I promised Jesper that I would push this for 3.5, but forgot to add it
        to my queue.  It's just a spelling fix, but it should go in regardless
        to hide my inability to get words in the English language correct."
      
      Becuse gud spealing is impurtunt.
      
      * tag 'ktest-v3.5-spelling' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Change singular "paranthesis" to plural "parentheses"
      927ad551
    • Linus Torvalds's avatar
      Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of... · 56edab31
      Linus Torvalds authored
      Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull perf fixes from Ingo Molnar:
      
       - Leftover AMD PMU driver fix fix from the end of the v3.4
         stabilization cycle.
      
       - Late tools/perf/ changes that missed the first round:
          * endianness fixes
          * event parsing improvements
          * libtraceevent fixes factored out from trace-cmd
          * perl scripting engine fixes related to libtraceevent,
          * testcase improvements
          * perf inject / pipe mode fixes
          * plus a kernel side fix
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86: Update event scheduling constraints for AMD family 15h models
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "sched, perf: Use a single callback into the scheduler"
        perf evlist: Show event attribute details
        perf tools: Bump default sample freq to 4 kHz
        perf buildid-list: Work better with pipe mode
        perf tools: Fix piped mode read code
        perf inject: Fix broken perf inject -b
        perf tools: rename HEADER_TRACE_INFO to HEADER_TRACING_DATA
        perf tools: Add union u64_swap type for swapping u64 data
        perf tools: Carry perf_event_attr bitfield throught different endians
        perf record: Fix documentation for branch stack sampling
        perf target: Add cpu flag to sample_type if target has cpu
        perf tools: Always try to build libtraceevent
        perf tools: Rename libparsevent to libtraceevent in Makefile
        perf script: Rename struct event to struct event_format in perl engine
        perf script: Explicitly handle known default print arg type
        perf tools: Add hardcoded name term for pmu events
        perf tools: Separate 'mem:' event scanner bits
        perf tools: Use allocated list for each parsed event
        perf tools: Add support for displaying event parser debug info
        perf test: Move parse event automated tests to separated object
      56edab31
    • Linus Torvalds's avatar
      Merge tag 'ia64-3.5-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 3813d402
      Linus Torvalds authored
      Pull Itanium fixes from Tony Luck.
      
      * tag 'ia64-3.5-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        [IA64] Liberate the signal layer from IA64 assembler
        [IA64] Add cmpxchg.h to exported userspace headers
        [IA64] Fix fast syscall version of getcpu()
        [IA64] Removed "task_size" element from thread_struct - it is now constant
      3813d402
    • Linus Torvalds's avatar
      Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2335a836
      Linus Torvalds authored
      Pull x86 reboot changes from Ingo Molnar:
       "The biggest change is a gentler method of rebooting/stopping via IRQs
        first and then via NMIs.  There are several cleanups in the tree as
        well."
      
      * 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/reboot: Update nonmi_ipi parameter
        x86/reboot: Use NMI to assist in shutting down if IRQ fails
        Revert "x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus"
        x86/reboot: Clean up coding style
        x86/reboot: Reduce to a single DMI table for reboot quirks
      2335a836
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 44bc40e1
      Linus Torvalds authored
      Pull x86 platform changes from Ingo Molnar:
       "This tree includes assorted platform driver updates and a preparatory
        series for a platform with custom DMA remapping semantics (sta2x11 I/O
        hub)."
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/vsmp: Fix number of CPUs when vsmp is disabled
        keyboard: Use BIOS Keyboard variable to set Numlock
        x86/olpc/xo1/sci: Report RTC wakeup events
        x86/olpc/xo1/sci: Produce wakeup events for buttons and switches
        x86, platform: Initial support for sta2x11 I/O hub
        x86: Introduce CONFIG_X86_DMA_REMAP
        x86-32: Introduce CONFIG_X86_DEV_DMA_OPS
      44bc40e1
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 02171b4a
      Linus Torvalds authored
      Pull x86 mm changes from Ingo Molnar:
       "This tree includes a micro-optimization that avoids cr3 switches
        during idling; it fixes corner cases and there's also small cleanups"
      
      Fix up trivial context conflict with the percpu_xx -> this_cpu_xx
      changes.
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix accounting in kernel_physical_mapping_init()
        x86/tlb: Clean up and unify TLB_FLUSH_ALL definition
        x86: Drop obsolete ARCH_BOOTMEM support
        x86, tlb: Switch cr3 in leave_mm() only when needed
        x86/mm: Fix the size calculation of mapping tables
      02171b4a
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 70311aaa
      Linus Torvalds authored
      Pull MCE updates from Ingo Molnar:
       "This tree updates/fixes MCE hardware support, it makes the APIC LVT
        thresholding interrupt optional because a subset of AMD F15h models
        don't support it."
      
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, MCE, AMD: Disable error thresholding bank 4 on some models
        x86, MCE, AMD: Hide interrupt_enable sysfs node
        x86, MCE, AMD: Make APIC LVT thresholding interrupt optional
      70311aaa
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ec0d7f18
      Linus Torvalds authored
      Pull fpu state cleanups from Ingo Molnar:
       "This tree streamlines further aspects of FPU handling by eliminating
        the prepare_to_copy() complication and moving that logic to
        arch_dup_task_struct().
      
        It also fixes the FPU dumps in threaded core dumps, removes and old
        (and now invalid) assumption plus micro-optimizes the exit path by
        avoiding an FPU save for dead tasks."
      
      Fixed up trivial add-add conflict in arch/sh/kernel/process.c that came
      in because we now do the FPU handling in arch_dup_task_struct() rather
      than the legacy (and now gone) prepare_to_copy().
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, fpu: drop the fpu state during thread exit
        x86, xsave: remove thread_has_fpu() bug check in __sanitize_i387_state()
        coredump: ensure the fpu state is flushed for proper multi-threaded core dump
        fork: move the real prepare_to_copy() users to arch_dup_task_struct()
      ec0d7f18
    • Linus Torvalds's avatar
      Merge branch 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 269af9a1
      Linus Torvalds authored
      Pull exception table generation updates from Ingo Molnar:
       "The biggest change here is to allow the build-time sorting of the
        exception table, to speed up booting.  This is achieved by the
        architecture enabling BUILDTIME_EXTABLE_SORT.  This option is enabled
        for x86 and MIPS currently.
      
        On x86 a number of fixes and changes were needed to allow build-time
        sorting of the exception table, in particular a relocation invariant
        exception table format was needed.  This required the abstracting out
        of exception table protocol and the removal of 20 years of accumulated
        assumptions about the x86 exception table format.
      
        While at it, this tree also cleans up various other aspects of
        exception handling, such as early(er) exception handling for
        rdmsr_safe() et al.
      
        All in one, as the result of these changes the x86 exception code is
        now pretty nice and modern.  As an added bonus any regressions in this
        code will be early and violent crashes, so if you see any of those,
        you'll know whom to blame!"
      
      Fix up trivial conflicts in arch/{mips,x86}/Kconfig files due to nearby
      modifications of other core architecture options.
      
      * 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (35 commits)
        Revert "x86, extable: Disable presorted exception table for now"
        scripts/sortextable: Handle relative entries, and other cleanups
        x86, extable: Switch to relative exception table entries
        x86, extable: Disable presorted exception table for now
        x86, extable: Add _ASM_EXTABLE_EX() macro
        x86, extable: Remove open-coded exception table entries in arch/x86/ia32/ia32entry.S
        x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/xsave.h
        x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/kvm_host.h
        x86, extable: Remove the now-unused __ASM_EX_SEC macros
        x86, extable: Remove open-coded exception table entries in arch/x86/xen/xen-asm_32.S
        x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S
        x86, extable: Remove open-coded exception table entries in arch/x86/lib/usercopy_32.c
        x86, extable: Remove open-coded exception table entries in arch/x86/lib/putuser.S
        x86, extable: Remove open-coded exception table entries in arch/x86/lib/getuser.S
        x86, extable: Remove open-coded exception table entries in arch/x86/lib/csum-copy_64.S
        x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_nocache_64.S
        x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_64.S
        x86, extable: Remove open-coded exception table entries in arch/x86/lib/checksum_32.S
        x86, extable: Remove open-coded exception table entries in arch/x86/kernel/test_rodata.c
        x86, extable: Remove open-coded exception table entries in arch/x86/kernel/entry_64.S
        ...
      269af9a1
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8ca038dc
      Linus Torvalds authored
      Pull x86 EFI updates from Ingo Molnar:
       "This patchset makes changes to the bzImage EFI header, so that it can
        be signed with a secure boot signature tool.  It should not affect
        anyone who is not using the EFI self-boot feature in any way."
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: Fix NumberOfRvaAndSizes field in PE32 header for EFI_STUB
        x86, efi: Fix .text section overlapping image header for EFI_STUB
        x86, efi: Fix issue of overlapping .reloc section for EFI_STUB
      8ca038dc
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e7b30a17
      Linus Torvalds authored
      Pull x86/urgent branch from Ingo Molnar:
       "These are the fixes left over from the very end of the v3.4
        stabilization cycle, plus one more fix."
      
      Ugh.  Those KERN_CONT additions are just pointless.  I think they came
      as a reaction to some of the early (broken) printk() work - but that was
      fixed before it was merged.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, relocs: Build clean fix
        x86, printk: Add missing KERN_CONT to NMI selftest
        x86: Fix boot on Twinhead H12Y
      e7b30a17
    • Linus Torvalds's avatar
      Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus',... · 19bec32d
      Linus Torvalds authored
      Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-linus', 'x86-debug-for-linus' and 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull initial trivial x86 stuff from Ingo Molnar.
      
      Various random cleanups and trivial fixes.
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Eliminate dead ia32 syscall handlers
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage
        x86: Don't continue booting if we can't load the specified initrd
        x86: kernel/dumpstack.c simple_strtoul cleanup
        x86: kernel/check.c simple_strtoul cleanup
        debug: Add CONFIG_READABLE_ASM
        x86: spinlock.h: Remove REG_PTR_MODE
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cache_info: Fix setup of l2/l3 ids
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Avoid double stack traces with show_regs()
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode: microcode_core.c simple_strtoul cleanup
      19bec32d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel · 514b1923
      Linus Torvalds authored
      Pull Hexagon architecture changes from Richard Kuo:
       "These are mostly cleanups and feedback remaining from the original
        upstreaming."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
        various Kconfig cleanup and old platform build code removal
        hexagon/mm/vm_fault.c: Port OOM changes to do_page_fault
        arch/hexagon/kernel/dma.c: make function static
        Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h
        Hexagon: Use resource_size function
      514b1923
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 6f73b362
      Linus Torvalds authored
      Pull powerpc updates from Benjamin Herrenschmidt:
       "Here are the powerpc goodies for 3.5.  Main highlights are:
      
         - Support for the NX crypto engine in Power7+
         - A bunch of Anton goodness, including some micro optimization of our
           syscall entry on Power7
         - I converted a pile of our thermal control drivers to the new i2c
           APIs (essentially turning the old therm_pm72 into a proper set of
           windfarm drivers).  That's one more step toward removing the
           deprecated i2c APIs, there's still a few drivers to fix, but we are
           getting close
         - kexec/kdump support for 47x embedded cores
      
        The big missing thing here is no updates from Freescale.  Not sure
        what's up here, but with Kumar not working for them anymore things are
        a bit in a state of flux in that area."
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)
        powerpc: Fix irq distribution
        Revert "powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags"
        powerpc: Fixing a cputhread code documentation
        powerpc/crypto: Enable the PFO-based encryption device
        powerpc/crypto: Build files for the nx device driver
        powerpc/crypto: debugfs routines and docs for the nx device driver
        powerpc/crypto: SHA512 hash routines for nx encryption
        powerpc/crypto: SHA256 hash routines for nx encryption
        powerpc/crypto: AES-XCBC mode routines for nx encryption
        powerpc/crypto: AES-GCM mode routines for nx encryption
        powerpc/crypto: AES-ECB mode routines for nx encryption
        powerpc/crypto: AES-CTR mode routines for nx encryption
        powerpc/crypto: AES-CCM mode routines for nx encryption
        powerpc/crypto: AES-CBC mode routines for nx encryption
        powerpc/crypto: nx driver code supporting nx encryption
        powerpc/pseries: Enable the PFO-based RNG accelerator
        powerpc/pseries/hwrng: PFO-based hwrng driver
        powerpc/pseries: Add PFO support to the VIO bus
        powerpc/pseries: Add pseries update notifier for OFDT prop changes
        powerpc/pseries: Add new hvcall constants to support PFO
        ...
      6f73b362
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 3a8580f8
      Linus Torvalds authored
      Pull UML updates from Richard Weinberger:
       "Most changes are bug fixes and cleanups"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: missing checks of __put_user()/__get_user() return values
        um: stub_rt_sigsuspend isn't needed these days anymore
        um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h
        irq: Remove irq_chip->release()
        um: Remove CONFIG_IRQ_RELEASE_METHOD
        um: Remove usage of irq_chip->release()
        um: Implement um_free_irq()
        um: Fix __swp_type()
        um: Implement a custom pte_same() function
        um: Add BUG() to do_ops()'s error path
        um: Remove unused variables
        um: bury unused _TIF_RESTORE_SIGMASK
        um: wrong sigmask saved in case of multiple sigframes
        um: add TIF_NOTIFY_RESUME
        um: ->restart_block.fn needs to be reset on sigreturn
      3a8580f8
    • Linus Torvalds's avatar
      Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh · 1d767cae
      Linus Torvalds authored
      Pull SuperH updates from Paul Mundt:
       - New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A)
       - New boards: RSK2+SH7264, RSK2+SH7269
       - Unbreaking kgdb for SMP
       - Consolidation of _32/_64 page fault handling.
       - watchdog and legacy DMA chainsawing, part 1
       - Conversion to evt2irq() hwirq lookup, to support relocation of
         vectored IRQs for irqdomains.
      
      * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (98 commits)
        sh: intc: Kill off special reservation interface.
        sh: Enable PIO API for hp6xx and se770x.
        sh: Kill off machvec IRQ hinting.
        sh: dma: More legacy cpu dma chainsawing.
        sh: Kill off MAX_DMA_ADDRESS leftovers.
        sh: Tidy up some of the cpu legacy dma header mess.
        sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.
        sh64: Fix up vmalloc fault range check.
        Revert "sh: Ensure fixmap and store queue space can co-exist."
        serial: sh-sci: Fix for port types without BRI interrupts.
        sh: legacy PCI evt2irq migration.
        sh: cpu dma evt2irq migration.
        sh: sh7763rdp evt2irq migration.
        sh: sdk7780 evt2irq migration.
        sh: migor evt2irq migration.
        sh: landisk evt2irq migration.
        sh: kfr2r09 evt2irq migration.
        sh: ecovec24 evt2irq migration.
        sh: ap325rxa evt2irq migration.
        sh: urquell evt2irq migration.
        ...
      1d767cae
    • Jiri Olsa's avatar
      Revert "sched, perf: Use a single callback into the scheduler" · ab0cce56
      Jiri Olsa authored
      This reverts commit cb04ff9a ("sched, perf: Use a single
      callback into the scheduler").
      
      Before this change was introduced, the process switch worked
      like this (wrt. to perf event schedule):
      
           schedule (prev, next)
             - schedule out all perf events for prev
             - switch to next
             - schedule in all perf events for current (next)
      
      After the commit, the process switch looks like:
      
           schedule (prev, next)
             - schedule out all perf events for prev
             - schedule in all perf events for (next)
             - switch to next
      
      The problem is, that after we schedule perf events in, the pmu
      is enabled and we can receive events even before we make the
      switch to next - so "current" still being prev process (event
      SAMPLE data are filled based on the value of the "current"
      process).
      
      Thats exactly what we see for test__PERF_RECORD test. We receive
      SAMPLES with PID of the process that our tracee is scheduled
      from.
      
      Discussed with Peter Zijlstra:
      
       > Bah!, yeah I guess reverting is the right thing for now. Sad
       > though.
       >
       > So by having the two hooks we have a black-spot between them
       > where we receive no events at all, this black-spot covers the
       > hand-over of current and we thus don't receive the 'wrong'
       > events.
       >
       > I rather liked we could do away with both that black-spot and
       > clean up the code a little, but apparently people rely on it.
      Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
      Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: acme@redhat.com
      Cc: paulus@samba.org
      Cc: cjashfor@linux.vnet.ibm.com
      Cc: fweisbec@gmail.com
      Cc: eranian@google.com
      Link: http://lkml.kernel.org/r/20120523111302.GC1638@m.brq.redhat.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      ab0cce56
    • Jesper Juhl's avatar
    • Mark Brown's avatar
      regmap: Use select .. if to get IRQ_DOMAIN enabled · 18d5eacb
      Mark Brown authored
      Ensure that we can't get randconfig breakage by doing the IRQ_DOMAIN
      select automatically. Don't just do the select from REGMAP_IRQ to ensure
      that the select actually gets noticed.
      Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      18d5eacb
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 61011677
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "This set includes some minor fixes and improvements.  The one large
        patch addresses the special "nodir" mode, which has been a long
        neglected proof of concept, but with these fixes seems to be quite
        usable.  It allows the resource master to be assigned statically
        instead of dynamically, which can improve performance if there is
        little locality and most resources are shared."
      
      * tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: NULL dereference on failure in kmem_cache_create()
        gfs2: fix recovery during unmount
        dlm: fixes for nodir mode
        dlm: improve error and debug messages
        dlm: avoid unnecessary search in search_rsb
        dlm: limit rcom debug messages
        dlm: fix waiter recovery
        dlm: prevent connections during shutdown
      61011677
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifs · 6133308a
      Linus Torvalds authored
      Pull UBI and UBIFS updates from Artem Bityutskiy:
      
      UBIFS:
         * Always support xattrs    (remove the Kconfig option)
         * Always support debugging (remove the Kconfig option)
         * A fix for a memory leak on error path
         * A number of clean-ups
      UBI:
         * Always support debugging (remove the Kconfig option)
         * Remove "data type" hint support
         * Huge amount of renames to prepare for the fastmap wor
         * A lot of clean-ups
      
      * tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifs: (54 commits)
        UBI: modify ubi_wl_flush function to clear work queue for a lnum
        UBI: introduce UBI_ALL constant
        UBI: add lnum and vol_id to struct ubi_work
        UBI: add volume id struct ubi_ainf_peb
        UBI: add in hex the value for UBI_INTERNAL_VOL_START to comment
        UBI: rename scan.c to attach.c
        UBI: remove scan.h
        UBI: rename UBI_SCAN_UNKNOWN_EC
        UBI: move and rename attach_by_scanning
        UBI: rename _init_scan functions
        UBI: amend comments after all the renamings
        UBI: rename ubi_scan_leb_slab
        UBI: rename ubi_scan_move_to_list
        UBI: rename ubi_scan_destroy_ai
        UBI: rename ubi_scan_get_free_peb
        UBI: rename ubi_scan_rm_volume
        UBI: rename ubi_scan_find_av
        UBI: rename ubi_scan_add_used
        UBI: remove unused function
        UBI: make ubi_scan_erase_peb static and rename
        ...
      6133308a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · e8650a08
      Linus Torvalds authored
      Pull trivial updates from Jiri Kosina:
       "As usual, it's mostly typo fixes, redundant code elimination and some
        documentation updates."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
        edac, mips: don't change code that has been removed in edac/mips tree
        xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
        lib: Change mail address of Oskar Schirmer
        net: Change mail address of Oskar Schirmer
        arm/m68k: Change mail address of Sebastian Hess
        i2c: Change mail address of Oskar Schirmer
        net: Fix tcp_build_and_update_options comment in struct tcp_sock
        atomic64_32.h: fix parameter naming mismatch
        Kconfig: replace "--- help ---" with "---help---"
        c2port: fix bogus Kconfig "default no"
        edac: Fix spelling errors.
        qla1280: Remove redundant NULL check before release_firmware() call
        remoteproc: remove redundant NULL check before release_firmware()
        qla2xxx: Remove redundant NULL check before release_firmware() call.
        aic94xx: Get rid of redundant NULL check before release_firmware() call
        tehuti: delete redundant NULL check before release_firmware()
        qlogic: get rid of a redundant test for NULL before call to release_firmware()
        bna: remove redundant NULL test before release_firmware()
        tg3: remove redundant NULL test before release_firmware() call
        typhoon: get rid of redundant conditional before all to release_firmware()
        ...
      e8650a08
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 3c2c4b73
      Linus Torvalds authored
      Pull HID subsystem updates from Jiri Kosina:
       "Apart from various driver updates and added support for a number of
        new devices (mostly multitouch ones, but not limited to), there is one
        change that is worth pointing out explicitly: creation of HID device
        groups and proper autoloading of hid-multitouch, implemented by Henrik
        Rydberg."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (50 commits)
        HID: wacom: fix build breakage without CONFIG_LEDS_CLASS
        HID: waltop: Extend barrel button fix
        HID: hyperv: Set the hid drvdata correctly
        HID: wacom: Unify speed setting
        HID: wacom: Add speed setting for Intuos4 WL
        HID: wacom: Move Graphire raport header check.
        HID: uclogic: Add support for UC-Logic TWHL850
        HID: explain the signed/unsigned handling in hid_add_field()
        HID: handle logical min/max signedness properly in parser
        HID: logitech: read all 32 bits of report type bitfield
        HID: wacom: Add LED selector control for Wacom Intuos4 WL
        HID: hid-multitouch: fix wrong protocol detection
        HID: wiimote: Fix IR data parser
        HID: wacom: Add tilt reporting for Intuos4 WL
        HID: multitouch: MT interface matching for Baanto
        HID: hid-multitouch: Only match MT interfaces
        HID: Create a common generic driver
        HID: hid-multitouch: Switch to device groups
        HID: Create a generic device group
        HID: Allow bus wildcard matching
        ...
      3c2c4b73
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f08b9c2f
      Linus Torvalds authored
      Pull x86/apic changes from Ingo Molnar:
       "Most of the changes are about helping virtualized guest kernels
        achieve better performance."
      
      Fix up trivial conflicts with the iommu updates to arch/x86/kernel/apic/io_apic.c
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/apic: Implement EIO micro-optimization
        x86/apic: Add apic->eoi_write() callback
        x86/apic: Use symbolic APIC_EOI_ACK
        x86/apic: Fix typo EIO_ACK -> EOI_ACK and document it
        x86/xen/apic: Add missing #include <xen/xen.h>
        x86/apic: Only compile local function if used with !CONFIG_GENERIC_PENDING_IRQ
        x86/apic: Fix UP boot crash
        x86: Conditionally update time when ack-ing pending irqs
        xen/apic: implement io apic read with hypercall
        Revert "xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'"
        xen/x86: Implement x86_apic_ops
        x86/apic: Replace io_apic_ops with x86_io_apic_ops.
      f08b9c2f
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d79ee93d
      Linus Torvalds authored
      Pull scheduler changes from Ingo Molnar:
       "The biggest change is the cleanup/simplification of the load-balancer:
        instead of the current practice of architectures twiddling scheduler
        internal data structures and providing the scheduler domains in
        colorfully inconsistent ways, we now have generic scheduler code in
        kernel/sched/core.c:sched_init_numa() that looks at the architecture's
        node_distance() parameters and (while not fully trusting it) deducts a
        NUMA topology from it.
      
        This inevitably changes balancing behavior - hopefully for the better.
      
        There are various smaller optimizations, cleanups and fixlets as well"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Taint kernel with TAINT_WARN after sleep-in-atomic bug
        sched: Remove stale power aware scheduling remnants and dysfunctional knobs
        sched/debug: Fix printing large integers on 32-bit platforms
        sched/fair: Improve the ->group_imb logic
        sched/nohz: Fix rq->cpu_load[] calculations
        sched/numa: Don't scale the imbalance
        sched/fair: Revert sched-domain iteration breakage
        sched/x86: Rewrite set_cpu_sibling_map()
        sched/numa: Fix the new NUMA topology bits
        sched/numa: Rewrite the CONFIG_NUMA sched domain support
        sched/fair: Propagate 'struct lb_env' usage into find_busiest_group
        sched/fair: Add some serialization to the sched_domain load-balance walk
        sched/fair: Let minimally loaded cpu balance the group
        sched: Change rq->nr_running to unsigned int
        x86/numa: Check for nonsensical topologies on real hw as well
        x86/numa: Hard partition cpu topology masks on node boundaries
        x86/numa: Allow specifying node_distance() for numa=fake
        x86/sched: Make mwait_usable() heed to "idle=" kernel parameters properly
        sched: Update documentation and comments
        sched_rt: Avoid unnecessary dequeue and enqueue of pushable tasks in set_cpus_allowed_rt()
      d79ee93d
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2ff2b289
      Linus Torvalds authored
      Pull perf changes from Ingo Molnar:
       "Lots of changes:
      
         - (much) improved assembly annotation support in perf report, with
           jump visualization, searching, navigation, visual output
           improvements and more.
      
          - kernel support for AMD IBS PMU hardware features.  Notably 'perf
            record -e cycles:p' and 'perf top -e cycles:p' should work without
            skid now, like PEBS does on the Intel side, because it takes
            advantage of IBS transparently.
      
          - the libtracevents library: it is the first step towards unifying
            tracing tooling and perf, and it also gives a tracing library for
            external tools like powertop to rely on.
      
          - infrastructure: various improvements and refactoring of the UI
            modules and related code
      
          - infrastructure: cleanup and simplification of the profiling
            targets code (--uid, --pid, --tid, --cpu, --all-cpus, etc.)
      
          - tons of robustness fixes all around
      
          - various ftrace updates: speedups, cleanups, robustness
            improvements.
      
          - typing 'make' in tools/ will now give you a menu of projects to
            build and a short help text to explain what each does.
      
          - ... and lots of other changes I forgot to list.
      
        The perf record make bzImage + perf report regression you reported
        should be fixed."
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (166 commits)
        tracing: Remove kernel_lock annotations
        tracing: Fix initial buffer_size_kb state
        ring-buffer: Merge separate resize loops
        perf evsel: Create events initially disabled -- again
        perf tools: Split term type into value type and term type
        perf hists: Fix callchain ip printf format
        perf target: Add uses_mmap field
        ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER
        ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
        ftrace: Make ftrace_modify_all_code() global for archs to use
        ftrace: Return record ip addr for ftrace_location()
        ftrace: Consolidate ftrace_location() and ftrace_text_reserved()
        ftrace: Speed up search by skipping pages by address
        ftrace: Remove extra helper functions
        ftrace: Sort all function addresses, not just per page
        tracing: change CPU ring buffer state from tracing_cpumask
        tracing: Check return value of tracing_dentry_percpu()
        ring-buffer: Reset head page before running self test
        ring-buffer: Add integrity check at end of iter read
        ring-buffer: Make addition of pages in ring buffer atomic
        ...
      2ff2b289
    • Linus Torvalds's avatar
      Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 88d6ae8d
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
       "cgroup file type addition / removal is updated so that file types are
        added and removed instead of individual files so that dynamic file
        type addition / removal can be implemented by cgroup and used by
        controllers.  blkio controller changes which will come through block
        tree are dependent on this.  Other changes include res_counter cleanup
        and disallowing kthread / PF_THREAD_BOUND threads to be attached to
        non-root cgroups.
      
        There's a reported bug with the file type addition / removal handling
        which can lead to oops on cgroup umount.  The issue is being looked
        into.  It shouldn't cause problems for most setups and isn't a
        security concern."
      
      Fix up trivial conflict in Documentation/feature-removal-schedule.txt
      
      * 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)
        res_counter: Account max_usage when calling res_counter_charge_nofail()
        res_counter: Merge res_counter_charge and res_counter_charge_nofail
        cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads
        cgroup: remove cgroup_subsys->populate()
        cgroup: get rid of populate for memcg
        cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
        cgroup: make css->refcnt clearing on cgroup removal optional
        cgroup: use negative bias on css->refcnt to block css_tryget()
        cgroup: implement cgroup_rm_cftypes()
        cgroup: introduce struct cfent
        cgroup: relocate __d_cgrp() and __d_cft()
        cgroup: remove cgroup_add_file[s]()
        cgroup: convert memcg controller to the new cftype interface
        memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP
        cgroup: convert all non-memcg controllers to the new cftype interface
        cgroup: relocate cftype and cgroup_subsys definitions in controllers
        cgroup: merge cft_release_agent cftype array into the base files array
        cgroup: implement cgroup_add_cftypes() and friends
        cgroup: build list of all cgroups under a given cgroupfs_root
        cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()
        ...
      88d6ae8d
    • Linus Torvalds's avatar
      Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · f5c10189
      Linus Torvalds authored
      Pull percpu updates from Tejun Heo:
       "Contains Alex Shi's three patches to remove percpu_xxx() which overlap
        with this_cpu_xxx().  There shouldn't be any functional change."
      
      * 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: remove percpu_xxx() functions
        x86: replace percpu_xxx funcs with this_cpu_xxx
        net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx
      f5c10189
    • Linus Torvalds's avatar
      Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · c54894cd
      Linus Torvalds authored
      Pull workqueue changes from Tejun Heo:
       "Nothing exciting.  Most are updates to debug stuff and related fixes.
        Two not-too-critical bugs are fixed - WARN_ON() triggering spurious
        during cpu offlining and unlikely lockdep related oops."
      
      * 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        lockdep: fix oops in processing workqueue
        workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active
        workqueue: Catch more locking problems with flush_work()
        workqueue: change BUG_ON() to WARN_ON()
        trace: Remove unused workqueue tracer
      c54894cd
  2. 22 May, 2012 6 commits
    • Richard Kuo's avatar
    • Kautuk Consul's avatar
      hexagon/mm/vm_fault.c: Port OOM changes to do_page_fault · 393a86af
      Kautuk Consul authored
      Commit d065bd81
      (mm: retry page fault when blocking on disk transfer) and
      commit 37b23e05
      (x86,mm: make pagefault killable)
      
      The above commits introduced changes into the x86 pagefault handler
      for making the page fault handler retryable as well as killable.
      
      These changes reduce the mmap_sem hold time, which is crucial
      during OOM killer invocation.
      
      Port these changes to hexagon.
      Signed-off-by: default avatarKautuk Consul <consul.kautuk@gmail.com>
      Signed-off-by: default avatarRichard Kuo <rkuo@codeaurora.org>
      393a86af
    • Julia Lawall's avatar
      arch/hexagon/kernel/dma.c: make function static · 222c547e
      Julia Lawall authored
      This function is only used in the same file, and the other similar
      functions in this file are also static.
      Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
      [rkuo@codeaurora.org: adjusted patch to apply to latest]
      Signed-off-by: default avatarRichard Kuo <rkuo@codeaurora.org>
      222c547e
    • Jesper Juhl's avatar
      Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h · bfd46276
      Jesper Juhl authored
      "make versioncheck" points out that arch/hexagon/include/asm/spinlock_types.h
      does not need to include version.h .
      A quick look at the file seems to confirm its findings, so here's a patch that
      removes the include.
      Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
      Signed-off-by: default avatarRichard Kuo <rkuo@codeaurora.org>
      bfd46276
    • Thomas Meyer's avatar
      Hexagon: Use resource_size function · 3c0f13bc
      Thomas Meyer authored
       Use resource_size function on resource object
       instead of explicit computation.
      
       The semantic patch that makes this change is available
       in scripts/coccinelle/api/resource_size.cocci.
      
       More information about semantic patching is available at
       http://coccinelle.lip6.fr/Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
      Signed-off-by: default avatarRichard Kuo <rkuo@codeaurora.org>
      3c0f13bc
    • Linus Torvalds's avatar
      Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · fb09bafd
      Linus Torvalds authored
      Pull staging tree changes from Greg Kroah-Hartman:
       "Here is the big staging tree pull request for the 3.5-rc1 merge
        window.
      
        Loads of changes here, and we just narrowly added more lines than we
        added:
         622 files changed, 28356 insertions(+), 26059 deletions(-)
      
        But, good news is that there is a number of subsystems that moved out
        of the staging tree, to their respective "real" portions of the
        kernel.
      
        Code that moved out was:
      	- iio core code
      	- mei driver
      	- vme core and bridge drivers
      
        There was one broken network driver that moved into staging as a step
        before it is removed from the tree (pc300), and there was a few new
        drivers added to the tree:
      	- new iio drivers
      	- gdm72xx wimax USB driver
      	- ipack subsystem and 2 drivers
      
        All of the movements around have acks from the various subsystem
        maintainers, and all of this has been in the linux-next tree for a
        while.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      Fixed up various trivial conflicts, along with a non-trivial one found
      in -next and pointed out by Olof Johanssen: a clean - but incorrect -
      merge of the arch/arm/boot/dts/at91sam9g20.dtsi file.  Fix up manually
      as per Stephen Rothwell.
      
      * tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
        Staging: bcm: Remove two unused variables from Adapter.h
        Staging: bcm: Removes the volatile type definition from Adapter.h
        Staging: bcm: Rename all "INT" to "int" in Adapter.h
        Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
        Staging: bcm: Correctly format all comments in Adapter.h
        Staging: bcm: Fix all whitespace issues in Adapter.h
        Staging: bcm: Properly format braces in Adapter.h
        Staging: ipack/bridges/tpci200: remove unneeded casts
        Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
        Staging: ipack: remove board_name and bus_name fields from struct ipack_device
        Staging: ipack: improve the register of a bus and a device in the bus.
        staging: comedi: cleanup all the comedi_driver 'detach' functions
        staging: comedi: remove all 'default N' in Kconfig
        staging: line6/config.h: Delete unused header
        staging: gdm72xx depends on NET
        staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
        staging: drm/omap: initial dmabuf/prime import support
        staging: drm/omap: dmabuf/prime mmap support
        pstore/ram: Add ECC support
        pstore/ram: Switch to persistent_ram routines
        ...
      fb09bafd