1. 23 May, 2011 40 commits
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 1f3a8e09
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
        staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
        staging:iio: Trivial kconfig reorganization and uniformity improvements.
        staging:iio:documenation partial update.
        staging:iio: use pollfunc allocation helpers in remaining drivers.
        staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
        staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
        staging:iio:meter:ade7758: Use private data space from iio_allocate_device
        staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
        staging:iio: ring core cleanups + check if read_last available in lis3l02dq
        staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
        staging:iio: poll func allocation clean up.
        staging:iio:ad7780 trivial unused header cleanup.
        staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
        staging:iio:adc:AD7780: Convert to new channel registration method
        staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
        staging:iio:adc: AD7606: Consitently use indio_dev
        staging:iio: Rip out helper for software rings.
        staging:iio:adc:AD7298: Use private data space from iio_allocate_device
        staging:iio: rationalization of different buffer implementation hooks.
        staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
        ...
      
      Fix up trivial conflicts in
       - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
       - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
       - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
      1f3a8e09
    • Linus Torvalds's avatar
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · c44dead7
      Linus Torvalds authored
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)
        USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h
        USB: UHCI: Support big endian GRUSBHC HC
        sparc: add {read,write}*_be routines
        USB: UHCI: Add support for big endian descriptors
        USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier
        USB: UHCI: Add support for big endian mmio
        usb-storage: Correct adjust_quirks to include latest flags
        usb/isp1760: Fix possible unlink problems
        usb/isp1760: Move function isp1760_endpoint_disable() within file.
        USB: remove remaining usages of hcd->state from usbcore and fix regression
        usb: musb: ux500: add configuration and build options for ux500 dma
        usb: musb: ux500: add dma glue layer for ux500
        usb: musb: ux500: add dma name for ux500
        usb: musb: ux500: add ux500 specific code for gadget side
        usb: musb: fix compile error
        usb-storage: fix up the unusual_realtek device list
        USB: gadget: f_audio: Fix invalid dereference of initdata
        EHCI: don't rescan interrupt QHs needlessly
        OHCI: fix regression caused by nVidia shutdown workaround
        USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage
        ...
      c44dead7
    • Linus Torvalds's avatar
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 99dff585
      Linus Torvalds authored
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
        serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
        tty/serial: Fix break handling for PORT_TEGRA
        tty/serial: Add explicit PORT_TEGRA type
        n_tracerouter and n_tracesink ldisc additions.
        Intel PTI implementaiton of MIPI 1149.7.
        Kernel documentation for the PTI feature.
        export kernel call get_task_comm().
        tty: Remove to support serial for S5P6442
        pch_phub: Support new device ML7223
        8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
        ASoC: Update cx20442 for TTY API change
        pch_uart: Support new device ML7223 IOH
        parport: Use request_muxed_region for IT87 probe and lock
        tty/serial: add support for Xilinx PS UART
        n_gsm: Use print_hex_dump_bytes
        drivers/tty/moxa.c: Put correct tty value
        TTY: tty_io, annotate locking functions
        TTY: serial_core, remove superfluous set_task_state
        TTY: serial_core, remove invalid test
        Char: moxa, fix locking in moxa_write
        ...
      
      Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
      drivers/tty/serial/Makefile.
      
      I did the hci_ldisc thing as an evil merge, cleaning things up.
      99dff585
    • Guenter Roeck's avatar
      hwmon: (coretemp) Fix compile error if CONFIG_SMP is not defined · bb74e8ca
      Guenter Roeck authored
      
      
      cpu_sibling_mask() is not defined unless CONFIG_SMP is defined, so it
      must not be used directly in the code without ifdef protection.
      
      To solve the problem and avoid ifdefs in the code, define
      for_each_sibling() and use it instead.
      Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: Durgadoss R <durgadoss.r@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bb74e8ca
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 30cb6d5f
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        hrtimers: Reorder clock bases
        hrtimers: Avoid touching inactive timer bases
        hrtimers: Make struct hrtimer_cpu_base layout less stupid
        timerfd: Manage cancelable timers in timerfd
        clockevents: Move C3 stop test outside lock
        alarmtimer: Drop device refcount after rtc_open()
        alarmtimer: Check return value of class_find_device()
        timerfd: Allow timers to be cancelled when clock was set
        hrtimers: Prepare for cancel on clock was set timers
      30cb6d5f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 4867faab
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: Deal with hyperthetical case of PAGE_SIZE > 2M
        slub: Remove node check in slab_free
        slub: avoid label inside conditional
        slub: Make CONFIG_DEBUG_PAGE_ALLOC work with new fastpath
        slub: Avoid warning for !CONFIG_SLUB_DEBUG
        slub: Remove CONFIG_CMPXCHG_LOCAL ifdeffery
        slub: Move debug handlign in __slab_free
        slub: Move node determination out of hotpath
        slub: Eliminate repeated use of c->page through a new page variable
        slub: get_map() function to establish map of free objects in a slab
        slub: Use NUMA_NO_NODE in get_partial
        slub: Fix a typo in config name
      4867faab
    • Pekka Enberg's avatar
      Merge branch 'slab/next' into for-linus · bfb91fb6
      Pekka Enberg authored
      Conflicts:
      	mm/slub.c
      bfb91fb6
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 6fad2b5b
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
        hwmon: (coretemp) Fix checkpatch errors
        hwmon: Remove pkgtemp driver
        hwmon: (coretemp) Merge pkgtemp with coretemp
        hwmon: (pmbus) Add support for Analog Devices ADM1275
        hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health Controllers
        hwmon: (pmbus) Add support for TI UCD9200 series of PWM System Controllers
        hwmon: (pmbus) Use device specific function to read fan configuration
        hwmon: (pmbus) Expand scope of device specific get_status function
        hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registers
        hwmon: Driver for MAX16065 System Manager and compatibles
        hwmon: (sht15) add support for CRC validation
        hwmon: (sht15) add support for the status register
        hwmon: (sht15) clean-up the probe function
        hwmon: (sht15) general code clean-up
        hwmon: Add support for MAX6642
      6fad2b5b
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of... · 19504828
      Linus Torvalds authored
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf tools: Fix sample size bit operations
        perf tools: Fix ommitted mmap data update on remap
        watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
        watchdog: Disable watchdog when thresh is zero
        watchdog: Only disable/enable watchdog if neccessary
        watchdog: Fix rounding bug in get_sample_period()
        perf tools: Propagate event parse error handling
        perf tools: Robustify dynamic sample content fetch
        perf tools: Pre-check sample size before parsing
        perf tools: Move evlist sample helpers to evlist area
        perf tools: Remove junk code in mmap size handling
        perf tools: Check we are able to read the event size on mmap
      19504828
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 57d19e80
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        b43: fix comment typo reqest -> request
        Haavard Skinnemoen has left Atmel
        cris: typo in mach-fs Makefile
        Kconfig: fix copy/paste-ism for dell-wmi-aio driver
        doc: timers-howto: fix a typo ("unsgined")
        perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
        md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
        treewide: fix a few typos in comments
        regulator: change debug statement be consistent with the style of the rest
        Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
        audit: acquire creds selectively to reduce atomic op overhead
        rtlwifi: don't touch with treewide double semicolon removal
        treewide: cleanup continuations and remove logging message whitespace
        ath9k_hw: don't touch with treewide double semicolon removal
        include/linux/leds-regulator.h: fix syntax in example code
        tty: fix typo in descripton of tty_termios_encode_baud_rate
        xtensa: remove obsolete BKL kernel option from defconfig
        m68k: fix comment typo 'occcured'
        arch:Kconfig.locks Remove unused config option.
        treewide: remove extra semicolons
        ...
      57d19e80
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · ee9ec4f8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)
        HID: hid-multitouch: cosmetic changes, sort classes and devices
        HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
        HID: hid-multitouch: add support for Unitec panels
        HID: hid-multitouch: add support for Touch International panels
        HID: hid-multitouch: add support for GoodTouch panels
        HID: hid-multitouch: add support for CVTouch panels
        HID: hid-multitouch: add support for ActionStar panels
        HID: hiddev: fix race between hiddev_disconnect and hiddev_release
        HID: magicmouse: ignore 'ivalid report id' while switching modes
        HID: fix a crash in hid_report_raw_event() function.
        HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
        HID: assorted usage updates from hut 1.12
        HID: roccat: fix actual/startup profile sysfs attribute in koneplus
        HID: hid-multitouch: Add support for Lumio panels
        HID: 'name' and 'phys' in 'struct hid_device' can never be NULL
        HID: hid-multitouch: add support for Ilitek dual-touch panel
        HID: picolcd: Avoid compile warning/error triggered by copy_from_user()
        HID: add support for Logitech G27 wheel
        HID: hiddev: fix error path in hiddev_read when interrupted
        HID: add support for Sony Navigation Controller
        ...
      ee9ec4f8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm · e0c6b8a1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
        apm-emulation: apm_mutex breaks ACK; remove it
        APM: take over maintainership
      e0c6b8a1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 710421cc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
        ASoC: core: Don't set "(null)" as a driver name
        ALSA: hda - Use LPIB for ATI/AMD chipsets as default
        Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
        ASoC: Tegra: Fix compile when debugfs not enabled
        ASoC: spdif-dit: Add missing MODULE_*
        SOUND: OSS: Remove Au1550 driver.
        ALSA: hda - add Intel Panther Point HDMI codec id
        ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
        ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
        ALSA: hda - Fix input-src parse in patch_analog.c
        ASoC: davinci-mcasp: enable ping-pong SRAM buffers
        ASoC: add iPAQ hx4700 machine driver
        ASoC: Asahi Kasei AK4641 codec driver
        ALSA: hda - Enable Realtek ALC269 codec input layer beep
        ALSA: intel8x0m: enable AMD8111 modem
        ALSA: HDA: Add jack detection for HDMI
        ALSA: sound, core, pcm_lib: fix xrun_log
        ASoC: Max98095: Move existing NULL check before pointer dereference.
        ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
        ALSA: usb-audio - Add support for USB X-Fi S51 Pro
        ...
      710421cc
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of... · d7ef64a9
      Linus Torvalds authored
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Eliminate various 'set but not used' warnings
        x86, SMEP: Fix section mismatch warnings
        x86, amd: Use _safe() msr access for GartTlbWlk disable code
      d7ef64a9
    • Tejun Heo's avatar
      block: move bd_set_size() above rescan_partitions() in __blkdev_get() · ff2a9941
      Tejun Heo authored
      02e35228 (block: rescan partitions on invalidated devices on
      -ENOMEDIA too) relocated partition rescan above explicit bd_set_size()
      to simplify condition check.  As rescan_partitions() does its own bdev
      size setting, this doesn't break anything; however,
      rescan_partitions() prints out the following messages when adjusting
      bdev size, which can be confusing.
      
        sda: detected capacity change from 0 to 146815737856
        sdb: detected capacity change from 0 to 146815737856
      
      This patch restores the original order and remove the warning
      messages.
      
      stable: Please apply together with 02e35228
      
       (block: rescan
              partitions on invalidated devices on -ENOMEDIA too).
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarTony Luck <tony.luck@gmail.com>
      Tested-by: default avatarTony Luck <tony.luck@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff2a9941
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm · f4b10bc6
      Linus Torvalds authored
      * 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (131 commits)
        KVM: MMU: Use ptep_user for cmpxchg_gpte()
        KVM: Fix kvm mmu_notifier initialization order
        KVM: Add documentation for KVM_CAP_NR_VCPUS
        KVM: make guest mode entry to be rcu quiescent state
        KVM: x86 emulator: Make jmp far emulation into a separate function
        KVM: x86 emulator: Rename emulate_grpX() to em_grpX()
        KVM: x86 emulator: Remove unused arg from emulate_pop()
        KVM: x86 emulator: Remove unused arg from writeback()
        KVM: x86 emulator: Remove unused arg from read_descriptor()
        KVM: x86 emulator: Remove unused arg from seg_override()
        KVM: Validate userspace_addr of memslot when registered
        KVM: MMU: Clean up gpte reading with copy_from_user()
        KVM: PPC: booke: add sregs support
        KVM: PPC: booke: save/restore VRSAVE (a.k.a. USPRG0)
        KVM: PPC: use ticks, not usecs, for exit timing
        KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
        KVM: PPC: e500: emulate SVR
        KVM: VMX: Cache vmcs segment fields
        KVM: x86 emulator: consolidate segment accessors
        KVM: VMX: Avoid reading %rip unnecessarily when handling exceptions
        ...
      f4b10bc6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 53ee7569
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
        bnx2x: allow device properly initialize after hotplug
        bnx2x: fix DMAE timeout according to hw specifications
        bnx2x: properly handle CFC DEL in cnic flow
        bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb
        net: filter: move forward declarations to avoid compile warnings
        pktgen: refactor pg_init() code
        pktgen: use vzalloc_node() instead of vmalloc_node() + memset()
        net: skb_trim explicitely check the linearity instead of data_len
        ipv4: Give backtrace in ip_rt_bug().
        net: avoid synchronize_rcu() in dev_deactivate_many
        net: remove synchronize_net() from netdev_set_master()
        rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event
        net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
        bridge: call NETDEV_JOIN notifiers when add a slave
        netpoll: disable netpoll when enslave a device
        macvlan: Forward unicast frames in bridge mode to lowerdev
        net: Remove linux/prefetch.h include from linux/skbuff.h
        ipv4: Include linux/prefetch.h in fib_trie.c
        netlabel: Remove prefetches from list handlers.
        drivers/net: add prefetch header for prefetch users
        ...
      
      Fixed up prefetch parts: removed a few duplicate prefetch.h includes,
      fixed the location of the igb prefetch.h, took my version of the
      skbuff.h code without the extra parentheses etc.
      53ee7569
    • Linus Torvalds's avatar
      Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 4d9dec4d
      Linus Torvalds authored
      * 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
        exec: document acct_arg_size()
        exec: unify do_execve/compat_do_execve code
        exec: introduce struct user_arg_ptr
        exec: introduce get_user_arg_ptr() helper
      4d9dec4d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes · 34b06456
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
        GFS2: Wait properly when flushing the ail list
        GFS2: Wipe directory hash table metadata when deallocating a directory
      34b06456
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest · 2e77defc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
        ktest: Allow options to be used by other options
        ktest: Create variables for the ktest config files
        ktest: Reboot after each patchcheck run
        ktest: Reboot to good kernel after every bisect run
        ktest: If test failed due to timeout, print that
        ktest: Fix post install command
      2e77defc
    • Thomas Gleixner's avatar
      hrtimers: Reorder clock bases · 68fa61c0
      Thomas Gleixner authored
      
      
      The ordering of the clock bases is historical due to the
      CLOCK_REALTIME and CLOCK_MONOTONIC constants. Now the hrtimer bases
      have their own enumeration due to the gap between CLOCK_MONOTONIC and
      CLOCK_BOOTTIME. So we can be more clever as most timers end up on the
      CLOCK_MONOTONIC base due to the virtue of POSIX declaring that
      relative CLOCK_REALTIME timers are not affected by time changes. In
      desktop environments this is slowly changing as applications switch to
      absolute timers, but I've observed empty CLOCK_REALTIME bases often
      enough. There is no performance penalty or overhead when
      CLOCK_REALTIME timers are active, but in case they are not we don't
      skip over a full cache line.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: default avatarPeter Zijlstra <peterz@infradead.org>
      68fa61c0
    • Thomas Gleixner's avatar
      hrtimers: Avoid touching inactive timer bases · ab8177bc
      Thomas Gleixner authored
      
      
      Instead of iterating over all possible timer bases avoid it by marking
      the active bases in the cpu base.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: default avatarPeter Zijlstra <peterz@infradead.org>
      ab8177bc
    • Thomas Gleixner's avatar
      hrtimers: Make struct hrtimer_cpu_base layout less stupid · f24444b0
      Thomas Gleixner authored
      
      
      In the HIGHRES=y case we access the members at the end of struct
      hrtimer_cpu_base first and then the one at the beginning. Move the
      hrtimer data to front, so we have linear progressing access.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: default avatarPeter Zijlstra <peterz@infradead.org>
      f24444b0
    • Thomas Gleixner's avatar
      timerfd: Manage cancelable timers in timerfd · 9ec26907
      Thomas Gleixner authored
      
      
      Peter is concerned about the extra scan of CLOCK_REALTIME_COS in the
      timer interrupt. Yes, I did not think about it, because the solution
      was so elegant. I didn't like the extra list in timerfd when it was
      proposed some time ago, but with a rcu based list the list walk it's
      less horrible than the original global lock, which was held over the
      list iteration.
      Requested-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: default avatarPeter Zijlstra <peterz@infradead.org>
      9ec26907
    • Frederic Weisbecker's avatar
      perf tools: Fix sample size bit operations · 3cb6d154
      Frederic Weisbecker authored
      
      
      What we want is to count the number of bits in the mask,
      not some other random operation written in the middle
      of the night.
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1306148788-6179-2-git-send-email-fweisbec@gmail.com
      
      
      [ Fixed perf_event__names[] alignment which was nearby and hurting my eyes ... ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      3cb6d154
    • Frederic Weisbecker's avatar
      perf tools: Fix ommitted mmap data update on remap · 998bedc8
      Frederic Weisbecker authored
      Commit eac9eace
      
       "perf tools: Check we are able to read the event
      size on mmap" brought a check to ensure we can read the size of the
      event before dereferencing it, and do a remap otherwise to move the
      buffer forward.
      
      However that remap was ommitting all the necessary work to
      update the new page offset, head, and to unmap previous pages,
      etc...
      
      To fix this, gather all the code that fetches the event in a
      seperate helper which does all the necessary checks about the
      header/event size and tells us anytime a remap is needed.
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/r/1306148788-6179-3-git-send-email-fweisbec@gmail.com
      
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      998bedc8
    • Paul Parsons's avatar
      apm-emulation: apm_mutex breaks ACK; remove it · fda5fe19
      Paul Parsons authored
      
      
      apm_mutex is locked by a process (e.g. apm -s) at the start of apm_ioctl() and
      remains locked while pm_suspend() is called. Any subsequent process trying to
      ACK the suspend (e.g. apmd) is then blocked at the start of apm_ioctl(),
      causing the suspend to be delayed for 5 seconds in apm_suspend_notifier()
      while the ACK times out. In short, ACKs don't work.
      
      The driver's data structures are sufficiently protected by assorted locks. And
      pm_suspend() has its own mutex to prevent reentrancy. Consequently there is no
      obvious requirement for apm_mutex, which evolved from earlier BKL calls. So
      let's remove it.
      Signed-off-by: default avatarPaul Parsons <lost.distance@yahoo.com>
      Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      fda5fe19
    • Jiri Kosina's avatar
    • Mandeep Singh Baines's avatar
      watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh · 4eec42f3
      Mandeep Singh Baines authored
      
      
      Before the conversion of the NMI watchdog to perf event, the
      watchdog timeout was 5 seconds. Now it is 60 seconds. For my
      particular application, netbooks, 5 seconds was a better
      timeout. With a short timeout, we catch faults earlier and are
      able to send back a panic. With a 60 second timeout, the user is
      unlikely to wait and will instead hit the power button, causing
      us to lose the panic info.
      
      This change configures the NMI period to watchdog_thresh and
      sets the softlockup_thresh to watchdog_thresh * 2. In addition,
      watchdog_thresh was reduced to 10 seconds as suggested by Ingo
      Molnar.
      Signed-off-by: default avatarMandeep Singh Baines <msb@chromium.org>
      Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Don Zickus <dzickus@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Link: http://lkml.kernel.org/r/1306127423-3347-4-git-send-email-msb@chromium.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      LKML-Reference: <20110517071642.GF22305@elte.hu>
      4eec42f3
    • Mandeep Singh Baines's avatar
      watchdog: Disable watchdog when thresh is zero · 586692a5
      Mandeep Singh Baines authored
      
      
      This restores the previous behavior of softlock_thresh.
      
      Currently, setting watchdog_thresh to zero causes the watchdog
      kthreads to consume a lot of CPU.
      
      In addition, the logic of proc_dowatchdog_thresh and
      proc_dowatchdog_enabled has been factored into proc_dowatchdog.
      Signed-off-by: default avatarMandeep Singh Baines <msb@chromium.org>
      Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Don Zickus <dzickus@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Link: http://lkml.kernel.org/r/1306127423-3347-3-git-send-email-msb@chromium.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      LKML-Reference: <20110517071018.GE22305@elte.hu>
      586692a5
    • Mandeep Singh Baines's avatar
      watchdog: Only disable/enable watchdog if neccessary · e04ab2bc
      Mandeep Singh Baines authored
      
      
      Don't take any action on an unsuccessful write to /proc.
      Signed-off-by: default avatarMandeep Singh Baines <msb@chromium.org>
      Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Don Zickus <dzickus@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Link: http://lkml.kernel.org/r/1306127423-3347-2-git-send-email-msb@chromium.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      e04ab2bc
    • Mandeep Singh Baines's avatar
      watchdog: Fix rounding bug in get_sample_period() · 824c6b7f
      Mandeep Singh Baines authored
      
      
      In get_sample_period(), softlockup_thresh is integer divided by
      5 before the multiplication by NSEC_PER_SEC. This results in
      softlockup_thresh being rounded down to the nearest integer
      multiple of 5.
      
      For example, a softlockup_thresh of 4 rounds down to 0.
      Signed-off-by: default avatarMandeep Singh Baines <msb@chromium.org>
      Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Don Zickus <dzickus@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Link: http://lkml.kernel.org/r/1306127423-3347-1-git-send-email-msb@chromium.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      824c6b7f
    • Jim Cromie's avatar
      b43: fix comment typo reqest -> request · e64851f5
      Jim Cromie authored
      
      
      Recent trivial fix corrected 'occured', but left 'reqest'.
      codespell needs another dictionary entry.
      
      cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
      Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      e64851f5
    • Benjamin Tissoires's avatar
      HID: hid-multitouch: cosmetic changes, sort classes and devices · 22408283
      Benjamin Tissoires authored
      
      
      This patch sorts the defs for the MT_CLS. I choose to split
      generic classes and device specific ones to be able to add
      more generic classes in the future.
      
      It also put eGalax devices at their right place (alphabetically)
      in mt_devices.
      Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@enac.fr>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      22408283
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · caebc160
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        nilfs2: use mark_buffer_dirty to mark btnode or meta data dirty
        nilfs2: always set back pointer to host inode in mapping->host
        nilfs2: get rid of NILFS_I_NILFS
        nilfs2: use list_first_entry
        nilfs2: use empty_aops for gc-inodes
        nilfs2: implement resize ioctl
        nilfs2: add truncation routine of segment usage file
        nilfs2: add routine to move secondary super block
        nilfs2: add ioctl which limits range of segment to be allocated
        nilfs2: zero fill unused portion of super root block
        nilfs2: super root size should change depending on inode size
        nilfs2: get rid of private page allocator
        nilfs2: merge list_del()/list_add_tail() to list_move_tail()
      caebc160
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 · d798f7f0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
        ide/ide-scan-pci.c: Use for_each_pci_dev().
        ide: Use linux/mutex.h
        IDE: ide-floppy, remove unnecessary NULL check
        drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
        ide: fix use after free in ide-acpi
      d798f7f0
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · e98bae75
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (28 commits)
        sparc32: fix build, fix missing cpu_relax declaration
        SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI
        sparc32,leon: Remove unnecessary page_address calls in LEON DMA API.
        sparc: convert old cpumask API into new one
        sparc32, sun4d: Implemented SMP IPIs support for SUN4D machines
        sparc32, sun4m: Implemented SMP IPIs support for SUN4M machines
        sparc32,leon: Implemented SMP IPIs for LEON CPU
        sparc32: implement SMP IPIs using the generic functions
        sparc32,leon: SMP power down implementation
        sparc32,leon: added some SMP comments
        sparc: add {read,write}*_be routines
        sparc32,leon: don't rely on bootloader to mask IRQs
        sparc32,leon: operate on boot-cpu IRQ controller registers
        sparc32: always define boot_cpu_id
        sparc32: removed unused code, implemented by generic code
        sparc32: avoid build warning at mm/percpu.c:1647
        sparc32: always register a PROM based early console
        sparc32: probe for cpu info only during startup
        sparc: consolidate show_cpuinfo in cpu.c
        sparc32,leon: implement genirq CPU affinity
        ...
      e98bae75
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · 4b382d06
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md:
        md: allow resync_start to be set while an array is active.
        md/raid10:  reformat some loops with less indenting.
        md/raid10: remove unused variable.
        md/raid10: make more use of 'slot' in raid10d.
        md/raid10: some tidying up in fix_read_error
        md/raid1: improve handling of pages allocated for write-behind.
        md/raid1: try fix_sync_read_error before process_checks.
        md/raid1: tidy up new functions: process_checks and fix_sync_read_error.
        md/raid1: split out two sub-functions from sync_request_write
        md: make error_handler functions more uniform and correct.
        md/multipath: discard ->working_disks in favour of ->degraded
        md/raid1: clean up read_balance.
        md: simplify raid10 read_balance
        md/bitmap: fix saving of events_cleared and other state.
        md: reject a re-add request that cannot be honoured.
        md: Fix race when creating a new md device.
      4b382d06
    • Randy Dunlap's avatar
      wireless: fix fatal kernel-doc error + warning in mac80211.h · bdfbe804
      Randy Dunlap authored
      
      
      Fix new kernel-doc Error and Warning in <net/mac80211.h>:
      
        Error(linux-2.6.39-git5/include/net/mac80211.h:550): cannot understand prototype: 'struct ieee80211_sched_scan_ies '
        Warning(linux-2.6.39-git5/include/net/mac80211.h:2289): No description found for parameter 'sta'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bdfbe804
    • Linus Torvalds's avatar
      x86: setup_smep needs to be __cpuinit · 82da65da
      Linus Torvalds authored
      
      
      The setup_smep function gets calle at resume time too, and is thus not a
      pure __init function.  When marked as __init, it gets thrown out after
      the kernel has initialized, and when the kernel is suspended and
      resumed, the code will no longer be around, and we'll get a nice "kernel
      tried to execute NX-protected page" oops because the page is no longer
      marked executable.
      Reported-and-tested-by: default avatarParag Warudkar <parag.lkml@gmail.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: "H. Peter Anvin" <hpa@linux.intel.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      82da65da