1. 21 2月, 2013 14 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · e177bb58
      Linus Torvalds 提交于
      Pull m68k update from Geert Uytterhoeven.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
        swim: Add missing spinlock init
      e177bb58
    • L
      Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 55529fa5
      Linus Torvalds 提交于
      Pull EDAC updates from Borislav Petkov:
       "Mostly AMD's side of EDAC.  It is basically a new family enablement
        stuff: AMD F16h MCE decoding enablement from Jacob Shin.  The rest is
        trivial cleanups."
      
      * tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        mpc85xx_edac: Fix typo
        EDAC, MCE, AMD: Remove unneeded exports
        EDAC, MCE, AMD: Add MCE decoding support for Family 16h
        EDAC, MCE, AMD: Make MC2 decoding per-family
        amd64_edac: Remove dead code
      55529fa5
    • L
      Merge tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8793422f
      Linus Torvalds 提交于
      Pull ACPI and power management updates from Rafael Wysocki:
      
       - Rework of the ACPI namespace scanning code from Rafael J.  Wysocki
         with contributions from Bjorn Helgaas, Jiang Liu, Mika Westerberg,
         Toshi Kani, and Yinghai Lu.
      
       - ACPI power resources handling and ACPI device PM update from Rafael
         J Wysocki.
      
       - ACPICA update to version 20130117 from Bob Moore and Lv Zheng with
         contributions from Aaron Lu, Chao Guan, Jesper Juhl, and Tim Gardner.
      
       - Support for Intel Lynxpoint LPSS from Mika Westerberg.
      
       - cpuidle update from Len Brown including Intel Haswell support, C1
         state for intel_idle, removal of global pm_idle.
      
       - cpuidle fixes and cleanups from Daniel Lezcano.
      
       - cpufreq fixes and cleanups from Viresh Kumar and Fabio Baltieri with
         contributions from Stratos Karafotis and Rickard Andersson.
      
       - Intel P-states driver for Sandy Bridge processors from Dirk
         Brandewie.
      
       - cpufreq driver for Marvell Kirkwood SoCs from Andrew Lunn.
      
       - cpufreq fixes related to ordering issues between acpi-cpufreq and
         powernow-k8 from Borislav Petkov and Matthew Garrett.
      
       - cpufreq support for Calxeda Highbank processors from Mark Langsdorf
         and Rob Herring.
      
       - cpufreq driver for the Freescale i.MX6Q SoC and cpufreq-cpu0 update
         from Shawn Guo.
      
       - cpufreq Exynos fixes and cleanups from Jonghwan Choi, Sachin Kamat,
         and Inderpal Singh.
      
       - Support for "lightweight suspend" from Zhang Rui.
      
       - Removal of the deprecated power trace API from Paul Gortmaker.
      
       - Assorted updates from Andreas Fleig, Colin Ian King, Davidlohr Bueso,
         Joseph Salisbury, Kees Cook, Li Fei, Nishanth Menon, ShuoX Liu,
         Srinivas Pandruvada, Tejun Heo, Thomas Renninger, and Yasuaki
         Ishimatsu.
      
      * tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (267 commits)
        PM idle: remove global declaration of pm_idle
        unicore32 idle: delete stray pm_idle comment
        openrisc idle: delete pm_idle
        mn10300 idle: delete pm_idle
        microblaze idle: delete pm_idle
        m32r idle: delete pm_idle, and other dead idle code
        ia64 idle: delete pm_idle
        cris idle: delete idle and pm_idle
        ARM64 idle: delete pm_idle
        ARM idle: delete pm_idle
        blackfin idle: delete pm_idle
        sparc idle: rename pm_idle to sparc_idle
        sh idle: rename global pm_idle to static sh_idle
        x86 idle: rename global pm_idle to static x86_idle
        APM idle: register apm_cpu_idle via cpuidle
        cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
        cpufreq / intel_pstate: Change to disallow module build
        tools/power turbostat: display SMI count by default
        intel_idle: export both C1 and C1E
        ACPI / hotplug: Fix concurrency issues and memory leaks
        ...
      8793422f
    • L
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · b3cdda2b
      Linus Torvalds 提交于
      Pull device tree changes from Grant Likely:
       "All around device tree changes destined for v3.8.  Aside from the
        documentation updates the highlights in this branch include:
      
         - Kbuild changes for using CPP with .dts files
         - locking fix from preempt_rt patchset
         - include DT alias names in device uevent
         - Selftest bugfixes and improvements
         - New function for counting phandles stanzas in a property
         - constify argument to of_node_full_name()
         - Various bug fixes
      
        This tree did also contain a commit to use platform_device_add instead
        of open-coding the device add code, but it caused problems with amba
        devices and needed to be reverted."
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits)
        Revert "of: use platform_device_add"
        kbuild: limit dtc+cpp include path
        gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
        of: Create function for counting number of phandles in a property
        of/base: Clean up exit paths for of_parse_phandle_with_args()
        of/selftest: Use selftest() macro throughout
        of/selftest: Fix GPIOs selftest to cover the 7th case
        of: fix recursive locking in of_get_next_available_child()
        documentation/devicetree: Fix a typo in exynos-dw-mshc.txt
        OF: convert devtree lock from rw_lock to raw spinlock
        of/exynos_g2d: Add Bindings for exynos G2D driver
        kbuild: create a rule to run the pre-processor on *.dts files
        input: Extend matrix-keypad device tree binding
        devicetree: Move NS2 LEDs binding into LEDs directory
        of: use platform_device_add
        powerpc/5200: Fix size to request_mem_region() call
        documentation/devicetree: Fix typos
        of: add 'const' to of_node_full_name parameter
        of: Output devicetree alias names in uevent
        DT: add vendor prefixes for Renesas and Toshiba
        ...
      b3cdda2b
    • L
      Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux · 3aad3f03
      Linus Torvalds 提交于
      Pull SPI changes from Grant Likely:
       "Changes to both core spi code and spi device drivers.  The driver
        changes are the usual set of bug fixes and platform enablement.
      
        Core code changes include:
      
         - More intelligent assignment of SPI bus numbers when using DT
      
         - Common mechanism for using gpios as CS lines
      
         - Pull checks for bits_per_word and transfer speed out of drivers and
           into core code
      
         - Ensure temporary DMA buffers are DMA safe"
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux: (50 commits)
        spi: Document cs_gpios and cs_gpio in kernel-doc
        spi/of: Fix initialization of cs_gpios array
        spi/pxa2xx: add support for Lynxpoint SPI controllers
        spi/pxa2xx: add support for Intel Low Power Subsystem SPI
        spi/pxa2xx: add support for SPI_LOOP
        spi/pxa2xx: add support for runtime PM
        spi/pxa2xx: add support for DMA engine
        spi/pxa2xx: break out the private DMA API usage into a separate file
        spi/ath79: add shutdown handler
        spi/mips-lantiq: set SPI_MASTER_HALF_DUPLEX flag
        spi/mips-lantiq: make use of spi_finalize_current_message
        spi/bcm63xx: work around inability to keep CS up
        spi/davinci: use request_threaded_irq() to fix deadlock
        spi/orion: Use module_platform_driver()
        spi/bcm63xx: reject transfers unable to transfer
        spi: Ensure memory used for spi_write_then_read() is DMA safe
        spi/spi-mpc512x-psc: init mode bits supported by the driver
        spi/mpc512x-psc: don't use obsolet cell-index property
        spi: Remove erroneous __init, __exit and __exit_p() references in drivers
        spi/s3c64xx: fix checkpatch warnings and error
        ...
      3aad3f03
    • L
      Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux · 10b6339e
      Linus Torvalds 提交于
      Pull clock framework update from Michael Turquette:
       "The common clock framework changes for 3.9 are almost entirely fixes.
      
        None are dire enough to be Cc'd to stable which may be interpreted to
        mean that users of the framework are reaching stability.  Lots of new
        adoption of this framework is via DeviceTree data and that comes
        through the respective architecture and platform trees instead of
        through the clk framework tree.
      
        Two new features are improved debugfs output and an improvement to how
        DT clocks are initialized by reusing a common method."
      
      * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (25 commits)
        clk: sunxi: remove stale Makefile entry
        clk: vexpress: Use common of_clk_init() function
        clk: zynq: Use common of_clk_init() function
        clk: vt8500: Use common of_clk_init() function
        clk: highbank: Use common of_clk_init() function
        clk: sunxi: Use common of_clk_init() function
        clk: add common of_clk_init() function
        clk: Deduplicate exit code in clk_set_rate
        clk: beautify Makefile
        clk-divider: fix macros
        clk: prima2: enable dt-binding clkdev mapping
        clk: mxs: Index is always positive
        clk: max77686: Avoid double free at remove time
        clk: remove exported function from __init section
        clk: vt8500: Add support for WM8750/WM8850 PLL clocks
        clk: vt8500: Fix division-by-0 when requested rate=0
        clk: vt8500: Fix device clock divisor calculations
        clk: vt8500: Fix error in PLL calculations on non-exact match.
        clk: max77686: Remove unnecessary NULL checking for container_of()
        clk: JSON debugfs clock tree summary
        ...
      10b6339e
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · c6699b58
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "Two new touchpad drivers - Cypress APA I2C Trackpad and Cypress PS/2
        touchpad and a big update to ALPS driver from Kevin Cernekee that adds
        support for "Rushmore" touchpads and paves way for adding support for
        "Dolphin" touchpads.
      
        There is also a new input driver for Goldfish emulator and also
        Android keyreset driver was folded into SysRq code.
      
        A few more drivers were updated with device tree bindings and others
        got some small cleanups and fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits)
        Input: cyttsp-spi - remove duplicate MODULE_ALIAS()
        Input: tsc2005 - add MODULE_ALIAS
        Input: tegra-kbc - require CONFIG_OF, remove platform data
        Input: synaptics - initialize pointer emulation usage
        Input: MT - do not apply filtering on emulated events
        Input: bma150 - make some defines public and fix some comments
        Input: bma150 - fix checking pm_runtime_get_sync() return value
        Input: ALPS - enable trackstick on Rushmore touchpads
        Input: ALPS - add support for "Rushmore" touchpads
        Input: ALPS - make the V3 packet field decoder "pluggable"
        Input: ALPS - move pixel and bitmap info into alps_data struct
        Input: ALPS - fix command mode check
        Input: ALPS - rework detection of Pinnacle AGx touchpads
        Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults()
        Input: ALPS - use function pointers for different protocol handlers
        Input: ALPS - rework detection sequence
        Input: ALPS - introduce helper function for repeated commands
        Input: ALPS - move alps_get_model() down below hw_init code
        Input: ALPS - copy "model" info into alps_data struct
        Input: ALPS - document the alps.h data structures
        ...
      c6699b58
    • L
      Merge tag 'for-v3.9' of git://git.infradead.org/battery-2.6 · 5a120391
      Linus Torvalds 提交于
      Pull battery updates from Anton Vorontsov:
       "Four new drivers:
      
         - goldfish_battery:
      
           This is Android Emulator battery driver.  Originally from Google,
           but Intel folks reshaped it for mainline
      
         - pm2301_charger:
      
           A new driver for ST-Ericsson 2301 Power Management chip, uses
           AB8500 battery management core
      
         - qnap-poweroff:
      
           The driver adds poweroff functionality for QNAP NAS boxes
      
         - restart-poweroff:
      
           A generic driver that implements 'power off by restarting'.  The
           actual poweroff functionality is implemented through a bootloader,
           so Linux' task is just to restart the box.  The driver is useful on
           Buffalo Linkstation LS-XHL and LS-CHLv2 boards.  Andrew Lunn worked
           on submitting the driver (as well as qnap-poweroff above).
      
        Additionally:
      
         - A lot of fixes for ab8500 drivers.  This is a part of efforts of
           syncing internal ST-Ericsson development tree with the mainline.
           Lee Jones @ Linaro worked on compilation and reshaping these
           series.
      
         - New health properties for the power supplies: "Watchdog timer
           expire" and "Safety timer expire"
      
         - As usual, a bunch of fixes/cleanups here and there"
      
      * tag 'for-v3.9' of git://git.infradead.org/battery-2.6: (81 commits)
        bq2415x_charger: Add support for offline and 100mA mode
        generic-adc-battery: Fix forever loop in gab_remove()
        goldfish_battery: Add missing GENERIC_HARDIRQS dependency
        da9030_battery: Include notifier.h
        bq27x00_battery: Fix reporting battery temperature
        power/reset: Remove newly introduced __dev* annotations
        lp8727_charger: Small cleanup in naming
        ab8500_btemp: Demote initcall sequence
        ds2782_battery: Add power_supply_changed() calls for proper uevent support
        power: Add battery driver for goldfish emulator
        u8500-charger: Delay for USB enumeration
        ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
        ab8500-charger: Do not touch VBUSOVV bits
        ab8500-fg: Use correct battery charge full design
        pm2301: LPN mode control support
        pm2301: Enable vbat low monitoring
        ab8500-bm: Flush all work queues before suspending
        ab8500-fg: Go to INIT_RECOVERY when charger removed
        ab8500-charger: Add support for autopower on AB8505 and AB9540
        abx500-chargalg: Add new sysfs interface to get current charge status
        ...
      
      Fix up fairly straightforward conflicts in the ab8500 driver.  But since
      it seems to be ARM-specific, I can't even compile-test the result..
      5a120391
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · c560dc87
      Linus Torvalds 提交于
      Pull hwmon updates from Guenter Roeck:
      
       - New drivers for MAX6697 and compatibles and for INA209.
      
       - Added support for IT8771E, IT8772E, MAX34460, MAX34461, MCP98244, and
         ADT7420 to existing drivers.
      
       - Added support for additional attributes to various drivers.
      
       - Replaced SENSORS_LIMIT with clamp_val; retire SENSORS_LIMIT;
      
       - Clean up PMBus code to reduce its size; clean up adt7410 driver.
      
       - A couple of minor bug fixes as well as documentation cleanup.
      
       - Out-of-tree change: Replace SENSORS_LIMIT with clamp_val in
         platform/x86/eeepc-laptop driver.
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (32 commits)
        hwmon: (ntc_thermistor): Fix sparse warnings
        hwmon: (adt7410) Add device table entry for the adt7420
        hwmon: (adt7410) Use I2C_ADDRS helper macro
        hwmon: (adt7410) Use the SIMPLE_DEV_PM_OPS helper macro
        hwmon: (adt7410) Let suspend/resume depend on CONFIG_PM_SLEEP
        hwmon: (adt7410) Clear unwanted bits in the config register
        hwmon: (jc42) Add support for MCP98244
        hwmon: (pmbus) Clean up for code size reduction
        hwmon: (pmbus/max34440) Add support for MAX34460 and MAX34461
        hwmon: (pmbus) Add support for word status register
        hwmon: (pmbus/zl6100) Add support for VMON/VDRV
        hwmon: (pmbus) Add function to clear sensor cache
        hwmon: (pmbus) Add support for additional voltage sensor
        hwmon: (pmbus) Use krealloc to allocate attribute memory
        hwmon: (pmbus) Simplify memory allocation for sensor attributes
        hwmon: (pmbus) Improve boolean handling
        hwmon: (pmbus) Simplify memory allocation for labels and booleans
        hwmon: (pmbus) Use dev variable to represent client->dev
        hwmon: (pmbus) Fix 'Macros with multiple statements' checkpatch error
        hwmon: (pmbus) Drop unnecessary error messages in probe error path
        ...
      c560dc87
    • L
      Merge tag 'pinctrl-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8a3a11f9
      Linus Torvalds 提交于
      Pull pinctrl changes from Linus Walleij:
       "These are the main pinctrl changes for the v3.9 merge window.  The
        most interesting change by far is how the device core grabs pinctrl
        default handles avoiding the need to stick boilerplate into driver
        consumers.
      
         - Grabbing of default pinctrl handles from the device core.  These
           are the hunks hitting drivers/base.  All is ACKed by Greg, after a
           long discussion about different alternatives.
      
         - Some stuff also touches the MFD and ARM SoC trees, this has been
           coordinated and ACKed.
      
         - New drivers for:
           - The Tegra 114 sub-SoC
           - Allwinner sunxi
           - New ABx500 driver and sub-SoC drivers for AB8500, AB8505, AB9540
             and AB8540.
      
         - Make it possible for hogged pins to enter a sleep mode, and make it
           possible for drivers to control that mode.
      
         - Various clean-up, extensions and device tree support to various pin
           controllers."
      
      * tag 'pinctrl-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (68 commits)
        pinctrl: tegra: add clfvs function to Tegra114 support
        pinctrl: generic: rename input schmitt disable
        pinctrl/pinconfig: add debug interface
        pinctrl: samsung: remove duplicated line
        ARM: ux500: use real AB8500 IRQ numbers instead of virtual ones
        ARM: ux500: remove irq_base property from platform_data
        pinctrl/abx500: use direct IRQ defines
        pinctrl/abx500: replace IRQ offsets with table read-in values
        pinctrl/abx500: move IRQ handling to ab8500-core
        pinctrl: exynos5440: remove erroneous __init
        pinctrl/abx500: adjust offset for get_mode()
        pinctrl/abx500: add Device Tree support
        pinctrl/abx500: align GPIO cluster boundaries
        pinctrl/abx500: prevent error path from corrupting returning error
        pinctrl: sunxi: add of_xlate function
        pinctrl/lantiq: fix pin number in ltq_pmx_gpio_request_enable
        pinctrl/lantiq: add functionality to falcon_pinconf_dbg_show
        pinctrl/lantiq: fix pinconfig parameters
        pinctrl/lantiq: one of the boot leds was defined incorrectly
        pinctrl/lantiq: only probe available pad controllers
        ...
      8a3a11f9
    • L
      Merge tag 'regulator-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 8909ff65
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "A fairly quiet release for the regulator API, the bulk of the changes
        being lots of small cleanups and API updates contributed by Axel Lin
        with just a small set of larger changes:
      
         - New driver for LP8755
      
         - DT support for S5M8767, TPS51632, TPS6507x and TPS65090
      
         - Support for writing a "commit changes" bit in the regmap helper
           functions."
      
      * tag 'regulator-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (60 commits)
        regulator: Fix memory garbage dev_err printout.
        regulator: max77686: Reuse rdev_get_id() function.
        regulator: tps51632: Use regulator_[get|set]_voltage_sel_regmap
        regulator: as3711: Fix checking if no platform initialization data
        regulator: s5m8767: Prevent possible NULL pointer dereference
        regulator: s5m8767: Fix dev argument for devm_kzalloc and of_get_regulator_init_data
        regulator: core: Optimize _regulator_do_set_voltage if voltage does not change
        regulator: max8998: Let regulator core handle the case selector == old_selector
        regulator: s5m8767: Use of_get_child_count()
        regulator: anatop: improve precision of delay time
        regulator: show state for GPIO-controlled regulators
        regulator: s5m8767: Fix build in non-DT case
        regulator: add device tree support for s5m8767
        regulator: palmas: Remove a redundant setting for warm_reset
        regulator: mc13xxx: Use of_get_child_count()
        regulator: max8997: Use of_get_child_count()
        regulator: tps65090: Fix using wrong dev argument for calling of_regulator_match
        regulators: anatop: add set_voltage_time_sel interface
        regulator: Add missing of_node_put()
        regulator: tps6507x: Fix using wrong dev argument for calling of_regulator_match
        ...
      8909ff65
    • L
      Merge tag 'regmap-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 88cff241
      Linus Torvalds 提交于
      Pull regmap updates from Mark Brown:
       "Several nice new features and performance improvements here,
        especially the first:
      
         - Support for using the cache infrastructure without the physical
           I/O, allowing devices which don't fit the physical model regmap has
           to take advantage of the cache infrastructure, contributed by
           Andrey Smirnov.
      
         - Several small improvements to the support for wake capable IRQs.
      
         - Support for asynchronous I/O, allowing us to come much closer to
           saturating fast buses like SPI.
      
         - Support for simple array caches, giving higher performance for use
           with MMIO devices.
      
         - Restoration of the use of bulk reads for handling interrupts,
           giving a performance improvement.
      
         - Support for 24 bit register addresses.
      
         - More performance improvements for debugfs."
      
      * tag 'regmap-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (24 commits)
        regmap: mmio: add register clock support
        regmap: debugfs: Factor out debugfs_tot_len calc into a function
        regmap: debugfs: Optimize seeking within blocks of registers
        regmap: debugfs: Add a `max_reg' member in struct regmap_debugfs_off_cache
        regmap: debugfs: Fix reading in register field units
        regmap: spi: Handle allocation failures gracefully
        regmap: Export regmap_async_complete()
        regmap: Export regmap_async_complete_cb
        regmap: include linux/sched.h to fix build
        regmap: spi: Support asynchronous I/O for SPI
        regmap: Add asynchronous I/O support
        regmap: Add "no-bus" option for regmap API
        regmap: regmap: avoid spurious warning in regmap_read_debugfs
        regmap: Add provisions to have user-defined write operation
        regmap: Add provisions to have user-defined read operation
        regmap: Add support for 24 bit wide register addresses
        mfd: wm5110: Mark wakes as inverted
        mfd: wm5102: Mark wakes as inverted
        regmap: irq: Support wake IRQ mask inversion
        regmap: irq: Fix sync of wake statuses to hardware
        ...
      88cff241
    • L
      Merge branch 'for-3.9-cpuset' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 9ae46e67
      Linus Torvalds 提交于
      Pull cpuset changes from Tejun Heo:
      
       - Synchornization has seen a lot of changes with focus on decoupling
         cpuset synchronization from cgroup internal locking.
      
         After this change, there only remain a couple of mostly trivial
         dependencies on cgroup_lock outside cgroup core proper.  cgroup_lock
         is scheduled to be unexported in this devel cycle.
      
         This will finally remove the fragile locking order around cgroup
         (cgroup locking wants to / should be one of the outermost but yet has
         been acquired from deep inside individual controllers).
      
       - At this point, Li is most knowlegeable with cpuset and taking over
         the maintainership of cpuset.
      
      * 'for-3.9-cpuset' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cpuset: drop spurious retval assignment in proc_cpuset_show()
        cpuset: fix RCU lockdep splat
        cpuset: update MAINTAINERS
        cpuset: remove cpuset->parent
        cpuset: replace cpuset->stack_list with cpuset_for_each_descendant_pre()
        cpuset: replace cgroup_mutex locking with cpuset internal locking
        cpuset: schedule hotplug propagation from cpuset_attach() if the cpuset is empty
        cpuset: pin down cpus and mems while a task is being attached
        cpuset: make CPU / memory hotplug propagation asynchronous
        cpuset: drop async_rebuild_sched_domains()
        cpuset: don't nest cgroup_mutex inside get_online_cpus()
        cpuset: reorganize CPU / memory hotplug handling
        cpuset: cleanup cpuset[_can]_attach()
        cpuset: introduce cpuset_for_each_child()
        cpuset: introduce CS_ONLINE
        cpuset: introduce ->css_on/offline()
        cpuset: remove fast exit path from remove_tasks_in_empty_cpuset()
        cpuset: remove unused cpuset_unlock()
      9ae46e67
    • L
      Merge branch 'for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 502b24c2
      Linus Torvalds 提交于
      Pull cgroup changes from Tejun Heo:
       "Nothing too drastic.
      
         - Removal of synchronize_rcu() from userland visible paths.
      
         - Various fixes and cleanups from Li.
      
         - cgroup_rightmost_descendant() added which will be used by cpuset
           changes (it will be a separate pull request)."
      
      * 'for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: fail if monitored file and event_control are in different cgroup
        cgroup: fix cgroup_rmdir() vs close(eventfd) race
        cpuset: fix cpuset_print_task_mems_allowed() vs rename() race
        cgroup: fix exit() vs rmdir() race
        cgroup: remove bogus comments in cgroup_diput()
        cgroup: remove synchronize_rcu() from cgroup_diput()
        cgroup: remove duplicate RCU free on struct cgroup
        sched: remove redundant NULL cgroup check in task_group_path()
        sched: split out css_online/css_offline from tg creation/destruction
        cgroup: initialize cgrp->dentry before css_alloc()
        cgroup: remove a NULL check in cgroup_exit()
        cgroup: fix bogus kernel warnings when cgroup_create() failed
        cgroup: remove synchronize_rcu() from rebind_subsystems()
        cgroup: remove synchronize_rcu() from cgroup_attach_{task|proc}()
        cgroup: use new hashtable implementation
        cgroups: fix cgroup_event_listener error handling
        cgroups: move cgroup_event_listener.c to tools/cgroup
        cgroup: implement cgroup_rightmost_descendant()
        cgroup: remove unused dummy cgroup_fork_callbacks()
      502b24c2
  2. 20 2月, 2013 26 次提交
    • L
      Merge branch 'for-3.9-async' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · ece8e0b2
      Linus Torvalds 提交于
      Pull async changes from Tejun Heo:
       "These are followups for the earlier deadlock issue involving async
        ending up waiting for itself through block requesting module[1].  The
        following changes are made by these commits.
      
         - Instead of requesting default elevator on each request_queue init,
           block now requests it once early during boot.
      
         - Kmod triggers warning if invoked from an async worker.
      
         - Async synchronization implementation has been reimplemented.  It's
           a lot simpler now."
      
      * 'for-3.9-async' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        async: initialise list heads to fix crash
        async: replace list of active domains with global list of pending items
        async: keep pending tasks on async_domain and remove async_pending
        async: use ULLONG_MAX for infinity cookie value
        async: bring sanity to the use of words domain and running
        async, kmod: warn on synchronous request_module() from async workers
        block: don't request module during elevator init
        init, block: try to load default elevator module early during boot
      ece8e0b2
    • D
      Merge branch 'next' into for-linus · 2d9f0d96
      Dmitry Torokhov 提交于
      Prepare first set of updates for 3.9 merge window.
      2d9f0d96
    • L
      Merge branch 'for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 67cb104b
      Linus Torvalds 提交于
      Pull workqueue changes from Tejun Heo:
       "A lot of reorganization is going on mostly to prepare for worker pools
        with custom attributes so that workqueue can replace custom pool
        implementations in places including writeback and btrfs and make CPU
        assignment in crypto more flexible.
      
        workqueue evolved from purely per-cpu design and implementation, so
        there are a lot of assumptions regarding being bound to CPUs and even
        unbound workqueues are implemented as an extension of the model -
        workqueues running on the special unbound CPU.  Bulk of changes this
        round are about promoting worker_pools as the top level abstraction
        replacing global_cwq (global cpu workqueue).  At this point, I'm
        fairly confident about getting custom worker pools working pretty soon
        and ready for the next merge window.
      
        Lai's patches are replacing the convoluted mb() dancing workqueue has
        been doing with much simpler mechanism which only depends on
        assignment atomicity of long.  For details, please read the commit
        message of 0b3dae68 ("workqueue: simplify is-work-item-queued-here
        test").  While the change ends up adding one pointer to struct
        delayed_work, the inflation in percentage is less than five percent
        and it decouples delayed_work logic a lot more cleaner from usual work
        handling, removes the unusual memory barrier dancing, and allows for
        further simplification, so I think the trade-off is acceptable.
      
        There will be two more workqueue related pull requests and there are
        some shared commits among them.  I'll write further pull requests
        assuming this pull request is pulled first."
      
      * 'for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (37 commits)
        workqueue: un-GPL function delayed_work_timer_fn()
        workqueue: rename cpu_workqueue to pool_workqueue
        workqueue: reimplement is_chained_work() using current_wq_worker()
        workqueue: fix is_chained_work() regression
        workqueue: pick cwq instead of pool in __queue_work()
        workqueue: make get_work_pool_id() cheaper
        workqueue: move nr_running into worker_pool
        workqueue: cosmetic update in try_to_grab_pending()
        workqueue: simplify is-work-item-queued-here test
        workqueue: make work->data point to pool after try_to_grab_pending()
        workqueue: add delayed_work->wq to simplify reentrancy handling
        workqueue: make work_busy() test WORK_STRUCT_PENDING first
        workqueue: replace WORK_CPU_NONE/LAST with WORK_CPU_END
        workqueue: post global_cwq removal cleanups
        workqueue: rename nr_running variables
        workqueue: remove global_cwq
        workqueue: remove worker_pool->gcwq
        workqueue: replace for_each_worker_pool() with for_each_std_worker_pool()
        workqueue: make freezing/thawing per-pool
        workqueue: make hotplug processing per-pool
        ...
      67cb104b
    • L
      Merge branch 'for-3.9-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 1eaec821
      Linus Torvalds 提交于
      Pull workqueue [delayed_]work_pending() cleanups from Tejun Heo:
       "This is part of on-going cleanups to remove / minimize usages of
        workqueue interfaces which are deprecated and/or misleading.
      
        This round drops a number of usages of [delayed_]work_pending(), which
        are dangerous as they lack any form of synchronization and thus often
        lead to buggy / unnecessary code.  There are a couple legitimate use
        cases in kernel.  Hopefully, they can be converted and
        [delayed_]work_pending() can be removed completely.  Even if not,
        removing most of misuses should make it more difficult to find
        examples of misuses and thus slow down growth of them.
      
        These changes are independent from other workqueue changes."
      
      * 'for-3.9-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        wimax/i2400m: fix i2400m->wake_tx_skb handling
        kprobes: fix wait_for_kprobe_optimizer()
        ipw2x00: simplify scan_event handling
        video/exynos: don't use [delayed_]work_pending()
        tty/max3100: don't use [delayed_]work_pending()
        x86/mce: don't use [delayed_]work_pending()
        rfkill: don't use [delayed_]work_pending()
        wl1251: don't use [delayed_]work_pending()
        thinkpad_acpi: don't use [delayed_]work_pending()
        mwifiex: don't use [delayed_]work_pending()
        sja1000: don't use [delayed_]work_pending()
      1eaec821
    • L
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1a13c0b1
      Linus Torvalds 提交于
      Pull x86 UV3 support update from Ingo Molnar:
       "Support for the SGI Ultraviolet System 3 (UV3) platform - the upcoming
        third major iteration and upscaling of the SGI UV supercomputing
        platform."
      
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, uv, uv3: Trim MMR register definitions after code changes for SGI UV3
        x86, uv, uv3: Check current gru hub support for SGI UV3
        x86, uv, uv3: Update Time Support for SGI UV3
        x86, uv, uv3: Update x2apic Support for SGI UV3
        x86, uv, uv3: Update Hub Info for SGI UV3
        x86, uv, uv3: Update ACPI Check to include SGI UV3
        x86, uv, uv3: Update MMR register definitions for SGI Ultraviolet System 3 (UV3)
      1a13c0b1
    • L
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f98982ce
      Linus Torvalds 提交于
      Pull x86 platform changes from Ingo Molnar:
      
       - Support for the Technologic Systems TS-5500 platform, by Vivien
         Didelot
      
       - Improved NUMA support on AMD systems:
      
         Add support for federated systems where multiple memory controllers
         can exist and see each other over multiple PCI domains.  This
         basically means that AMD node ids can be more than 8 now and the code
         handling this is taught to incorporate PCI domain into those IDs.
      
       - Support for the Goldfish virtual Android emulator, by Jun Nakajima,
         Intel, Google, et al.
      
       - Misc fixlets.
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Add TS-5500 platform support
        x86/srat: Simplify memory affinity init error handling
        x86/apb/timer: Remove unnecessary "if"
        goldfish: platform device for x86
        amd64_edac: Fix type usage in NB IDs and memory ranges
        amd64_edac: Fix PCI function lookup
        x86, AMD, NB: Use u16 for northbridge IDs in amd_get_nb_id
        x86, AMD, NB: Add multi-domain support
      f98982ce
    • L
      Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 29d50523
      Linus Torvalds 提交于
      Pull x86/hyperv changes from Ingo Molnar:
       "The biggest change is support for Windows 8's improved hypervisor
        interrupt model on the Linux Hyper-V guest subsystem code side.
      
        Smallish fixes otherwise."
      
      * 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, hyperv: HYPERV depends on X86_LOCAL_APIC
        X86: Handle Hyper-V vmbus interrupts as special hypervisor interrupts
        X86: Add a check to catch Xen emulation of Hyper-V
        x86: Hyper-V: register clocksource only if its advertised
      29d50523
    • L
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 026f149c
      Linus Torvalds 提交于
      Pull x86/debug changes from Ingo Molnar:
       "Two init annotations and a built-in memtest speedup"
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/memtest: Shorten time for tests
        x86: Convert a few mistaken __cpuinit annotations to __init
        x86/EFI: Properly init-annotate BGRT code
      026f149c
    • L
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 11743a1d
      Linus Torvalds 提交于
      Pull x86 cleanup patches from Ingo Molnar:
       "Misc smaller cleanups"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: ptrace.c only needs export.h and not the full module.h
        x86, apb_timer: remove unused variable percpu_timer
        um: don't compare a pointer to 0
        arch/x86/platform/uv: use ARRAY_SIZE where possible
      11743a1d
    • L
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 121027a7
      Linus Torvalds 提交于
      Pull two x86 kernel build changes from Ingo Molnar:
       "The first change modifies how 'make oldconfig' works on cross-bitness
        situations on x86.  It was felt the new behavior of preserving the
        bitness of the .config is more logical.  This is a leftover of the
        merge.
      
        The second change eliminates a Perl warning.  (There's another, more
        complete fix resulting of this warning fix, which second fix in flight
        to you via the kbuild tree, which will remove the timeconst.pl script
        altogether.)"
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timeconst.pl: Eliminate Perl warning
        x86: Default to ARCH=x86 to avoid overriding CONFIG_64BIT
      121027a7
    • L
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5abcd76f
      Linus Torvalds 提交于
      Pull x86 bootup changes from Ingo Molnar:
       "Deal with bootloaders which fail to initialize unknown fields in
        boot_params to zero, by sanitizing boot params passed in.
      
        This unbreaks versions of kexec-utils.  Other bootloaders do not
        appear to show sensitivity to this change, but it's a possibility for
        breakage nevertheless."
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, boot: Sanitize boot_params if not zeroed on creation
      5abcd76f
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a57ed936
      Linus Torvalds 提交于
      Pull x86/asm changes from Ingo Molnar:
       "The biggest change (by line count) is the unification of the XOR code
        and then the introduction of an additional SSE based XOR assembly
        method.
      
        The other bigger change is the head_32.S rework/cleanup by Borislav
        Petkov.
      
        Last but not least there's the usual laundry list of small but
        dangerous (and hopefully perfectly tested) changes to subtle low level
        x86 code, plus cleanups."
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, head_32: Give the 6 label a real name
        x86, head_32: Remove second CPUID detection from default_entry
        x86: Detect CPUID support early at boot
        x86, head_32: Remove i386 pieces
        x86: Require MOVBE feature in cpuid when we use it
        x86: Enable ARCH_USE_BUILTIN_BSWAP
        x86/xor: Add alternative SSE implementation only prefetching once per 64-byte line
        x86/xor: Unify SSE-base xor-block routines
        x86: Fix a typo
        x86/mm: Fix the argument passed to sync_global_pgds()
        x86/mm: Convert update_mmu_cache() and update_mmu_cache_pmd() to functions
        ix86: Tighten asmlinkage_protect() constraints
      a57ed936
    • L
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5800700f
      Linus Torvalds 提交于
      Pull x86/apic changes from Ingo Molnar:
       "Main changes:
      
         - Multiple MSI support added to the APIC, PCI and AHCI code - acked
           by all relevant maintainers, by Alexander Gordeev.
      
           The advantage is that multiple AHCI ports can have multiple MSI
           irqs assigned, and can thus spread to multiple CPUs.
      
           [ Drivers can make use of this new facility via the
             pci_enable_msi_block_auto() method ]
      
         - x86 IOAPIC code from interrupt remapping cleanups from Joerg
           Roedel:
      
           These patches move all interrupt remapping specific checks out of
           the x86 core code and replaces the respective call-sites with
           function pointers.  As a result the interrupt remapping code is
           better abstraced from x86 core interrupt handling code.
      
         - Various smaller improvements, fixes and cleanups."
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
        x86/intel/irq_remapping: Clean up x2apic opt-out security warning mess
        x86, kvm: Fix intialization warnings in kvm.c
        x86, irq: Move irq_remapped out of x86 core code
        x86, io_apic: Introduce eoi_ioapic_pin call-back
        x86, msi: Introduce x86_msi.compose_msi_msg call-back
        x86, irq: Introduce setup_remapped_irq()
        x86, irq: Move irq_remapped() check into free_remapped_irq
        x86, io-apic: Remove !irq_remapped() check from __target_IO_APIC_irq()
        x86, io-apic: Move CONFIG_IRQ_REMAP code out of x86 core
        x86, irq: Add data structure to keep AMD specific irq remapping information
        x86, irq: Move irq_remapping_enabled declaration to iommu code
        x86, io_apic: Remove irq_remapping_enabled check in setup_timer_IRQ0_pin
        x86, io_apic: Move irq_remapping_enabled checks out of check_timer()
        x86, io_apic: Convert setup_ioapic_entry to function pointer
        x86, io_apic: Introduce set_affinity function pointer
        x86, msi: Use IRQ remapping specific setup_msi_irqs routine
        x86, hpet: Introduce x86_msi_ops.setup_hpet_msi
        x86, io_apic: Introduce x86_io_apic_ops.print_entries for debugging
        x86, io_apic: Introduce x86_io_apic_ops.disable()
        x86, apic: Mask IO-APIC and PIC unconditionally on LAPIC resume
        ...
      5800700f
    • L
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 266d7ad7
      Linus Torvalds 提交于
      Pull timer changes from Ingo Molnar:
       "Main changes:
      
         - ntp: Add CONFIG_RTC_SYSTOHC: a generic RTC driver facility
           complementing the existing CONFIG_RTC_HCTOSYS, which uses NTP to
           keep the hardware clock updated.
      
         - posix-timers: Fix clock_adjtime to always return timex data on
           success.  This is changing the ABI, but no breakage was expected
           and found - caution is warranted nevertheless.
      
         - platform persistent clock improvements/cleanups.
      
         - clockevents: refactor timer broadcast handling to be more generic
           and less duplicated with matching architecture code (mostly ARM
           motivated.)
      
         - various fixes and cleanups"
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timers/x86/hpet: Use HPET_COUNTER to specify the hpet counter in vread_hpet()
        posix-cpu-timers: Fix nanosleep task_struct leak
        clockevents: Fix generic broadcast for FEAT_C3STOP
        time, Fix setting of hardware clock in NTP code
        hrtimer: Prevent hrtimer_enqueue_reprogram race
        clockevents: Add generic timer broadcast function
        clockevents: Add generic timer broadcast receiver
        timekeeping: Switch HAS_PERSISTENT_CLOCK to ALWAYS_USE_PERSISTENT_CLOCK
        x86/time/rtc: Don't print extended CMOS year when reading RTC
        x86: Select HAS_PERSISTENT_CLOCK on x86
        timekeeping: Add CONFIG_HAS_PERSISTENT_CLOCK option
        rtc: Skip the suspend/resume handling if persistent clock exist
        timekeeping: Add persistent_clock_exist flag
        posix-timers: Fix clock_adjtime to always return timex data on success
        Round the calculated scale factor in set_cyc2ns_scale()
        NTP: Add a CONFIG_RTC_SYSTOHC configuration
        MAINTAINERS: Update John Stultz's email
        time: create __getnstimeofday for WARNless calls
      266d7ad7
    • L
      Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bcbd818c
      Linus Torvalds 提交于
      Pull preparatory smp/hotplug patches from Ingo Molnar:
       "Some early preparatory changes for the WIP hotplug rework by Thomas
        Gleixner."
      
      * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        stop_machine: Use smpboot threads
        stop_machine: Store task reference in a separate per cpu variable
        smpboot: Allow selfparking per cpu threads
      bcbd818c
    • L
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d652e1eb
      Linus Torvalds 提交于
      Pull scheduler changes from Ingo Molnar:
       "Main changes:
      
         - scheduler side full-dynticks (user-space execution is undisturbed
           and receives no timer IRQs) preparation changes that convert the
           cputime accounting code to be full-dynticks ready, from Frederic
           Weisbecker.
      
         - Initial sched.h split-up changes, by Clark Williams
      
         - select_idle_sibling() performance improvement by Mike Galbraith:
      
              " 1 tbench pair (worst case) in a 10 core + SMT package:
      
                pre   15.22 MB/sec 1 procs
                post 252.01 MB/sec 1 procs "
      
        - sched_rr_get_interval() ABI fix/change.  We think this detail is not
          used by apps (so it's not an ABI in practice), but lets keep it
          under observation.
      
        - misc RT scheduling cleanups, optimizations"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        sched/rt: Add <linux/sched/rt.h> header to <linux/init_task.h>
        cputime: Remove irqsave from seqlock readers
        sched, powerpc: Fix sched.h split-up build failure
        cputime: Restore CPU_ACCOUNTING config defaults for PPC64
        sched/rt: Move rt specific bits into new header file
        sched/rt: Add a tuning knob to allow changing SCHED_RR timeslice
        sched: Move sched.h sysctl bits into separate header
        sched: Fix signedness bug in yield_to()
        sched: Fix select_idle_sibling() bouncing cow syndrome
        sched/rt: Further simplify pick_rt_task()
        sched/rt: Do not account zero delta_exec in update_curr_rt()
        cputime: Safely read cputime of full dynticks CPUs
        kvm: Prepare to add generic guest entry/exit callbacks
        cputime: Use accessors to read task cputime stats
        cputime: Allow dynamic switch between tick/virtual based cputime accounting
        cputime: Generic on-demand virtual cputime accounting
        cputime: Move default nsecs_to_cputime() to jiffies based cputime file
        cputime: Librarize per nsecs resolution cputime definitions
        cputime: Avoid multiplication overflow on utime scaling
        context_tracking: Export context state for generic vtime
        ...
      
      Fix up conflict in kernel/context_tracking.c due to comment additions.
      d652e1eb
    • L
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8f55cea4
      Linus Torvalds 提交于
      Pull perf changes from Ingo Molnar:
       "There are lots of improvements, the biggest changes are:
      
        Main kernel side changes:
      
         - Improve uprobes performance by adding 'pre-filtering' support, by
           Oleg Nesterov.
      
         - Make some POWER7 events available in sysfs, equivalent to what was
           done on x86, from Sukadev Bhattiprolu.
      
         - tracing updates by Steve Rostedt - mostly misc fixes and smaller
           improvements.
      
         - Use perf/event tracing to report PCI Express advanced errors, by
           Tony Luck.
      
         - Enable northbridge performance counters on AMD family 15h, by Jacob
           Shin.
      
         - This tracing commit:
      
              tracing: Remove the extra 4 bytes of padding in events
      
           changes the ABI.  All involved parties (PowerTop in particular)
           seem to agree that it's safe to do now with the introduction of
           libtraceevent, but the devil is in the details ...
      
        Main tooling side changes:
      
         - Add 'event group view', from Namyung Kim:
      
           To use it, 'perf record' should group events when recording.  And
           then perf report parses the saved group relation from file header
           and prints them together if --group option is provided.  You can
           use the 'perf evlist' command to see event group information:
      
              $ perf record -e '{ref-cycles,cycles}' noploop 1
              [ perf record: Woken up 2 times to write data ]
              [ perf record: Captured and wrote 0.385 MB perf.data (~16807 samples) ]
      
              $ perf evlist --group
              {ref-cycles,cycles}
      
           With this example, default perf report will show you each event
           separately.
      
           You can use --group option to enable event group view:
      
              $ perf report --group
              ...
              # group: {ref-cycles,cycles}
              # ========
              # Samples: 7K of event 'anon group { ref-cycles, cycles }'
              # Event count (approx.): 6876107743
              #
              #         Overhead  Command      Shared Object                      Symbol
              # ................  .......  .................  ..........................
                  99.84%  99.76%  noploop  noploop            [.] main
                   0.07%   0.00%  noploop  ld-2.15.so         [.] strcmp
                   0.03%   0.00%  noploop  [kernel.kallsyms]  [k] timerqueue_del
                   0.03%   0.03%  noploop  [kernel.kallsyms]  [k] sched_clock_cpu
                   0.02%   0.00%  noploop  [kernel.kallsyms]  [k] account_user_time
                   0.01%   0.00%  noploop  [kernel.kallsyms]  [k] __alloc_pages_nodemask
                   0.00%   0.00%  noploop  [kernel.kallsyms]  [k] native_write_msr_safe
                   0.00%   0.11%  noploop  [kernel.kallsyms]  [k] _raw_spin_lock
                   0.00%   0.06%  noploop  [kernel.kallsyms]  [k] find_get_page
                   0.00%   0.02%  noploop  [kernel.kallsyms]  [k] rcu_check_callbacks
                   0.00%   0.02%  noploop  [kernel.kallsyms]  [k] __current_kernel_time
      
           As you can see the Overhead column now contains both of ref-cycles
           and cycles and header line shows group information also - 'anon
           group { ref-cycles, cycles }'.  The output is sorted by period of
           group leader first.
      
         - Initial GTK+ annotate browser, from Namhyung Kim.
      
         - Add option for runtime switching perf data file in perf report,
           just press 's' and a menu with the valid files found in the current
           directory will be presented, from Feng Tang.
      
         - Add support to display whole group data for raw columns, from Jiri
           Olsa.
      
         - Add per processor socket count aggregation in perf stat, from
           Stephane Eranian.
      
         - Add interval printing in 'perf stat', from Stephane Eranian.
      
         - 'perf test' improvements
      
         - Add support for wildcards in tracepoint system name, from Jiri
           Olsa.
      
         - Add anonymous huge page recognition, from Joshua Zhu.
      
         - perf build-id cache now can show DSOs present in a perf.data file
           that are not in the cache, to integrate with build-id servers being
           put in place by organizations such as Fedora.
      
         - perf top now shares more of the evsel config/creation routines with
           'record', paving the way for further integration like 'top'
           snapshots, etc.
      
         - perf top now supports DWARF callchains.
      
         - Fix mmap limitations on 32-bit, fix from David Miller.
      
         - 'perf bench numa mem' NUMA performance measurement suite
      
         - ... and lots of fixes, performance improvements, cleanups and other
           improvements I failed to list - see the shortlog and git log for
           details."
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (270 commits)
        perf/x86/amd: Enable northbridge performance counters on AMD family 15h
        perf/hwbp: Fix cleanup in case of kzalloc failure
        perf tools: Fix build with bison 2.3 and older.
        perf tools: Limit unwind support to x86 archs
        perf annotate: Make it to be able to skip unannotatable symbols
        perf gtk/annotate: Fail early if it can't annotate
        perf gtk/annotate: Show source lines with gray color
        perf gtk/annotate: Support multiple event annotation
        perf ui/gtk: Implement basic GTK2 annotation browser
        perf annotate: Fix warning message on a missing vmlinux
        perf buildid-cache: Add --update option
        uprobes/perf: Avoid uprobe_apply() whenever possible
        uprobes/perf: Teach trace_uprobe/perf code to use UPROBE_HANDLER_REMOVE
        uprobes/perf: Teach trace_uprobe/perf code to pre-filter
        uprobes/perf: Teach trace_uprobe/perf code to track the active perf_event's
        uprobes: Introduce uprobe_apply()
        perf: Introduce hw_perf_event->tp_target and ->tp_list
        uprobes/perf: Always increment trace_uprobe->nhit
        uprobes/tracing: Kill uprobe_trace_consumer, embed uprobe_consumer into trace_uprobe
        uprobes/tracing: Introduce is_trace_uprobe_enabled()
        ...
      8f55cea4
    • L
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b7133a9a
      Linus Torvalds 提交于
      Pull irq core changes from Ingo Molnar:
       "The biggest changes are the IRQ-work and printk changes from Frederic
        Weisbecker, which prepare the code for 'full dynticks' (the ability to
        stop or slow down the periodic tick arbitrarily, not just in idle time
        as today):
      
         - Don't stop tick with irq works pending.  This fix is generally
           useful and concerns archs that can't raise self IPIs.
      
         - Flush irq works before CPU offlining.
      
         - Introduce "lazy" irq works that can wait for the next tick to be
           executed, unless it's stopped.
      
         - Implement klogd wake up using irq work.  This removes the ad-hoc
           printk_tick()/printk_needs_cpu() hooks and make it working even in
           dynticks mode.
      
         - Cleanups and fixes."
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Export enable/disable_percpu_irq()
        arch Kconfig: Remove references to IRQ_PER_CPU
        irq_work: Remove return value from the irq_work_queue() function
        genirq: Avoid deadlock in spurious handling
        printk: Wake up klogd using irq_work
        irq_work: Make self-IPIs optable
        irq_work: Warn if there's still work on cpu_down
        irq_work: Flush work on CPU_DYING
        irq_work: Don't stop the tick with pending works
        nohz: Add API to check tick state
        irq_work: Remove CONFIG_HAVE_IRQ_WORK
        irq_work: Fix racy check on work pending flag
        irq_work: Fix racy IRQ_WORK_BUSY flag setting
      b7133a9a
    • L
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e84cf5d0
      Linus Torvalds 提交于
      Pull RCU changes from Ingo Molnar:
       "SRCU changes:
      
         - These include debugging aids, updates that move towards the goal of
           permitting srcu_read_lock() and srcu_read_unlock() to be used from
           idle and offline CPUs, and a few small fixes.
      
        Changes to rcutorture and to RCU documentation:
      
         - Posted to LKML at https://lkml.org/lkml/2013/1/26/188
      
        Enhancements to uniprocessor handling in tiny RCU:
      
         - Posted to LKML at https://lkml.org/lkml/2013/1/27/2
      
        Tag RCU callbacks with grace-period number to simplify callback
        advancement:
      
         - Posted to LKML at https://lkml.org/lkml/2013/1/26/203
      
        Miscellaneous fixes:
      
         - Posted to LKML at https://lkml.org/lkml/2013/1/26/204"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
        srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock()
        srcu: Update synchronize_srcu_expedited()'s comments
        srcu: Update synchronize_srcu()'s comments
        srcu: Remove checks preventing idle CPUs from calling srcu_read_lock()
        srcu: Remove checks preventing offline CPUs from calling srcu_read_lock()
        srcu: Simple cleanup for cleanup_srcu_struct()
        srcu: Add might_sleep() annotation to synchronize_srcu()
        srcu: Simplify __srcu_read_unlock() via this_cpu_dec()
        rcu: Allow rcutorture to be built at low optimization levels
        rcu: Make rcutorture's shuffler task shuffle recently added tasks
        rcu: Allow TREE_PREEMPT_RCU on UP systems
        rcu: Provide RCU CPU stall warnings for tiny RCU
        context_tracking: Add comments on interface and internals
        rcu: Remove obsolete Kconfig option from comment
        rcu: Remove unused code originally used for context tracking
        rcu: Consolidate debugging Kconfig options
        rcu: Correct 'optimized' to 'optimize' in header comment
        rcu: Trace callback acceleration
        rcu: Tag callback lists with corresponding grace-period number
        rcutorture: Don't compare ptr with 0
        ...
      e84cf5d0
    • S
      hwmon: (ntc_thermistor): Fix sparse warnings · 4626dcff
      Sachin Kamat 提交于
      Fixes the following sparse warnings:
      drivers/hwmon/ntc_thermistor.c:46:31: warning:
      symbol 'ncpXXwb473' was not declared. Should it be static?
      drivers/hwmon/ntc_thermistor.c:82:31: warning:
      symbol 'ncpXXwl333' was not declared. Should it be static?
      
      Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
      Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
      Acked-by: NMyungJoo Ham <myungjoo.ham@samsung.com>
      Acked-by: NJean Delvare <khali@linux-fr.org>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      4626dcff
    • L
      hwmon: (adt7410) Add device table entry for the adt7420 · e46e5dc2
      Lars-Peter Clausen 提交于
      The adt7420 is software compatible to the adt7410.
      Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
      Reviewed-by: NHartmut Knaack <knaack.h@gmx.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      e46e5dc2
    • L
      hwmon: (adt7410) Use I2C_ADDRS helper macro · 54be068d
      Lars-Peter Clausen 提交于
      Use the I2C_ADDRS macro to initialize the I2C device's address_list. Doing so
      saves a few lines of boilerplate code.
      Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
      Reviewed-by: NHartmut Knaack <knaack.h@gmx.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      54be068d
    • L
      hwmon: (adt7410) Use the SIMPLE_DEV_PM_OPS helper macro · 436440fc
      Lars-Peter Clausen 提交于
      Use the SIMPLE_DEV_PM_OPS macro to declare the driver's pm_ops.
      Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
      Reviewed-by: NHartmut Knaack <knaack.h@gmx.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      436440fc
    • L
      hwmon: (adt7410) Let suspend/resume depend on CONFIG_PM_SLEEP · e0db9c4b
      Lars-Peter Clausen 提交于
      Only build the suspend/resume code if CONFIG_PM_SLEEP is selected. Currently the
      code is built if CONFIG_PM is selected, but it will also be selected if only
      runtime PM support is built into the kernel.
      Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
      Acked-by: NHartmut Knaack <knaack.h@gmx.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      e0db9c4b
    • L
      hwmon: (adt7410) Clear unwanted bits in the config register · 6e7d3b6b
      Lars-Peter Clausen 提交于
      Make sure to clear the mode bits from the config register before setting the new
      mode. Otherwise we might end up with a different mode than we want to.
      Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
      Reviewed-by: NHartmut Knaack <knaack.h@gmx.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      6e7d3b6b
    • K
      workqueue: un-GPL function delayed_work_timer_fn() · 1438ade5
      Konstantin Khlebnikov 提交于
      commit d8e794df ("workqueue: set
      delayed_work->timer function on initialization") exports function
      delayed_work_timer_fn() only for GPL modules. This makes delayed-works
      unusable for non-GPL modules, because initialization macro now requires
      GPL symbol. For example schedule_delayed_work() available for non-GPL.
      Signed-off-by: NKonstantin Khlebnikov <khlebnikov@openvz.org>
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Cc: stable@vger.kernel.org # 3.7
      1438ade5