1. 11 Jan, 2012 1 commit
  2. 10 Jan, 2012 2 commits
  3. 06 Jan, 2012 15 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · edf7c814
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: add IRQ context simulation in module mce-inject
        x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
        x86, MCE: Drain mcelog buffer
        x86, mce: Add wrappers for registering on the decode chain
      edf7c814
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 82406da4
      Linus Torvalds authored
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode, AMD: Update copyrights
        x86, microcode, AMD: Exit early on success
        x86, microcode, AMD: Simplify ucode verification
        x86, microcode, AMD: Add a reusable buffer
        x86, microcode, AMD: Add a vendor-specific exit function
      82406da4
    • Linus Torvalds's avatar
      Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7a222156
      Linus Torvalds authored
      * 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        random: Use arch_get_random_int instead of cycle counter if avail
      7a222156
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2c364faa
      Linus Torvalds authored
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, centaur: Enable cx8 for VIA Eden too
      2c364faa
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cf3f3355
      Linus Torvalds authored
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Use "do { } while(0)" for empty lock_cmos()/unlock_cmos() macros
        x86: Use "do { } while(0)" for empty flush_tlb_fix_spurious_fault() macro
        x86, CPU: Drop superfluous get_cpu_cap() prototype
        arch/x86/mm/pageattr.c: Quiet sparse noise; local functions should be static
        arch/x86/kernel/ptrace.c: Quiet sparse noise
        x86: Use kmemdup() in copy_thread(), rather than duplicating its implementation
        x86: Replace the EVT_TO_HPET_DEV() macro with an inline function
      cf3f3355
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 69734b64
      Linus Torvalds authored
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        x86: Fix atomic64_xxx_cx8() functions
        x86: Fix and improve cmpxchg_double{,_local}()
        x86_64, asm: Optimise fls(), ffs() and fls64()
        x86, bitops: Move fls64.h inside __KERNEL__
        x86: Fix and improve percpu_cmpxchg{8,16}b_double()
        x86: Report cpb and eff_freq_ro flags correctly
        x86/i386: Use less assembly in strlen(), speed things up a bit
        x86: Use the same node_distance for 32 and 64-bit
        x86: Fix rflags in FAKE_STACK_FRAME
        x86: Clean up and extend do_int3()
        x86: Call do_notify_resume() with interrupts enabled
        x86/div64: Add a micro-optimization shortcut if base is power of two
        x86-64: Cleanup some assembly entry points
        x86-64: Slightly shorten line system call entry and exit paths
        x86-64: Reduce amount of redundant code generated for invalidate_interruptNN
        x86-64: Slightly shorten int_ret_from_sys_call
        x86, efi: Convert efi_phys_get_time() args to physical addresses
        x86: Default to vsyscall=emulate
        x86-64: Set siginfo and context on vsyscall emulation faults
        x86: consolidate xchg and xadd macros
        ...
      69734b64
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 67b02431
      Linus Torvalds authored
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Skip cpus with apic-ids >= 255 in !x2apic_mode
        x86, x2apic: Allow "nox2apic" to disable x2apic mode setup by BIOS
        x86, x2apic: Fallback to xapic when BIOS doesn't setup interrupt-remapping
        x86, acpi: Skip acpi x2apic entries if the x2apic feature is not present
        x86, apic: Add probe() for apic_flat
        x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'
        x86: Convert per-cpu counter icr_read_retry_count into a member of irq_stat
        x86: Add per-cpu stat counter for APIC ICR read tries
        pci, x86/io-apic: Allow PCI_IOAPIC to be user configurable on x86
        x86: Fix the !CONFIG_NUMA build of the new CPU ID fixup code support
        x86: Add NumaChip support
        x86: Add x86_init platform override to fix up NUMA core numbering
        x86: Make flat_init_apic_ldr() available
      67b02431
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 376613e8
      Linus Torvalds authored
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, tsc: Skip TSC synchronization checks for tsc=reliable
        clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz
        clocksource: cris: Convert to clocksource_register_khz
        clocksource: xtensa: Convert to clocksource_register_hz/khz
        clocksource: um: Convert to clocksource_register_hz/khz
        clocksource: parisc: Convert to clocksource_register_hz/khz
        clocksource: m86k: Convert to clocksource_register_hz/khz
        time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver
        time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
        time: x86: Remove CLOCK_TICK_RATE from mach_timer.h
        time: x86: Remove CLOCK_TICK_RATE from tsc code
        time: Fix spelling mistakes in new comments
        time: fix bogus comment in timekeeping_get_ns_raw
      376613e8
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0db49b72
      Linus Torvalds authored
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)
        sched/tracing: Add a new tracepoint for sleeptime
        sched: Disable scheduler warnings during oopses
        sched: Fix cgroup movement of waking process
        sched: Fix cgroup movement of newly created process
        sched: Fix cgroup movement of forking process
        sched: Remove cfs bandwidth period check in tg_set_cfs_period()
        sched: Fix load-balance lock-breaking
        sched: Replace all_pinned with a generic flags field
        sched: Only queue remote wakeups when crossing cache boundaries
        sched: Add missing rcu_dereference() around ->real_parent usage
        [S390] fix cputime overflow in uptime_proc_show
        [S390] cputime: add sparse checking and cleanup
        sched: Mark parent and real_parent as __rcu
        sched, nohz: Fix missing RCU read lock
        sched, nohz: Set the NOHZ_BALANCE_KICK flag for idle load balancer
        sched, nohz: Fix the idle cpu check in nohz_idle_balance
        sched: Use jump_labels for sched_feat
        sched/accounting: Fix parameter passing in task_group_account_field
        sched/accounting: Fix user/system tick double accounting
        sched/accounting: Re-use scheduler statistics for the root cgroup
        ...
      
      Fix up conflicts in
       - arch/ia64/include/asm/cputime.h, include/asm-generic/cputime.h
      	usecs_to_cputime64() vs the sparse cleanups
       - kernel/sched/fair.c, kernel/time/tick-sched.c
      	scheduler changes in multiple branches
      0db49b72
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35b740e4
      Linus Torvalds authored
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)
        perf kvm: Fix copy & paste error in description
        perf script: Kill script_spec__delete
        perf top: Fix a memory leak
        perf stat: Introduce get_ratio_color() helper
        perf session: Remove impossible condition check
        perf tools: Fix feature-bits rework fallout, remove unused variable
        perf script: Add generic perl handler to process events
        perf tools: Use for_each_set_bit() to iterate over feature flags
        perf tools: Unify handling of features when writing feature section
        perf report: Accept fifos as input file
        perf tools: Moving code in some files
        perf tools: Fix out-of-bound access to struct perf_session
        perf tools: Continue processing header on unknown features
        perf tools: Improve macros for struct feature_ops
        perf: builtin-record: Document and check that mmap_pages must be a power of two.
        perf: builtin-record: Provide advice if mmap'ing fails with EPERM.
        perf tools: Fix truncated annotation
        perf script: look up thread using tid instead of pid
        perf tools: Look up thread names for system wide profiling
        perf tools: Fix comm for processes with named threads
        ...
      35b740e4
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 423d091d
      Linus Torvalds authored
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)
        cpu: Export cpu_up()
        rcu: Apply ACCESS_ONCE() to rcu_boost() return value
        Revert "rcu: Permit rt_mutex_unlock() with irqs disabled"
        docs: Additional LWN links to RCU API
        rcu: Augment rcu_batch_end tracing for idle and callback state
        rcu: Add rcutorture tests for srcu_read_lock_raw()
        rcu: Make rcutorture test for hotpluggability before offlining CPUs
        driver-core/cpu: Expose hotpluggability to the rest of the kernel
        rcu: Remove redundant rcu_cpu_stall_suppress declaration
        rcu: Adaptive dyntick-idle preparation
        rcu: Keep invoking callbacks if CPU otherwise idle
        rcu: Irq nesting is always 0 on rcu_enter_idle_common
        rcu: Don't check irq nesting from rcu idle entry/exit
        rcu: Permit dyntick-idle with callbacks pending
        rcu: Document same-context read-side constraints
        rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass
        rcu: Remove dynticks false positives and RCU failures
        rcu: Reduce latency of rcu_prepare_for_idle()
        rcu: Eliminate RCU_FAST_NO_HZ grace-period hang
        rcu: Avoid needlessly IPIing CPUs at GP end
        ...
      423d091d
    • Linus Torvalds's avatar
      Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1483b382
      Linus Torvalds authored
      * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        printk, lockdep: Switch to tracked irq ops
        printk, lockdep: Remove superfluous preempt_disable()
        printk, lockdep: Disable lock debugging on zap_locks()
      1483b382
    • Linus Torvalds's avatar
      Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4a2164a7
      Linus Torvalds authored
      * 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)
        memblock: Reimplement memblock allocation using reverse free area iterator
        memblock: Kill early_node_map[]
        score: Use HAVE_MEMBLOCK_NODE_MAP
        s390: Use HAVE_MEMBLOCK_NODE_MAP
        mips: Use HAVE_MEMBLOCK_NODE_MAP
        ia64: Use HAVE_MEMBLOCK_NODE_MAP
        SuperH: Use HAVE_MEMBLOCK_NODE_MAP
        sparc: Use HAVE_MEMBLOCK_NODE_MAP
        powerpc: Use HAVE_MEMBLOCK_NODE_MAP
        memblock: Implement memblock_add_node()
        memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users
        memblock: Track total size of regions automatically
        powerpc: Cleanup memblock usage
        memblock: Reimplement memblock_enforce_memory_limit() using __memblock_remove()
        memblock: Make memblock functions handle overflowing range @size
        memblock: Reimplement __memblock_remove() using memblock_isolate_range()
        memblock: Separate out memblock_isolate_range() from memblock_set_node()
        memblock: Kill memblock_init()
        memblock: Kill sentinel entries at the end of static region arrays
        memblock: Add __memblock_dump_all()
        ...
      4a2164a7
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 15f043a6
      Linus Torvalds authored
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        lockdep/waitqueues: Add better annotation
        lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging
        lockdep: Print lock name in lockdep_init_error()
        init/main.c: Execute lockdep_init() as early as possible
        lockdep, kmemcheck: Annotate ->lock in lockdep_init_map()
        lockdep, rtmutex, bug: Show taint flags on error
        lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep
        lockdep: Always try to set ->class_cache in register_lock_class() lockdep_init_map()
      15f043a6
    • Linus Torvalds's avatar
      Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8c717b72
      Linus Torvalds authored
      * 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timer: Use debugobjects to catch deletion of uninitialized timers
        timer: Setup uninitialized timer with a stub callback
        debugobjects: Extend to assert that an object is initialized
        debugobjects: Be smarter about static objects
      8c717b72
  4. 05 Jan, 2012 1 commit
    • Linus Torvalds's avatar
      vfs: fix up ENOIOCTLCMD error handling · 07d106d0
      Linus Torvalds authored
      We're doing some odd things there, which already messes up various users
      (see the net/socket.c code that this removes), and it was going to add
      yet more crud to the block layer because of the incorrect error code
      translation.
      
      ENOIOCTLCMD is not an error return that should be returned to user mode
      from the "ioctl()" system call, but it should *not* be translated as
      EINVAL ("Invalid argument").  It should be translated as ENOTTY
      ("Inappropriate ioctl for device").
      
      That EINVAL confusion has apparently so permeated some code that the
      block layer actually checks for it, which is sad.  We continue to do so
      for now, but add a big comment about how wrong that is, and we should
      remove it entirely eventually.  In the meantime, this tries to keep the
      changes localized to just the EINVAL -> ENOTTY fix, and removing code
      that makes it harder to do the right thing.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      07d106d0
  5. 04 Jan, 2012 16 commits
  6. 03 Jan, 2012 5 commits
    • Oliver Hartkopp's avatar
      fix CAN MAINTAINERS SCM tree type · 405cc273
      Oliver Hartkopp authored
      As pointed out by Joe Perches the SCM tree type was missing in my patch.
      Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
      
      CC: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
      CC: Urs Thuermann <urs.thuermann@volkswagen.de>
      CC: Wolfgang Grandegger <wg@grandegger.com>
      CC: Marc Kleine-Budde <mkl@pengutronix.de>
      CC: linux-can@vger.kernel.org
      405cc273
    • Amitkumar Karwar's avatar
      mwifiex: fix crash during simultaneous scan and connect · b015dbc0
      Amitkumar Karwar authored
      If 'iw connect' command is fired when driver is already busy in
      serving 'iw scan' command, ssid specific scan operation for connect
      is skipped. In this case cmd wait queue handler gets called with no
      command in queue (i.e. adapter->cmd_queued = NULL).
      
      This patch adds a NULL check in mwifiex_wait_queue_complete()
      routine to fix crash observed during simultaneous scan and assoc
      operations.
      Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
      Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      b015dbc0
    • Guennadi Liakhovetski's avatar
      b43: fix regression in PIO case · 09009512
      Guennadi Liakhovetski authored
      This patch fixes the regression, introduced by
      
      commit 17030f48
      From: Rafał Miłecki <zajec5@gmail.com>
      Date: Thu, 11 Aug 2011 17:16:27 +0200
      Subject: [PATCH] b43: support new RX header, noticed to be used in 598.314+ fw
      
      in PIO case.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      09009512
    • Mohammed Shafi Shajakhan's avatar
      ath9k: Fix kernel panic in AR2427 in AP mode · b25bfda3
      Mohammed Shafi Shajakhan authored
      don't do aggregation related stuff for 'AP mode client power save
      handling' if aggregation is not enabled in the driver, otherwise it
      will lead to panic because those data structures won't be never
      intialized in 'ath_tx_node_init' if aggregation is disabled
      
      	EIP is at ath_tx_aggr_wakeup+0x37/0x80 [ath9k]
      	EAX: e8c09a20 EBX: f2a304e8 ECX: 00000001 EDX: 00000000
      	ESI: e8c085e0 EDI: f2a304ac EBP: f40e1ca4 ESP: f40e1c8c
      	DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
      	Process swapper/1 (pid: 0, ti=f40e0000 task=f408e860
      	task.ti=f40dc000)
      	Stack:
      	0001e966 e8c09a20 00000000 f2a304ac e8c085e0 f2a304ac
      	f40e1cb0 f8186741
      	f8186700 f40e1d2c f922988d f2a304ac 00000202 00000001
      	c0b4ba43 00000000
      	0000000f e8eb75c0 e8c085e0 205b0001 34383220 f2a304ac
      	f2a30000 00010020
      	Call Trace:
      	[<f8186741>] ath9k_sta_notify+0x41/0x50 [ath9k]
      	[<f8186700>] ? ath9k_get_survey+0x110/0x110 [ath9k]
      	[<f922988d>] ieee80211_sta_ps_deliver_wakeup+0x9d/0x350
      	[mac80211]
      	[<c018dc75>] ? __module_address+0x95/0xb0
      	[<f92465b3>] ap_sta_ps_end+0x63/0xa0 [mac80211]
      	[<f9246746>] ieee80211_rx_h_sta_process+0x156/0x2b0
      	[mac80211]
      	[<f9247d1e>] ieee80211_rx_handlers+0xce/0x510 [mac80211]
      	[<c018440b>] ? trace_hardirqs_on+0xb/0x10
      	[<c056936e>] ? skb_queue_tail+0x3e/0x50
      	[<f9248271>] ieee80211_prepare_and_rx_handle+0x111/0x750
      	[mac80211]
      	[<f9248bf9>] ieee80211_rx+0x349/0xb20 [mac80211]
      	[<f9248949>] ? ieee80211_rx+0x99/0xb20 [mac80211]
      	[<f818b0b8>] ath_rx_tasklet+0x818/0x1d00 [ath9k]
      	[<f8187a75>] ? ath9k_tasklet+0x35/0x1c0 [ath9k]
      	[<f8187a75>] ? ath9k_tasklet+0x35/0x1c0 [ath9k]
      	[<f8187b33>] ath9k_tasklet+0xf3/0x1c0 [ath9k]
      	[<c0151b7e>] tasklet_action+0xbe/0x180
      
      Cc: stable@kernel.org
      Cc: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
      Cc: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
      Reported-by: default avatarAshwin Mendonca <ashwinloyal@gmail.com>
      Tested-by: default avatarAshwin Mendonca <ashwinloyal@gmail.com>
      Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      b25bfda3
    • John W. Linville's avatar