1. 20 May, 2011 35 commits
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of... · bc091c93
      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:
        extable, core_kernel_data(): Make sure all archs define _sdata
        core_kernel_data(): Fix architectures that do not define _sdata
      bc091c93
    • Linus Torvalds's avatar
      Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 3ed4c058
      Linus Torvalds authored
      * 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (41 commits)
        signal: trivial, fix the "timespec declared inside parameter list" warning
        job control: reorganize wait_task_stopped()
        ptrace: fix signal->wait_chldexit usage in task_clear_group_stop_trapping()
        signal: sys_sigprocmask() needs retarget_shared_pending()
        signal: cleanup sys_sigprocmask()
        signal: rename signandsets() to sigandnsets()
        signal: do_sigtimedwait() needs retarget_shared_pending()
        signal: introduce do_sigtimedwait() to factor out compat/native code
        signal: sys_rt_sigtimedwait: simplify the timeout logic
        signal: cleanup sys_rt_sigprocmask()
        x86: signal: sys_rt_sigreturn() should use set_current_blocked()
        x86: signal: handle_signal() should use set_current_blocked()
        signal: sigprocmask() should do retarget_shared_pending()
        signal: sigprocmask: narrow the scope of ->siglock
        signal: retarget_shared_pending: optimize while_each_thread() loop
        signal: retarget_shared_pending: consider shared/unblocked signals only
        signal: introduce retarget_shared_pending()
        ptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/
        signal: Turn SIGNAL_STOP_DEQUEUED into GROUP_STOP_DEQUEUED
        signal: do_signal_stop: Remove the unneeded task_clear_group_stop_pending()
        ...
      3ed4c058
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ad947175
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (110 commits)
        [SCSI] qla2xxx: Refactor call to qla2xxx_read_sfp for thermal temperature.
        [SCSI] qla2xxx: Unify the read/write sfp mailbox command routines.
        [SCSI] qla2xxx: Clear complete initialization control block.
        [SCSI] qla2xxx: Allow an override of the registered maximum LUN.
        [SCSI] qla2xxx: Add host number in reset and quiescent message logs.
        [SCSI] qla2xxx: Correctly read sfp single byte mailbox register.
        [SCSI] qla2xxx: Add qla82xx_rom_unlock() function.
        [SCSI] qla2xxx: Log if qla82xx firmware fails to load from flash.
        [SCSI] qla2xxx: Use passed in host to initialize local scsi_qla_host in queuecommand function
        [SCSI] qla2xxx: Correct buffer start in edc sysfs debug print.
        [SCSI] qla2xxx: Update firmware version after flash update for ISP82xx.
        [SCSI] qla2xxx: Fix hang during driver unload when vport is active.
        [SCSI] qla2xxx: Properly set the dsd_list_len for dsd_chaining in cmd type 6.
        [SCSI] qla2xxx: Fix virtual port failing to login after chip reset.
        [SCSI] qla2xxx: Fix vport delete hang when logins are outstanding.
        [SCSI] hpsa: Change memset using sizeof(ptr) to sizeof(*ptr)
        [SCSI] ipr: Rate limit DMA mapping errors
        [SCSI] hpsa: add P2000 to list of shared SAS devices
        [SCSI] hpsa: do not attempt PCI power management reset method if we know it won't work.
        [SCSI] hpsa: remove superfluous sleeps around reset code
        ...
      ad947175
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 6c1b8d94
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (32 commits)
        GFS2: Move all locking inside the inode creation function
        GFS2: Clean up symlink creation
        GFS2: Clean up mkdir
        GFS2: Use UUID field in generic superblock
        GFS2: Rename ops_inode.c to inode.c
        GFS2: Inode.c is empty now, remove it
        GFS2: Move final part of inode.c into super.c
        GFS2: Move most of the remaining inode.c into ops_inode.c
        GFS2: Move gfs2_refresh_inode() and friends into glops.c
        GFS2: Remove gfs2_dinode_print() function
        GFS2: When adding a new dir entry, inc link count if it is a subdir
        GFS2: Make gfs2_dir_del update link count when required
        GFS2: Don't use gfs2_change_nlink in link syscall
        GFS2: Don't use a try lock when promoting to a higher mode
        GFS2: Double check link count under glock
        GFS2: Improve bug trap code in ->releasepage()
        GFS2: Fix ail list traversal
        GFS2: make sure fallocate bytes is a multiple of blksize
        GFS2: Add an AIL writeback tracepoint
        GFS2: Make writeback more responsive to system conditions
        ...
      6c1b8d94
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 82aff107
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
        powerpc: Fix hard CPU IDs detection
        powerpc/pmac: Update via-pmu to new syscore_ops
        powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
        powerpc/kvm: Fix kvmppc_core_pending_dec
        powerpc: Remove last piece of GEMINI
        powerpc: Fix for Pegasos keyboard and mouse
        powerpc: Make early memory scan more resilient to out of order nodes
        powerpc/pseries/iommu: Cleanup ddw naming
        powerpc/pseries/iommu: Find windows after kexec during boot
        powerpc/pseries/iommu: Remove ddw property when destroying window
        powerpc/pseries/iommu: Add additional checks when changing iommu mask
        powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
        powerpc: Remove unused/obsolete CONFIG_XICS
        misc: Add CARMA DATA-FPGA Programmer support
        misc: Add CARMA DATA-FPGA Access Driver
        powerpc: Make IRQ_NOREQUEST last to clear, first to set
        powerpc: Integrated Flash controller device tree bindings
        powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
        powerpc/85xx: Fix PCIe IDSEL for Px020RDB
        powerpc/85xx: P2020 DTS: re-organize dts files
        ...
      82aff107
    • Stephen Rothwell's avatar
      spinlock_up.h: include asm/processor.h in for cpu_relax · d974d905
      Stephen Rothwell authored
      Commit e66eed65 ("list: remove prefetching from regular list
      iterators") removed the include of prefetch.h from list.h and this was a
      path to including asm/processor.h.  We need to include it excplicitly
      now.
      
      Fixes this build error on sparc32 (at least):
      
        In file included from include/linux/seqlock.h:29,
                         from include/linux/time.h:8,
                         from include/linux/timex.h:56,
                         from include/linux/sched.h:57,
                         from arch/sparc/kernel/asm-offsets.c:13:
        include/linux/spinlock.h: In function 'spin_unlock_wait':
        include/linux/spinlock.h:360: error: implicit declaration of function 'cpu_relax
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d974d905
    • Linus Torvalds's avatar
      sanitize <linux/prefetch.h> usage · 268bb0ce
      Linus Torvalds authored
      Commit e66eed65 ("list: remove prefetching from regular list
      iterators") removed the include of prefetch.h from list.h, which
      uncovered several cases that had apparently relied on that rather
      obscure header file dependency.
      
      So this fixes things up a bit, using
      
         grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
         grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')
      
      to guide us in finding files that either need <linux/prefetch.h>
      inclusion, or have it despite not needing it.
      
      There are more of them around (mostly network drivers), but this gets
      many core ones.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      268bb0ce
    • Benjamin Herrenschmidt's avatar
      powerpc: Fix hard CPU IDs detection · 208b3a4c
      Benjamin Herrenschmidt authored
      commit 9d07bc84
      "powerpc: Properly handshake CPUs going out of boot spin loop"
      
      Would cause a miscalculation of the hard CPU ID. It removes breaking
      out of the loop when finding a match with a processor, thus the "i"
      used as an index in the intserv array is always incorrect
      
      This broke interrupt on my PowerMac laptop.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      208b3a4c
    • Steven Rostedt's avatar
      extable, core_kernel_data(): Make sure all archs define _sdata · a2d063ac
      Steven Rostedt authored
      A new utility function (core_kernel_data()) is used to determine if a
      passed in address is part of core kernel data or not. It may or may not
      return true for RO data, but this utility must work for RW data.
      
      Thus both _sdata and _edata must be defined and continuous,
      without .init sections that may later be freed and replaced by
      volatile memory (memory that can be freed).
      
      This utility function is used to determine if data is safe from
      ever being freed. Thus it should return true for all RW global
      data that is not in a module or has been allocated, or false
      otherwise.
      
      Also change core_kernel_data() back to the more precise _sdata condition
      and document the function.
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Acked-by: default avatarHirokazu Takata <takata@linux-m32r.org>
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: linux-m68k@lists.linux-m68k.org
      Cc: Kyle McMartin <kyle@mcmartin.ca>
      Cc: Helge Deller <deller@gmx.de>
      Cc: JamesE.J.Bottomley <jejb@parisc-linux.org>
      Link: http://lkml.kernel.org/r/1305855298.1465.19.camel@gandalf.stny.rr.comSigned-off-by: default avatarIngo Molnar <mingo@elte.hu>
      ----
       arch/alpha/kernel/vmlinux.lds.S   |    1 +
       arch/m32r/kernel/vmlinux.lds.S    |    1 +
       arch/m68k/kernel/vmlinux-std.lds  |    2 ++
       arch/m68k/kernel/vmlinux-sun3.lds |    1 +
       arch/mips/kernel/vmlinux.lds.S    |    1 +
       arch/parisc/kernel/vmlinux.lds.S  |    3 +++
       kernel/extable.c                  |   12 +++++++++++-
       7 files changed, 20 insertions(+), 1 deletion(-)
      a2d063ac
    • Ingo Molnar's avatar
      Merge branch 'perf/core' into perf/urgent · c16dbd54
      Ingo Molnar authored
      Merge reason: One pending commit was left in perf/core after Linus merged
                    perf/core - continue v2.6.40 work in the perf/urgent reason.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      c16dbd54
    • Benjamin Herrenschmidt's avatar
      powerpc/pmac: Update via-pmu to new syscore_ops · e83b906c
      Benjamin Herrenschmidt authored
      This was left as a sysdev, breaking the build
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e83b906c
    • Benjamin Herrenschmidt's avatar
      Merge remote branch 'origin/master' into merge · 880102e7
      Benjamin Herrenschmidt authored
      Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
      call to arch/powerpc/platforms/cell/interrupt.c
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      880102e7
    • Linus Torvalds's avatar
      selinux: avoid unnecessary avc cache stat hit count · 257313b2
      Linus Torvalds authored
      There is no point in counting hits - we can calculate it from the number
      of lookups and misses.
      
      This makes the avc statistics a bit smaller, and makes the code
      generation better too.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      257313b2
    • Benjamin Herrenschmidt's avatar
      3d07f0e8
    • Paul Mackerras's avatar
      powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors · 593adf31
      Paul Mackerras authored
      Commits a5d4f3ad ("powerpc: Base support for exceptions using
      HSRR0/1") and 673b189a ("powerpc: Always use SPRN_SPRG_HSCRATCH0
      when running in HV mode") cause compile and link errors for 32-bit
      classic Book 3S processors when KVM is enabled.  This fixes these
      errors.
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      593adf31
    • Paul Mackerras's avatar
      powerpc/kvm: Fix kvmppc_core_pending_dec · 44075d95
      Paul Mackerras authored
      The vcpu->arch.pending_exceptions field is a bitfield indexed by
      interrupt priority number as returned by kvmppc_book3s_vec2irqprio.
      However, kvmppc_core_pending_dec was using an interrupt vector shifted
      by 7 as the bit index.  Fix it to use the irqprio value for the
      decrementer interrupt instead.  This problem was found by code
      inspection.
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      44075d95
    • Linus Torvalds's avatar
      selinux: de-crapify avc cache stat code generation · 044aea9b
      Linus Torvalds authored
      You can turn off the avc cache stats, but distributions seem to not do
      that (perhaps because several performance tuning how-to's talk about the
      avc cache statistics).
      
      Which is sad, because the code it generates is truly horrendous, with
      the statistics update being sandwitched between get_cpu/put_cpu which in
      turn causes preemption disables etc.  We're talking ten+ instructions
      just to increment a per-cpu variable in some pretty hot code.
      
      Fix the craziness by just using 'this_cpu_inc()' instead.  Suddenly we
      only need a single 'inc' instruction to increment the statistics.  This
      is quite noticeable in the incredibly hot avc_has_perm_noaudit()
      function (which triggers all the statistics by virtue of doing an
      avc_lookup() call).
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      044aea9b
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of... · 39ab05c8
      Linus Torvalds authored
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)
        debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
        sysfs: remove "last sysfs file:" line from the oops messages
        drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
        memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
        SYSFS: Fix erroneous comments for sysfs_update_group().
        driver core: remove the driver-model structures from the documentation
        driver core: Add the device driver-model structures to kerneldoc
        Translated Documentation/email-clients.txt
        RAW driver: Remove call to kobject_put().
        reboot: disable usermodehelper to prevent fs access
        efivars: prevent oops on unload when efi is not enabled
        Allow setting of number of raw devices as a module parameter
        Introduce CONFIG_GOOGLE_FIRMWARE
        driver: Google Memory Console
        driver: Google EFI SMI
        x86: Better comments for get_bios_ebda()
        x86: get_bios_ebda_length()
        misc: fix ti-st build issues
        params.c: Use new strtobool function to process boolean inputs
        debugfs: move to new strtobool
        ...
      
      Fix up trivial conflicts in fs/debugfs/file.c due to the same patch
      being applied twice, and an unrelated cleanup nearby.
      39ab05c8
    • Stephen Rothwell's avatar
      signal.h need a definition of struct task_struct · 1477fcc2
      Stephen Rothwell authored
      This fixes these build errors on powerpc:
      
        In file included from arch/powerpc/mm/fault.c:18:
        include/linux/signal.h:239: error: 'struct task_struct' declared inside parameter list
        include/linux/signal.h:239: error: its scope is only this definition or declaration, which is probably not what you want
        include/linux/signal.h:240: error: 'struct task_struct' declared inside parameter list
        ..
      
      Exposed by commit e66eed65 ("list: remove prefetching from regular
      list iterators"), which removed the include of <linux/prefetch.h> from
      <linux/list.h>.
      
      Without that, linux/signal.h no longer accidentally got the declaration
      of 'struct task_struct'.
      
      Fix by properly declaring the struct, rather than introducing any new
      header file dependency.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1477fcc2
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · eb04f2f0
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (78 commits)
        Revert "rcu: Decrease memory-barrier usage based on semi-formal proof"
        net,rcu: convert call_rcu(prl_entry_destroy_rcu) to kfree
        batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcu
        batman,rcu: convert call_rcu(neigh_node_free_rcu) to kfree()
        batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcu
        net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()
        net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()
        net/mac80211,rcu: convert call_rcu(work_free_rcu) to kfree_rcu()
        net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()
        net,rcu: convert call_rcu(phonet_device_rcu_free) to kfree_rcu()
        perf,rcu: convert call_rcu(swevent_hlist_release_rcu) to kfree_rcu()
        perf,rcu: convert call_rcu(free_ctx) to kfree_rcu()
        net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()
        net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()
        net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu()
        net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()
        security,rcu: convert call_rcu(sel_netif_free) to kfree_rcu()
        net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()
        net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()
        net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()
        ...
      eb04f2f0
    • Linus Torvalds's avatar
      Merge branch 'x86-smep-for-linus' of... · 5765040e
      Linus Torvalds authored
      Merge branch 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, cpu: Enable/disable Supervisor Mode Execution Protection
        x86, cpu: Add SMEP CPU feature in CR4
        x86, cpufeature: Add cpufeature flag for SMEP
      5765040e
    • Linus Torvalds's avatar
      Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of... · 08839ff8
      Linus Torvalds authored
      Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Reorder reboot method preferences
      
      * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, setup: Fix EDD3.0 data verification.
      08839ff8
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of... · 08b5d06e
      Linus Torvalds authored
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Introduce pci_map_biosrom()
        x86, olpc: Use device tree for platform identification
      08b5d06e
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 13588209
      Linus Torvalds authored
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
        x86, mm: Allow ZONE_DMA to be configurable
        x86, NUMA: Trim numa meminfo with max_pfn in a separate loop
        x86, NUMA: Rename setup_node_bootmem() to setup_node_data()
        x86, NUMA: Enable emulation on 32bit too
        x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit too
        x86, NUMA: Rename amdtopology_64.c to amdtopology.c
        x86, NUMA: Make numa_init_array() static
        x86, NUMA: Make 32bit use common NUMA init path
        x86, NUMA: Initialize and use remap allocator from setup_node_bootmem()
        x86-32, NUMA: Add @start and @end to init_alloc_remap()
        x86, NUMA: Remove long 64bit assumption from numa.c
        x86, NUMA: Enable build of generic NUMA init code on 32bit
        x86, NUMA: Move NUMA init logic from numa_64.c to numa.c
        x86-32, NUMA: Update numaq to use new NUMA init protocol
        x86-32, NUMA: Replace srat_32.c with srat.c
        x86-32, NUMA: implement temporary NUMA init shims
        x86, NUMA: Move numa_nodes_parsed to numa.[hc]
        x86-32, NUMA: Move get_memcfg_numa() into numa_32.c
        x86, NUMA: make srat.c 32bit safe
        x86, NUMA: rename srat_64.c to srat.c
        ...
      13588209
    • Linus Torvalds's avatar
      Merge branches 'x86-efi-for-linus', 'x86-gart-for-linus', 'x86-irq-for-linus'... · ac2941f5
      Linus Torvalds authored
      Merge branches 'x86-efi-for-linus', 'x86-gart-for-linus', 'x86-irq-for-linus' and 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, efi: Ensure that the entirity of a region is mapped
        x86, efi: Pass a minimal map to SetVirtualAddressMap()
        x86, efi: Merge contiguous memory regions of the same type and attribute
        x86, efi: Consolidate EFI nx control
        x86, efi: Remove virtual-mode SetVirtualAddressMap call
      
      * 'x86-gart-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, gart: Don't enforce GART aperture lower-bound by alignment
      
      * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Don't unmask disabled irqs when migrating them
        x86: Skip migrating IRQF_PER_CPU irqs in fixup_irqs()
      
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, mce: Drop the default decoding notifier
        x86, MCE: Do not taint when handling correctable errors
      ac2941f5
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 01628188
      Linus Torvalds authored
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, cpu: Fix detection of Celeron Covington stepping A1 and B0
        Documentation, ABI: Update L3 cache index disable text
        x86, AMD, cacheinfo: Fix L3 cache index disable checks
        x86, AMD, cacheinfo: Fix fallout caused by max3 conversion
        x86, cpu: Change NOP selection for certain Intel CPUs
        x86, cpu: Clean up and unify the NOP selection infrastructure
        x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4
        x86, cpu: Move AMD Elan Kconfig under "Processor family"
      
      Fix up trivial conflicts in alternative handling (commit dc326fca
      "x86, cpu: Clean up and unify the NOP selection infrastructure" removed
      some hacky 5-byte instruction stuff, while commit d430d3d7 "jump
      label: Introduce static_branch() interface" renamed HAVE_JUMP_LABEL to
      CONFIG_JUMP_LABEL in the code that went away)
      01628188
    • Linus Torvalds's avatar
      Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and... · 17b14180
      Linus Torvalds authored
      Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, apic: Print verbose error interrupt reason on apic=debug
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Demacro CONFIG_PARAVIRT cpu accessors
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Fix mrst sparse complaints
        x86: Fix spelling error in the memcpy() source code comment
        x86, mpparse: Remove unnecessary variable
      17b14180
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of... · 78c4def6
      Linus Torvalds authored
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        hrtimer: Make lookup table const
        RTC: Disable CONFIG_RTC_CLASS from being built as a module
        timers: Fix alarmtimer build issues when CONFIG_RTC_CLASS=n
        timers: Remove delayed irqwork from alarmtimers implementation
        timers: Improve alarmtimer comments and minor fixes
        timers: Posix interface for alarm-timers
        timers: Introduce in-kernel alarm-timer interface
        timers: Add rb_init_node() to allow for stack allocated rb nodes
        time: Add timekeeping_inject_sleeptime
      78c4def6
    • Linus Torvalds's avatar
      Merge branch 'timers-clockevents-for-linus' of... · 7e6628e4
      Linus Torvalds authored
      Merge branch 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: hpet: Cleanup the clockevents init and register code
        x86: Convert PIT to clockevents_config_and_register()
        clockevents: Provide interface to reconfigure an active clock event device
        clockevents: Provide combined configure and register function
        clockevents: Restructure clock_event_device members
        clocksource: Get rid of the hardcoded 5 seconds sleep time limit
        clocksource: Restructure clocksource struct members
      7e6628e4
    • Linus Torvalds's avatar
      Merge branch 'timers-clocksource-for-linus' of... · 0f1bdc18
      Linus Torvalds authored
      Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        clocksource: convert mips to generic i8253 clocksource
        clocksource: convert x86 to generic i8253 clocksource
        clocksource: convert footbridge to generic i8253 clocksource
        clocksource: add common i8253 PIT clocksource
        blackfin: convert to clocksource_register_hz
        mips: convert to clocksource_register_hz/khz
        sparc: convert to clocksource_register_hz/khz
        alpha: convert to clocksource_register_hz
        microblaze: convert to clocksource_register_hz/khz
        ia64: convert to clocksource_register_hz/khz
        x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
        Make clocksource name const
      0f1bdc18
    • Linus Torvalds's avatar
      Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of... · 80fe02b5
      Linus Torvalds authored
      Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
        sched: Fix and optimise calculation of the weight-inverse
        sched: Avoid going ahead if ->cpus_allowed is not changed
        sched, rt: Update rq clock when unthrottling of an otherwise idle CPU
        sched: Remove unused parameters from sched_fork() and wake_up_new_task()
        sched: Shorten the construction of the span cpu mask of sched domain
        sched: Wrap the 'cfs_rq->nr_spread_over' field with CONFIG_SCHED_DEBUG
        sched: Remove unused 'this_best_prio arg' from balance_tasks()
        sched: Remove noop in alloc_rt_sched_group()
        sched: Get rid of lock_depth
        sched: Remove obsolete comment from scheduler_tick()
        sched: Fix sched_domain iterations vs. RCU
        sched: Next buddy hint on sleep and preempt path
        sched: Make set_*_buddy() work on non-task entities
        sched: Remove need_migrate_task()
        sched: Move the second half of ttwu() to the remote cpu
        sched: Restructure ttwu() some more
        sched: Rename ttwu_post_activation() to ttwu_do_wakeup()
        sched: Remove rq argument from ttwu_stat()
        sched: Remove rq->lock from the first half of ttwu()
        sched: Drop rq->lock from sched_exec()
        ...
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Fix rt_rq runtime leakage bug
      80fe02b5
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · df48d871
      Linus Torvalds authored
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (107 commits)
        perf stat: Add more cache-miss percentage printouts
        perf stat: Add -d -d and -d -d -d options to show more CPU events
        ftrace/kbuild: Add recordmcount files to force full build
        ftrace: Add self-tests for multiple function trace users
        ftrace: Modify ftrace_set_filter/notrace to take ops
        ftrace: Allow dynamically allocated function tracers
        ftrace: Implement separate user function filtering
        ftrace: Free hash with call_rcu_sched()
        ftrace: Have global_ops store the functions that are to be traced
        ftrace: Add ops parameter to ftrace_startup/shutdown functions
        ftrace: Add enabled_functions file
        ftrace: Use counters to enable functions to trace
        ftrace: Separate hash allocation and assignment
        ftrace: Create a global_ops to hold the filter and notrace hashes
        ftrace: Use hash instead for FTRACE_FL_FILTER
        ftrace: Replace FTRACE_FL_NOTRACE flag with a hash of ignored functions
        perf bench, x86: Add alternatives-asm.h wrapper
        x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limit
        x86, mem: memset_64.S: Optimize memset by enhanced REP MOVSB/STOSB
        x86, mem: memmove_64.S: Optimize memmove by enhanced REP MOVSB/STOSB
        ...
      df48d871
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · acd30250
      Linus Torvalds authored
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        irq: Export functions to allow modular irq drivers
        genirq: Uninline and sanity check generic_handle_irq()
        genirq: Remove pointless ifdefs
        genirq: Make generic irq chip depend on CONFIG_GENERIC_IRQ_CHIP
        genirq: Add chip suspend and resume callbacks
        genirq: Implement a generic interrupt chip
        genirq: Support per-IRQ thread disabling.
        genirq: irq_desc: Document preflow_handler and affinity_hint
        genirq: Update DocBook comments
        genirq: Forgotten updates/deletions after removal of compat code
      acd30250
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 6595b4a9
      Linus Torvalds authored
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        seqlock: Don't smp_rmb in seqlock reader spin loop
        watchdog, hung_task_timeout: Add Kconfig configurable default
        lockdep: Remove cmpxchg to update nr_chain_hlocks
        lockdep: Print a nicer description for simple irq lock inversions
        lockdep: Replace "Bad BFS generated tree" message with something less cryptic
        lockdep: Print a nicer description for irq inversion bugs
        lockdep: Print a nicer description for simple deadlocks
        lockdep: Print a nicer description for normal deadlocks
        lockdep: Print a nicer description for irq lock inversions
      6595b4a9
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · cbdad8dc
      Linus Torvalds authored
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, gart: Rename pci-gart_64.c to amd_gart_64.c
        x86/amd-iommu: Use threaded interupt handler
        arch/x86/kernel/pci-iommu_table.c: Convert sprintf_symbol to %pS
        x86/amd-iommu: Add support for invalidate_all command
        x86/amd-iommu: Add extended feature detection
        x86/amd-iommu: Add ATS enable/disable code
        x86/amd-iommu: Add flag to indicate IOTLB support
        x86/amd-iommu: Flush device IOTLB if ATS is enabled
        x86/amd-iommu: Select PCI_IOV with AMD IOMMU driver
        PCI: Move ATS declarations in seperate header file
        dma-debug: print information about leaked entry
        x86/amd-iommu: Flush all internal TLBs when IOMMUs are enabled
        x86/amd-iommu: Rename iommu_flush_device
        x86/amd-iommu: Improve handling of full command buffer
        x86/amd-iommu: Rename iommu_flush* to domain_flush*
        x86/amd-iommu: Remove command buffer resetting logic
        x86/amd-iommu: Cleanup completion-wait handling
        x86/amd-iommu: Cleanup inv_pages command handling
        x86/amd-iommu: Move inv-dte command building to own function
        x86/amd-iommu: Move compl-wait command building to own function
      cbdad8dc
  2. 19 May, 2011 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 51509a28
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (34 commits)
        PM: Introduce generic prepare and complete callbacks for subsystems
        PM: Allow drivers to allocate memory from .prepare() callbacks safely
        PM: Remove CONFIG_PM_VERBOSE
        Revert "PM / Hibernate: Reduce autotuned default image size"
        PM / Hibernate: Add sysfs knob to control size of memory for drivers
        PM / Wakeup: Remove useless synchronize_rcu() call
        kmod: always provide usermodehelper_disable()
        PM / ACPI: Remove acpi_sleep=s4_nonvs
        PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
        PM: Print a warning if firmware is requested when tasks are frozen
        PM / Runtime: Rework runtime PM handling during driver removal
        Freezer: Use SMP barriers
        PM / Suspend: Do not ignore error codes returned by suspend_enter()
        PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset
        PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"
        OMAP1 / PM: Use generic clock manipulation routines for runtime PM
        PM: Remove sysdev suspend, resume and shutdown operations
        PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM
        PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM
        PM / AVR32: Use struct syscore_ops instead of sysdevs for PM
        ...
      51509a28
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 75f5076b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/qib: Use pci_dev->revision
        RDMA/iwcm: Get rid of enum iw_cm_event_status
        IB/ipath: Use pci_dev->revision, again
        IB/qib: Prevent driver hang with unprogrammed boards
        RDMA/cxgb4: EEH errors can hang the driver
        RDMA/cxgb4: Reset wait condition atomically
        RDMA/cxgb4: Fix missing parentheses
        RDMA/cxgb4: Initialization errors can cause crash
        RDMA/cxgb4: Don't change QP state outside EP lock
        RDMA/cma: Add an ID_REUSEADDR option
        RDMA/cma: Fix handling of IPv6 addressing in cma_use_port
      75f5076b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm · 83d7e948
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:
        kmemleak: Initialise kmemleak after debug_objects_mem_init()
        kmemleak: Select DEBUG_FS unconditionally in DEBUG_KMEMLEAK
        kmemleak: Do not return a pointer to an object that kmemleak did not get
      83d7e948
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus · fce4a1dd
      Linus Torvalds authored
      * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (48 commits)
        MIPS: Move arch_get_unmapped_area and gang to new file.
        MIPS: Cleanup arch_get_unmapped_area
        MIPS: Octeon: Don't request interrupts for unused IPI mailbox bits.
        Octeon: Fix interrupt irq settings for performance counters.
        MIPS: Fix build warnings on defconfigs
        MIPS: Lemote 2F, Malta: Fix build warning
        MIPS: Set ELF AT_PLATFORM string for Loongson2 processors
        MIPS: Set ELF AT_PLATFORM string for BMIPS processors
        MIPS: Introduce set_elf_platform() helper function
        MIPS: JZ4740: setup: Autodetect physical memory.
        MIPS: BCM47xx: Fix MAC address parsing.
        MIPS: BCM47xx: Extend the filling of SPROM from NVRAM
        MIPS: BCM47xx: Register SSB fallback sprom callback
        MIPS: BCM47xx: Extend bcm47xx_fill_sprom with prefix.
        SSB: Change fallback sprom to callback mechanism.
        MIPS: Alchemy: Clean up GPIO registers and accessors
        MIPS: Alchemy: Cleanup DMA addresses
        MIPS: Alchemy: Rewrite ethernet platform setup
        MIPS: Alchemy: Rewrite UART setup and constants.
        MIPS: Alchemy: Convert dbdma.c to syscore_ops
        ...
      fce4a1dd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · e1f2084e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        input/atari: Fix mouse movement and button mapping
        input/atari: Fix atarimouse init
        input/atari: Use the correct mouse interrupt hook
        m68k/atari: Do not use "/" in interrupt names
        m68k: unistd - Comment out definitions for unimplemented syscalls
        m68k: Really wire up sys_pselect6 and sys_ppoll
        m68k: Merge mmu and non-mmu versions of sys_call_table
        MAINTAINERS: Roman Zippel has been MIA for several years.
        m68k: bitops - Never step beyond the end of the bitmap
        m68k: bitops - offset == ((long)p - (long)vaddr) * 8
      e1f2084e