1. 24 May, 2012 4 commits
  2. 23 May, 2012 1 commit
  3. 22 May, 2012 28 commits
    • Sam Ravnborg's avatar
      sparc32: use the common implementation of alloc_thread_info_node() · 29af0eba
      Sam Ravnborg authored
      With sun4c removed we can fall-back to the common implementation.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Laurent Pinchart's avatar
      fbdev: sh_mobile_lcdc: Don't confuse line size with pitch · 72c04af9
      Laurent Pinchart authored
      When using the MERAM the LCDC line size needs to be programmed with a
      MERAM-specific value different than the real frame buffer pitch. Fix it.
      Reported-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Acked-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
      Cc: stable@vger.kernel.org  # for 3.4
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 47136855
      Linus Torvalds authored
      Pull core irq changes from Ingo Molnar:
       "A collection of small fixes."
      By Thomas Gleixner
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        hexagon: Remove select of not longer existing Kconfig switches
        arm: Select core options instead of redefining them
        genirq: Do not consider disabled wakeup irqs
        genirq: Allow check_wakeup_irqs to notice level-triggered interrupts
        genirq: Be more informative on irq type mismatch
        genirq: Reject bogus threaded irq requests
        genirq: Streamline irq_action
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · cb60e3e6
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "New notable features:
         - The seccomp work from Will Drewry
         - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski
         - Longer security labels for Smack from Casey Schaufler
         - Additional ptrace restriction modes for Yama by Kees Cook"
      Fix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)
        apparmor: fix long path failure due to disconnected path
        apparmor: fix profile lookup for unconfined
        ima: fix filename hint to reflect script interpreter name
        KEYS: Don't check for NULL key pointer in key_validate()
        Smack: allow for significantly longer Smack labels v4
        gfp flags for security_inode_alloc()?
        Smack: recursive tramsmute
        Yama: replace capable() with ns_capable()
        TOMOYO: Accept manager programs which do not start with / .
        KEYS: Add invalidation support
        KEYS: Do LRU discard in full keyrings
        KEYS: Permit in-place link replacement in keyring list
        KEYS: Perform RCU synchronisation on keys prior to key destruction
        KEYS: Announce key type (un)registration
        KEYS: Reorganise keys Makefile
        KEYS: Move the key config into security/keys/Kconfig
        KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat
        Yama: remove an unused variable
        samples/seccomp: fix dependencies on arch macros
        Yama: add additional ptrace scopes
    • Linus Torvalds's avatar
      Merge tag 'virtio-for-linus' of... · 99262a3d
      Linus Torvalds authored
      Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
      Pull virtio updates from Rusty Russell.
      * tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        virtio: fix typo in comment
        virtio-mmio: Devices parameter parsing
        virtio_blk: Drop unused request tracking list
        virtio-blk: Fix hot-unplug race in remove method
        virtio: Use ida to allocate virtio index
        virtio: balloon: separate out common code between remove and freeze functions
        virtio: balloon: drop restore_common()
        9p: disconnect channel when PCI device is removed
        virtio: update documentation to v0.9.5 of spec
    • Chen Baozi's avatar
      virtio: fix typo in comment · c6190804
      Chen Baozi authored
      - Delete "@request_vqs" and "@free_vqs" comments, since
        they are no longer in struct virtio_config_ops.
      - According to the macro below, "@val" should be "@v".
      Signed-off-by: default avatarChen Baozi <chenbaozi@gmail.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Pawel Moll's avatar
      virtio-mmio: Devices parameter parsing · 81a054ce
      Pawel Moll authored
      This patch adds an option to instantiate guest virtio-mmio devices
      basing on a kernel command line (or module) parameter, for example:
      Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Asias He's avatar
      virtio_blk: Drop unused request tracking list · f65ca1dc
      Asias He authored
      Benchmark shows small performance improvement on fusion io device.
        seq-read : io=1,024MB, bw=19,982KB/s, iops=39,964, runt= 52475msec
        seq-write: io=1,024MB, bw=20,321KB/s, iops=40,641, runt= 51601msec
        rnd-read : io=1,024MB, bw=15,404KB/s, iops=30,808, runt= 68070msec
        rnd-write: io=1,024MB, bw=14,776KB/s, iops=29,552, runt= 70963msec
        seq-read : io=1,024MB, bw=20,343KB/s, iops=40,685, runt= 51546msec
        seq-write: io=1,024MB, bw=20,803KB/s, iops=41,606, runt= 50404msec
        rnd-read : io=1,024MB, bw=16,221KB/s, iops=32,442, runt= 64642msec
        rnd-write: io=1,024MB, bw=15,199KB/s, iops=30,397, runt= 68991msec
      Signed-off-by: default avatarAsias He <asias@redhat.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Asias He's avatar
      virtio-blk: Fix hot-unplug race in remove method · b79d866c
      Asias He authored
      If we reset the virtio-blk device before the requests already dispatched
      to the virtio-blk driver from the block layer are finised, we will stuck
      in blk_cleanup_queue() and the remove will fail.
      blk_cleanup_queue() calls blk_drain_queue() to drain all requests queued
      before DEAD marking. However it will never success if the device is
      already stopped. We'll have q->in_flight[] > 0, so the drain will not
      How to reproduce the race:
      1. hot-plug a virtio-blk device
      2. keep reading/writing the device in guest
      3. hot-unplug while the device is busy serving I/O
      ~1000 rounds of hot-plug/hot-unplug test passed with this patch.
      Changes in v3:
      - Drop blk_abort_queue and blk_abort_request
      - Use __blk_end_request_all to complete request dispatched to driver
      Changes in v2:
      - Drop req_in_flight
      - Use virtqueue_detach_unused_buf to get request dispatched to driver
      Signed-off-by: default avatarAsias He <asias@redhat.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Asias He's avatar
      virtio: Use ida to allocate virtio index · 90e03207
      Asias He authored
      Current index allocation in virtio is based on a monotonically
      increasing variable "index". This means we'll run out of numbers
      after a while. E.g. someone crazy doing this in host side.
      while(1) {
      	hot-plug a virtio device
      	hot-unplug the virito devcie
      Signed-off-by: default avatarAsias He <asias@redhat.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Amit Shah's avatar
      virtio: balloon: separate out common code between remove and freeze functions · c877bab5
      Amit Shah authored
      The remove and freeze functions have a lot of shared code; put it into a
      common function that gets called by both.
      Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Amit Shah's avatar
      virtio: balloon: drop restore_common() · c45b4166
      Amit Shah authored
      restore_common() was used when there were different thaw and freeze PM
      callbacks implemented.  We removed thaw in commit
      restore_common() can be removed and virtballoon_restore() can itself do
      the restore ops.
      Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Sasha Levin's avatar
      9p: disconnect channel when PCI device is removed · 991ad9ec
      Sasha Levin authored
      When a virtio_9p pci device is being removed, we should close down any
      active channels and free up resources, we're not supposed to BUG() if there's
      still an open channel since it's a valid case when removing the PCI device.
      Otherwise, removing the PCI device with an open channel would cause the
      following BUG():
      [ 1184.671416] ------------[ cut here ]------------
      [ 1184.672057] kernel BUG at net/9p/trans_virtio.c:618!
      [ 1184.672057] invalid opcode: 0000 [#1] PREEMPT SMP
      [ 1184.672057] CPU 3
      [ 1184.672057] Pid: 5, comm: kworker/u:0 Tainted: G        W    3.4.0-rc2-next-20120413-sasha-dirty #76
      [ 1184.672057] RIP: 0010:[<ffffffff825c9116>]  [<ffffffff825c9116>] p9_virtio_remove+0x16/0x90
      [ 1184.672057] RSP: 0018:ffff88000d653ac0  EFLAGS: 00010202
      [ 1184.672057] RAX: ffffffff836bfb40 RBX: ffff88000c9b2148 RCX: ffff88000d658978
      [ 1184.672057] RDX: 0000000000000006 RSI: 0000000000000000 RDI: ffff880028868000
      [ 1184.672057] RBP: ffff88000d653ad0 R08: 0000000000000000 R09: 0000000000000000
      [ 1184.672057] R10: 0000000000000000 R11: 0000000000000001 R12: ffff880028868000
      [ 1184.672057] R13: ffffffff835aa7c0 R14: ffff880041630000 R15: ffff88000d653da0
      [ 1184.672057] FS:  0000000000000000(0000) GS:ffff880035a00000(0000) knlGS:0000000000000000
      [ 1184.672057] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      [ 1184.672057] CR2: 0000000001181000 CR3: 000000000eba1000 CR4: 00000000000406e0
      [ 1184.672057] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      x000000000117a190 *[ 1184.672057] DR3: 00000000000000**
      00 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      [ 1184.672057] Process kworker/u:0 (pid: 5, threadinfo ffff88000d652000, task ffff88000d658000)
      [ 1184.672057] Stack:
      [ 1184.672057]  ffff880028868000 ffffffff836bfb40 ffff88000d653af0 ffffffff8193661b
      [ 1184.672057]  ffff880028868008 ffffffff836bfb40 ffff88000d653b10 ffffffff81af1c81
      [ 1184.672057]  ffff880028868068 ffff880028868008 ffff88000d653b30 ffffffff81af257a
      [ 1184.795301] Call Trace:
      [ 1184.795301]  [<ffffffff8193661b>] virtio_dev_remove+0x1b/0x60
      [ 1184.795301]  [<ffffffff81af1c81>] __device_release_driver+0x81/0xd0
      [ 1184.795301]  [<ffffffff81af257a>] device_release_driver+0x2a/0x40
      [ 1184.795301]  [<ffffffff81af0d48>] bus_remove_device+0x138/0x150
      [ 1184.795301]  [<ffffffff81aef08d>] device_del+0x14d/0x1b0
      [ 1184.795301]  [<ffffffff81aef138>] device_unregister+0x48/0x60
      [ 1184.795301]  [<ffffffff8193694d>] unregister_virtio_device+0xd/0x10
      [ 1184.795301]  [<ffffffff8265fc74>] virtio_pci_remove+0x2a/0x6c
      [ 1184.795301]  [<ffffffff818a95ad>] pci_device_remove+0x4d/0x110
      [ 1184.795301]  [<ffffffff81af1c81>] __device_release_driver+0x81/0xd0
      [ 1184.795301]  [<ffffffff81af257a>] device_release_driver+0x2a/0x40
      [ 1184.795301]  [<ffffffff81af0d48>] bus_remove_device+0x138/0x150
      [ 1184.795301]  [<ffffffff81aef08d>] device_del+0x14d/0x1b0
      [ 1184.795301]  [<ffffffff81aef138>] device_unregister+0x48/0x60
      [ 1184.795301]  [<ffffffff818a36fa>] pci_stop_bus_device+0x6a/0x90
      [ 1184.795301]  [<ffffffff818a3791>] pci_stop_and_remove_bus_device+0x11/0x20
      [ 1184.795301]  [<ffffffff818c21d9>] remove_callback+0x9/0x10
      [ 1184.795301]  [<ffffffff81252d91>] sysfs_schedule_callback_work+0x21/0x60
      [ 1184.795301]  [<ffffffff810cb1a1>] process_one_work+0x281/0x430
      [ 1184.795301]  [<ffffffff810cb140>] ? process_one_work+0x220/0x430
      [ 1184.795301]  [<ffffffff81252d70>] ? sysfs_read_file+0x1c0/0x1c0
      [ 1184.795301]  [<ffffffff810cc613>] worker_thread+0x1f3/0x320
      [ 1184.795301]  [<ffffffff810cc420>] ? manage_workers.clone.13+0x130/0x130
      [ 1184.795301]  [<ffffffff810d30b2>] kthread+0xb2/0xc0
      [ 1184.795301]  [<ffffffff826783f4>] kernel_thread_helper+0x4/0x10
      [ 1184.795301]  [<ffffffff810deb18>] ? finish_task_switch+0x78/0xf0
      [ 1184.795301]  [<ffffffff82676574>] ? retint_restore_args+0x13/0x13
      [ 1184.795301]  [<ffffffff810d3000>] ? kthread_flush_work_fn+0x10/0x10
      [ 1184.795301]  [<ffffffff826783f0>] ? gs_change+0x13/0x13
      [ 1184.795301] Code: c1 9e 0a 00 48 83 c4 08 5b c9 c3 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 41 54 49 89 fc 53 48 8b 9f a8 04 00 00 80 3b 00 74 0a <0f> 0b 0f 1f 84 00 00 00 00 00 48 8b 87 88 04 00 00 ff 50 30 31
      [ 1184.795301] RIP  [<ffffffff825c9116>] p9_virtio_remove+0x16/0x90
      [ 1184.795301]  RSP <ffff88000d653ac0>
      [ 1184.952618] ---[ end trace a307b3ed40206b4c ]---
      Signed-off-by: default avatarSasha Levin <levinsasha928@gmail.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
    • Rusty Russell's avatar
    • Linus Torvalds's avatar
      Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bf67f3a5
      Linus Torvalds authored
      Pull smp hotplug cleanups from Thomas Gleixner:
       "This series is merily a cleanup of code copied around in arch/* and
        not changing any of the real cpu hotplug horrors yet.  I wish I'd had
        something more substantial for 3.5, but I underestimated the lurking
      Fix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and
      * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)
        um: Remove leftover declaration of alloc_task_struct_node()
        task_allocator: Use config switches instead of magic defines
        sparc: Use common threadinfo allocator
        score: Use common threadinfo allocator
        mn10300: Use common threadinfo allocator
        powerpc: Use common threadinfo allocator
        mips: Use common threadinfo allocator
        hexagon: Use common threadinfo allocator
        m32r: Use common threadinfo allocator
        frv: Use common threadinfo allocator
        cris: Use common threadinfo allocator
        x86: Use common threadinfo allocator
        c6x: Use common threadinfo allocator
        fork: Provide kmemcache based thread_info allocator
        tile: Use common threadinfo allocator
        fork: Provide weak arch_release_[task_struct|thread_info] functions
        fork: Move thread info gfp flags to header
        fork: Remove the weak insanity
        sh: Remove cpu_idle_wait()
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 226da0db
      Linus Torvalds authored
      Pull RCU changes from Ingo Molnar:
       "This is the v3.5 RCU tree from Paul E.  McKenney:
       1) A set of improvements and fixes to the RCU_FAST_NO_HZ feature (with
          more on the way for 3.6).  Posted to LKML:
             https://lkml.org/lkml/2012/4/23/324 (commits 1-3 and 5),
             https://lkml.org/lkml/2012/4/16/611 (commit 4),
             https://lkml.org/lkml/2012/4/30/390 (commit 6), and
             https://lkml.org/lkml/2012/5/4/410 (commit 7, combined with
             the other commits for the convenience of the tester).
       2) Changes to make rcu_barrier() avoid disrupting execution of CPUs
          that have no RCU callbacks.  Posted to LKML:
       3) A couple of commits that improve the efficiency of the interaction
          between preemptible RCU and the scheduler, these two being all that
          survived an abortive attempt to allow preemptible RCU's
          __rcu_read_lock() to be inlined.  The full set was posted to LKML at
          https://lkml.org/lkml/2012/4/14/143, and the first and third patches
          of that set remain.
       4) Lai Jiangshan's algorithmic implementation of SRCU, which includes
          call_srcu() and srcu_barrier().  A major feature of this new
          implementation is that synchronize_srcu() no longer disturbs the
          execution of other CPUs.  This work is based on earlier
          implementations by Peter Zijlstra and Paul E.  McKenney.  Posted to
          LKML: https://lkml.org/lkml/2012/2/22/82.
       5) A number of miscellaneous bug fixes and improvements which were
          posted to LKML at: https://lkml.org/lkml/2012/4/23/353 with
          subsequent updates posted to LKML."
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
        rcu: Make rcu_barrier() less disruptive
        rcu: Explicitly initialize RCU_FAST_NO_HZ per-CPU variables
        rcu: Make RCU_FAST_NO_HZ handle timer migration
        rcu: Update RCU maintainership
        rcu: Make exit_rcu() more precise and consolidate
        rcu: Move PREEMPT_RCU preemption to switch_to() invocation
        rcu: Ensure that RCU_FAST_NO_HZ timers expire on correct CPU
        rcu: Add rcutorture test for call_srcu()
        rcu: Implement per-domain single-threaded call_srcu() state machine
        rcu: Use single value to handle expedited SRCU grace periods
        rcu: Improve srcu_readers_active_idx()'s cache locality
        rcu: Remove unused srcu_barrier()
        rcu: Implement a variant of Peter's SRCU algorithm
        rcu: Improve SRCU's wait_idx() comments
        rcu: Flip ->completed only once per SRCU grace period
        rcu: Increment upper bit only for srcu_read_lock()
        rcu: Remove fast check path from __synchronize_srcu()
        rcu: Direct algorithmic SRCU implementation
        rcu: Introduce rcutorture testing for rcu_barrier()
        timer: Fix mod_timer_pinned() header comment
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5ec29e31
      Linus Torvalds authored
      Pull core locking updates from Ingo Molnar:
       "This update:
         - extends and simplifies x86 NMI callback handling code to enhance
           and fix the HP hw-watchdog driver
         - simplifies the x86 NMI callback handling code to fix a kmemcheck
         - enhances the hung-task debugger"
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/nmi: Fix the type of the nmiaction.flags field
        x86/nmi: Fix page faults by nmiaction if kmemcheck is enabled
        x86/nmi: Add new NMI queues to deal with IO_CHK and SERR
        watchdog, hpwdt: Remove priority option for NMI callback
        hung task debugging: Inject NMI when hung and going to panic
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · abd209b7
      Linus Torvalds authored
      Pull iommu core changes from Ingo Molnar:
       "The IOMMU changes in this cycle are mostly about factoring out
        Intel-VT-d specific IRQ remapping details and introducing struct
        irq_remap_ops, in preparation for AMD specific hardware."
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        iommu: Fix off by one in dmar_get_fault_reason()
        irq_remap: Fix the 'sub_handle' uninitialized warning
        irq_remap: Fix UP build failure
        irq_remap: Fix compiler warning with CONFIG_IRQ_REMAP=y
        iommu: rename intr_remapping.[ch] to irq_remapping.[ch]
        iommu: rename intr_remapping references to irq_remapping
        x86, iommu/vt-d: Clean up interfaces for interrupt remapping
        iommu/vt-d: Convert MSI remapping setup to remap_ops
        iommu/vt-d: Convert free_irte into a remap_ops callback
        iommu/vt-d: Convert IR set_affinity function to remap_ops
        iommu/vt-d: Convert IR ioapic-setup to use remap_ops
        iommu/vt-d: Convert missing apic.c intr-remapping call to remap_ops
        iommu/vt-d: Make intr-remapping initialization generic
        iommu: Rename intr_remapping files to intel_intr_remapping
    • Linus Torvalds's avatar
      Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 513de477
      Linus Torvalds authored
      Pull core/debugobjects changes from Ingo Molnar:
       "Not much happened: it includes a cleanup and an irq latency reduction
      * 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        debugobjects: Fill_pool() returns void now
        debugobjects: printk with irqs enabled
        debugobjects: Remove unused return value from fill_pool()
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 62c8d922
      Linus Torvalds authored
      Pull GFS2 changes from Steven Whitehouse.
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw: (24 commits)
        GFS2: Fix quota adjustment return code
        GFS2: Add rgrp information to block_alloc trace point
        GFS2: Eliminate unused "new" parameter to gfs2_meta_indirect_buffer
        GFS2: Update glock doc to add new stats info
        GFS2: Update main gfs2 doc
        GFS2: Remove redundant metadata block type check
        GFS2: Fix sgid propagation when using ACLs
        GFS2: eliminate log elements and simplify
        GFS2: Eliminate vestigial sd_log_le_rg
        GFS2: Eliminate needless parameter from function gfs2_setbit
        GFS2: Log code fixes
        GFS2: Remove unused argument from gfs2_internal_read
        GFS2: Remove bd_list_tr
        GFS2: Remove duplicate log code
        GFS2: Clean up log write code path
        GFS2: Use variable rather than qa to determine if unstuff necessary
        GFS2: Change variable blk to biblk
        GFS2: Fix function parameter comments in rgrp.c
        GFS2: Eliminate offset parameter to gfs2_setbit
        GFS2: Use slab for block reservation memory
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 06930b94
      Linus Torvalds authored
      Pull m68knommu tree from Greg Ungerer:
       "More merge and clean up of MMU and non-MMU common files, namely
        signal.c and dma.c.  There is also a simplification of the ColdFire
        GPIO setup tables.  Using a couple of simple macros we make the init
        tables really small and easy to read, and save a couple of thousand
        lines of code.  Also a move of all the ColdFire subarch support files
        into the existing coldfire directory.  The sub-directories just ended
        up duplicating Makefiles and now only contain really simple pieces of
        code.  This saves quite a few lines of code too.
        As always a couple of bugs fixes thrown in too.  Oh and a new
        defconfig for the ColdFire platforms that support having the MMU
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (39 commits)
        m68k: add a defconfig for the M5475EVB ColdFire with MMU board
        m68knommu: unaligned.h fix for M68000 core
        m68k: merge the MMU and non-MMU versions of the arch dma code
        m68knommu: reorganize the no-MMU cache flushing to match m68k
        m68knommu: move the 54xx platform code into the common ColdFire code directory
        m68knommu: move the 532x platform code into the common ColdFire code directory
        m68knommu: move the 5407 platform code into the common ColdFire code directory
        m68knommu: move the 5307 platform code into the common ColdFire code directory
        m68knommu: move the 528x platform code into the common ColdFire code directory
        m68knommu: move the 527x platform code into the common ColdFire code directory
        m68knommu: move the 5272 platform code into the common ColdFire code directory
        m68knommu: move the 5249 platform code into the common ColdFire code directory
        m68knommu: move the 523x platform code into the common ColdFire code directory
        m68knommu: move the 520x platform code into the common ColdFire code directory
        m68knommu: move the 5206 platform code into the common ColdFire code directory
        m68knommu: simplify the ColdFire 5407 GPIO struct setup
        m68knommu: simplify the ColdFire 532x GPIO struct setup
        m68knommu: simplify the ColdFire 5307 GPIO struct setup
        m68knommu: simplify the ColdFire 528x GPIO struct setup
        m68knommu: simplify the ColdFire 527x GPIO struct setup
    • Linus Torvalds's avatar
      Revert "vfs: remove unnecessary d_unhashed() check from __d_lookup_rcu" · 2e321806
      Linus Torvalds authored
      This reverts commit 8c01a529.
      It turns out the d_unhashed() check isn't unnecessary after all: while
      it's true that unhashing will increment the sequence numbers, that does
      not necessarily invalidate the RCU lookup, because it might have seen
      the dentry pointer (before it got unhashed), but by the time it loaded
      the sequence number, it could have seen the *new* sequence number (after
      it got unhashed).
      End result: we might look up an unhashed dentry that is about to be
      freed, with the sequence number never indicating anything bad about it.
      So checking that the dentry is still hashed (*after* reading the sequence
      number) is indeed the proper fix, and was never unnecessary.
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • James Morris's avatar
      Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next · ff2bb047
      James Morris authored
      Per pull request, for 3.5.
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · c23ddf78
      Linus Torvalds authored
      Pull InfiniBand/RDMA changes from Roland Dreier:
       - Add ocrdma hardware driver for Emulex IB-over-Ethernet adapters
       - Add generic and mlx4 support for "raw" QPs: allow suitably privileged
         applications to send and receive arbitrary packets directly to/from
         the hardware
       - Add "doorbell drop" handling to the cxgb4 driver
       - A fairly large batch of qib hardware driver changes
       - A few fixes for lockdep-detected issues
       - A few other miscellaneous fixes and cleanups
      Fix up trivial conflict in drivers/net/ethernet/emulex/benet/be.h.
      * tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (53 commits)
        RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree
        IB/mlx4: Fix mlx4_ib_add() error flow
        IB/core: Fix IB_SA_COMP_MASK macro
        IB/iser: Fix error flow in iser ep connection establishment
        IB/mlx4: Increase the number of vectors (EQs) available for ULPs
        RDMA/cxgb4: Add query_qp support
        RDMA/cxgb4: Remove kfifo usage
        RDMA/cxgb4: Use vmalloc() for debugfs QP dump
        RDMA/cxgb4: DB Drop Recovery for RDMA and LLD queues
        RDMA/cxgb4: Disable interrupts in c4iw_ev_dispatch()
        RDMA/cxgb4: Add DB Overflow Avoidance
        RDMA/cxgb4: Add debugfs RDMA memory stats
        cxgb4: DB Drop Recovery for RDMA and LLD queues
        cxgb4: Common platform specific changes for DB Drop Recovery
        cxgb4: Detect DB FULL events and notify RDMA ULD
        RDMA/cxgb4: Drop peer_abort when no endpoint found
        RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()
        mlx4_core: Change bitmap allocator to work in round-robin fashion
        RDMA/nes: Don't call event handler if pointer is NULL
        RDMA/nes: Fix for the ORD value of the connecting peer
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · da4f58ff
      Linus Torvalds authored
      Pull SCSI misc update from James Bottomley:
       "The patch contains the usual assortment of driver updates (be2iscsi,
        bfa, bnx2i, fcoe, hpsa, isci, lpfc, megaraid, mpt2sas, pm8001, sg)
        plus an assortment of other changes and fixes.  Also new is the fact
        that the isci update is delivered as a git merge (with signed tag)."
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (158 commits)
        isci: End the RNC resumption wait when the RNC is destroyed.
        isci: Fixed RNC bug that lost the suspension or resumption during destroy
        isci: Fix RNC AWAIT_SUSPENSION->INVALIDATING transition.
        isci: Manage the IREQ_NO_AUTO_FREE_TAG under scic_lock.
        isci: Remove obviated host callback list.
        isci: Check IDEV_GONE before performing abort path operations.
        isci: Restore the ATAPI device RNC management code.
        isci: Don't wait for an RNC suspend if it's being destroyed.
        isci: Change the phy control and link reset interface for HW reasons.
        isci: Added timeouts to RNC suspensions in the abort path.
        isci: Add protocol indicator for TMF requests.
        isci: Directly control IREQ_ABORT_PATH_ACTIVE when completing TMFs.
        isci: Wait for RNC resumption before leaving the abort path.
        isci: Fix RNC suspend call for SCI_RESUMING state.
        isci: Manage tag releases differently when aborting tasks.
        isci: Callbacks to libsas occur under scic_lock and are synchronized.
        isci: When in the abort path, defeat other resume calls until done.
        isci: Implement waiting for suspend in the abort path.
        isci: Make sure all TCs are terminated and cleaned in LUN reset.
        isci: Manage the LLHANG timer enable/disable per-device.
    • Linus Torvalds's avatar
      Merge branch 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · ba01a87e
      Linus Torvalds authored
      Pull usb-gadget scsi-target merge from Nicholas Bellinger:
       "As promised, here is the pull request for Sebastian's usb-gadget
        target UASP / BOT driver for v3.5-rc1.  This code has been in
        linux-next for a number of weeks, and is now ready for an initial
        This fabric uses the target framework to provide a usb gadget device.
        This gadget supports the USB Attached SCSI Protocol (UASP) and Bulk
        Only Transfers (BOT or BBB).  BOT is the primary interface, UAS is the
        alternative interface.
        Note this series is dependent upon a single target core patch for
        adding se_cmd->unknown_data_length in target-pending/for-next, that
        got merged in the parent.
        Kudos to Sebastian for making this driver happen so easily, and for
        his patches to improve usb-core and target core along the way to his
        goal.  Also thanks to Felipe + Greg-KH for their help in getting this
        driver ready for mainline."
      * 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        usb-gadget: Initial merge of target module for UASP + BOT
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · c9bfa7d7
      Linus Torvalds authored
      Pull scsi-target changes from Nicholas Bellinger:
       "There has been lots of work in existing code in a number of areas this
        past cycle.  The major highlights have been:
         * Removal of transport_do_task_sg_chain() from core + fabrics
         * target-core: Removal of se_task abstraction from target-core and
           enforce hw_max_sectors for pSCSI backends (hch)
         * Re-factoring of iscsi-target tx immediate/response queues (agrover)
         * Conversion of iscsi-target back to using target core memory
           allocation logic (agrover)
        We've had one last minute iscsi-target patch go into for-next to
        address a nasty regression bug related to the target core allocation
        logic conversion from agrover that is not included in friday's
        linux-next build, but has been included in this series.
        On the new fabric module code front for-3.5, here is a brief status
        update for the three currently in flight this round:
         * usb-gadget target driver:
        Sebastian Siewior's driver for supporting usb-gadget target mode
        operation.  This will be going out as a separate PULL request from
        target-pending/usb-target-merge with subsystem maintainer ACKs.  There
        is one minor target-core patch in this series required to function.
         * sbp ieee-1394/firewire target driver:
        Chris Boot's driver for supportting the Serial Block Protocol (SBP)
        across IEEE-1394 Firewire hardware.  This will be going out as a
        separate PULL request from target-pending/sbp-target-merge with two
        additional drivers/firewire/ patches w/ subsystem maintainer ACKs.
         * qla2xxx LLD target mode infrastructure changes + tcm_qla2xxx:
        The Qlogic >= 24xx series HW target mode LLD infrastructure patch-set
        and tcm_qla2xxx fabric driver.  Support for FC target mode using
        qla2xxx LLD code has been officially submitted by Qlogic to James
        below, and is currently outstanding but not yet merged into
          [PATCH 00/22] qla2xxx: Updates for scsi "misc" branch
        Note there are *zero* direct dependencies upon this for-next series
        for the qla2xxx LLD target + tcm_qla2xxx patches submitted above, and
        over the last days the target mode team has been tracking down an
        tcm_qla2xxx specific active I/O shutdown bug that appears to now be
        almost squashed for 3.5-rc-fixes."
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (47 commits)
        iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs
        iscsi-target: remove dead code in iscsi_check_valuelist_for_support
        target: Handle ATA_16 passthrough for pSCSI backend devices
        target: Add MI_REPORT_TARGET_PGS ext. header + implict_trans_secs attribute
        target: Fix MAINTENANCE_IN service action CDB checks to use lower 5 bits
        target: add support for the WRITE_VERIFY command
        target: make target_put_session void
        target: cleanup transport_execute_tasks()
        target: Remove max_sectors device attribute for modern se_task less code
        target: lock => unlock typo in transport_lun_wait_for_tasks
        target: Enforce hw_max_sectors for SCF_SCSI_DATA_SG_IO_CDB
        target: remove the t_se_count field in struct se_cmd
        target: remove the t_task_cdbs_ex_left field in struct se_cmd
        target: remove the t_task_cdbs_left field in struct se_cmd
        target: remove struct se_task
        target: move the state and execute lists to the command
        target: simplify command to task linkage
        target: always allocate a single task
        target: replace ->execute_task with ->execute_cmd
        target: remove the task_sectors field in struct se_task
    • Linus Torvalds's avatar
      Merge tag 'for-3.5' of git://openrisc.net/jonas/linux · f4c16c58
      Linus Torvalds authored
      Pull OpenRISC updates from Jonas Bonn:
       "A couple of cleanups for the OpenRISC architecture:
         - Implement IRQ domains
         - Use DMA mapping framework completely and catch up with recent
           changes to dma_map_ops
         - One bug fix to the "or1k_atomic" syscall to not clobber call-saved
         - OOM killer patches to the pagefault handler ported from the X86
         - ...and a couple of header file cleanups"
      * tag 'for-3.5' of git://openrisc.net/jonas/linux:
        openrisc: use scratch regs in atomic syscall
        openrisc: provide dma_map_ops
        openrisc: header file cleanups
        openrisc/mm/fault.c: Port OOM changes to do_page_fault
        openrisc: remove unnecessary includes
        openrisc: implement irqdomains
  4. 21 May, 2012 7 commits
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 3d1482fe
      Linus Torvalds authored
      Pull pin control subsystem changes from Linus Walleij:
       - Generic Device Tree bindings and hooks for drivers so we can move
         over modern drivers to using this.
       - Device Tree bindings for Tegra SoCs.
       - Funneling some devicetree helper code for the drivers/of subsystem.
       - New pin control drivers for:
         * Freescale MXS
         * Freescale i.MX51
         * Freescale i.MX53
           All of these use Device Tree bindings.
       - Dummy pinctrl handles for stepwise migration to pinctrl, akin to
         dummy regulators.
       - Minor non-urgent fixes and improvments.
      Fix up trivial conflicts in Documentation/driver-model/devres.txt and
      * tag 'pinctrl-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (46 commits)
        pinctrl: pinctrl-imx: add imx51 pinctrl driver
        pinctrl: pinctrl-imx: add imx53 pinctrl driver
        pinctrl: pinctrl-pxa3xx: remove empty pinmux disable function
        pinctrl: pinctrl-mxs: remove empty pinmux disable function
        pinctrl: pinctrl-imx: remove empty pinmux disable function
        pinctrl: make pinmux disable function optional
        pinctrl: a minor error checking improvement for pinconf
        pinctrl: mxs: skip gpio nodes for group creation
        pinctrl: mxs: create group for pin config node
        pinctrl: (cosmetic) fix two entries in DocBook comments
        pinctrl: add more info to error msgs in pin_request
        pinctrl: add pinctrl-mxs support
        pinctrl: pinctrl-imx: add imx6q pinctrl driver
        pinctrl: pinctrl-imx: add imx pinctrl core driver
        dt: add of_get_child_count helper function
        pinctrl: support gpio request deferred probing
        pinctrl: add pinctrl_provide_dummies interface for platforms to use
        pinctrl: enhance reporting of errors when loading from DT
        pinctrl: add kerneldoc for pinctrl_ops device tree functions
        pinctrl: propagate map validation errors
    • Linus Torvalds's avatar
      Merge tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · ac180657
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "The major thing here is the addition of some helpers to factor code
        out of drivers, making a fair proportion of regulators much more just
        data rather than code which is nice.
        - Helpers in the core for regulators using regmap, providing generic
          implementations of the enable and voltage selection operations which
          just need data to describe them in the drivers.
        - Split out voltage mapping and voltage setting, allowing many more
          drivers to take advantage of the infrastructure for selectors.
        - Loads and loads of cleanups from Axel Lin once again, including many
          changes to take advantage of the above new framework features
        - New drivers for Ricoh RC5T583, TI TPS62362, TI TPS62363, TI
          TPS65913, TI TWL6035 and TI TWL6037.
        Some of the registration changes to support the core refactoring
        caused so many conflicts that eventually topic branches were abandoned
        for this release."
      * tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (227 commits)
        regulator: tps65910: use of_node of matched regulator being register
        regulator: tps65910: dt: support when "regulators" node found
        regulator: tps65910: add error message in case of failure
        regulator: tps62360: dt: initialize of_node param for regulator register.
        regulator: tps65910: use devm_* for memory allocation
        regulator: tps65910: use small letter for regulator names
        mfd: tpx6586x:  Depend on regulator
        regulator: regulator for Palmas Kconfig
        regulator: regulator driver for Palmas series chips
        regulator: Enable Device Tree for the db8500-prcmu regulator driver
        regulator: db8500-prcmu: Separate regulator registration from probe
        regulator: ab3100: Use regulator_map_voltage_iterate()
        regulator: tps65217: Convert to set_voltage_sel and map_voltage
        regulator: Enable the ab8500 for Device Tree
        regulator: ab8500: Split up probe() into manageable pieces
        regulator: max8925: Remove check_range function and max_uV from struct rc5t583_regulator_info
        regulator: max8649: Remove unused check_range() function
        regulator: rc5t583: Remove max_uV from struct rc5t583_regulator_info
        regulator: da9052: Convert to set_voltage_sel and map_voltage
        regulator: max8952: Use devm_kzalloc
    • Linus Torvalds's avatar
      Merge tag 'regmap-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · ae82a828
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "A surprisingly large series of updates for regmap this time, mostly
        due to all the work Stephen Warren has done to add support for MMIO
        buses.  This wasn't really the target for the framework but it turns
        out that there's a reasonable number of cases where it's very helpful
        to use the register cache support to allow the register map to remain
        available while the device is suspended.
        - A MMIO bus implementation, contributed by Stephen Warren.  Currently
          this is limited to 32 bit systems and native endian registers.
        - Support for naming register maps, mainly intended for MMIO devices
          with multiple register banks.  This was also contributed by Stephen
        - Support for register striding, again contributed by Stephen Warren
          and mainly intended for use with MMIO as typically the registers
          will be a fixed size but byte addressed.
        - irqdomain support for the generic regmap irq_chip, including support
          for dynamically allocate interrupt numbers.
        - A function dev_get_regmap() which allows frameworks using regmap to
          obtain the regmap for a device from the struct device, making life a
          little simpler for them.
        - Updates to regmap-irq to support more chips (contributed by Graeme
          Gregory) and to use irqdomains.
        - Support for devices with 24 bit register addresses.
        The striding support collided with all the topic branches so the
        branches look a bit messy and eventually I just gave up.  There's also
        the TI Palmas driver and a couple of other isolated MFD patches that
        all depend on new regmap features so are being merged here."
      * tag 'regmap-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (24 commits)
        mfd: palmas PMIC device support Kconfig
        mfd: palmas PMIC device support
        regmap: Fix typo in IRQ register striding
        mfd: wm8994: Update to fully use irq_domain
        regmap: add support for non contiguous status to regmap-irq
        regmap: Convert regmap_irq to use irq_domain
        regmap: Pass back the allocated regmap IRQ controller data
        mfd: da9052: Fix genirq abuse
        regmap: Implement dev_get_regmap()
        regmap: Devices using format_write don't support bulk operations
        regmap: Converts group operation into single read write operations
        regmap: Cache single values read from the chip
        regmap: fix compile errors in regmap-irq.c due to stride changes
        regmap: implement register striding
        regmap: fix compilation when !CONFIG_DEBUG_FS
        regmap: allow regmap instances to be named
        regmap: validate regmap_raw_read/write val_len
        regmap: mmio: remove some error checks now in the core
        regmap: mmio: convert some error returns to BUG()
        regmap: add MMIO bus support
    • Linus Torvalds's avatar
      Merge tag 'pci-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 3bb07f1b
      Linus Torvalds authored
      Pull PCI changes from Bjorn Helgaas:
       - Host bridge cleanups from Yinghai
       - Disable Bus Master bit on PCI device shutdown (kexec-related)
       - Stratus ftServer fix
       - pci_dev_reset() locking fix
       - IvyBridge graphics erratum workaround
      * tag 'pci-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)
        microblaze/PCI: fix "io_offset undeclared" error
        x86/PCI: only check for spinlock being held in SMP kernels
        resources: add resource_overlaps()
        PCI: fix uninitialized variable 'cap_mask'
        MAINTAINERS: update PCI git tree and patchwork
        PCI: disable Bus Master on PCI device shutdown
        PCI: work around IvyBridge internal graphics FLR erratum
        x86/PCI: fix unused variable warning in amd_bus.c
        PCI: move mutex locking out of pci_dev_reset function
        PCI: work around Stratus ftServer broken PCIe hierarchy
        x86/PCI: merge pcibios_scan_root() and pci_scan_bus_on_node()
        x86/PCI: dynamically allocate pci_root_info for native host bridge drivers
        x86/PCI: embed pci_sysdata into pci_root_info on ACPI path
        x86/PCI: embed name into pci_root_info struct
        x86/PCI: add host bridge resource release for _CRS path
        x86/PCI: refactor get_current_resources()
        PCI: add host bridge release support
        PCI: add generic device into pci_host_bridge struct
        PCI: rename pci_host_bridge() to find_pci_root_bridge()
        x86/PCI: fix memleak with get_current_resources()
    • Linus Torvalds's avatar
      vfs: be even more careful about dentry RCU name lookups · 6326c71f
      Linus Torvalds authored
      Miklos Szeredi points out that we need to also worry about memory
      odering when doing the dentry name comparison asynchronously with RCU.
      In particular, doing a rename can do a memcpy() of one dentry name over
      another, and we want to make sure that any unlocked reader will always
      see the proper terminating NUL character, so that it won't ever run off
      the allocation.
      Rather than having to be extra careful with the name copy or at lookup
      time for each character, this resolves the issue by making sure that all
      names that are inlined in the dentry always have a NUL character at the
      end of the name allocation.  If we do that at dentry allocation time, we
      know that no future name copy will ever change that final NUL to
      anything else, so there are no memory ordering issues.
      So even if a concurrent rename ends up overwriting the NUL character
      that terminates the original name, we always know that there is one
      final NUL at the end, and there is no worry about the lockless RCU
      lookup traversing the name too far.
      The out-of-line allocations are never copied over, so we can just make
      sure that we write the name (with terminating NULL) and do a write
      barrier before we expose the name to anything else by setting it in the
      Reported-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Nick Piggin <npiggin@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      vfs: make AIO use the proper rw_verify_area() area helpers · a70b52ec
      Linus Torvalds authored
      We had for some reason overlooked the AIO interface, and it didn't use
      the proper rw_verify_area() helper function that checks (for example)
      mandatory locking on the file, and that the size of the access doesn't
      cause us to overflow the provided offset limits etc.
      Instead, AIO did just the security_file_permission() thing (that
      rw_verify_area() also does) directly.
      This fixes it to do all the proper helper functions, which not only
      means that now mandatory file locking works with AIO too, we can
      actually remove lines of code.
      Reported-by: default avatarManish Honap <manish_honap_vit@yahoo.co.in>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · ff8ce5f6
      Linus Torvalds authored
      Pull core ARM updates from Russell King:
       "This is the bulk of the core ARM updates for this merge window.
        Included in here is a different way to handle the VIVT cache flushing
        on context switch, which should allow scheduler folk to remove a
        special case in their core code.
        We have architectured timer support here, which is a set of timers
        specified by the ARM architecture for future SoCs.  So we should see
        less variability in timer design going forward.
        The last big thing here is my cleanup to the way we handle PCI across
        ARM, fixing some oddities in some platforms which hadn't realised
        there was a way to deal with their private data already built in to
        our PCI backend.
        I've also removed support for the ARMv3 architecture; it hasn't worked
        properly for years so it seems pointless to keep it around."
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (47 commits)
        ARM: PCI: remove per-pci_hw list of buses
        ARM: PCI: dove/kirkwood/mv78xx0: use sys->private_data
        ARM: PCI: provide a default bus scan implementation
        ARM: PCI: get rid of pci_std_swizzle()
        ARM: PCI: versatile: fix PCI interrupt setup
        ARM: PCI: integrator: use common PCI swizzle
        ARM: 7416/1: LPAE: Remove unused L_PTE_(BUFFERABLE|CACHEABLE) macros
        ARM: 7415/1: vfp: convert printk's to pr_*'s
        ARM: decompressor: avoid speculative prefetch from non-RAM areas
        ARM: Remove ARMv3 support from decompressor
        ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level
        ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs
        ARM: 7363/1: DEBUG_LL: limit early mapping to the minimum
        ARM: 7391/1: versatile: add some auxdata for device trees
        ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller
        AMBA: get rid of last two uses of NO_IRQ
        ARM: 7408/1: cacheflush: return error to userspace when flushing syscall fails
        ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held
        ARM: 7404/1: cmpxchg64: use atomic64 and local64 routines for cmpxchg64
        ARM: 7347/1: SCU: use cpu_logical_map for per-CPU low power mode