1. 22 Feb, 2013 20 commits
  2. 21 Feb, 2013 10 commits
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 024e4ec1
      Linus Torvalds authored
      Pull pstore patches from Tony Luck:
       "A few fixes to reduce places where pstore might hang a system in the
        crash path.  Plus a new mountpoint (/sys/fs/pstore ...  makes more
        sense then /dev/pstore)."
      
      Fix up trivial conflict in drivers/firmware/efivars.c
      
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: Create a convenient mount point for pstore
        efi_pstore: Introducing workqueue updating sysfs
        efivars: Disable external interrupt while holding efivars->lock
        efi_pstore: Avoid deadlock in non-blocking paths
        pstore: Avoid deadlock in panic and emergency-restart path
      024e4ec1
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 850cb82b
      Linus Torvalds authored
      Pull dlm update from David Teigland:
       "This includes a single patch to avoid excessive and unnecessary
        scanning of rsbs to free."
      
      * tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: avoid scanning unchanged toss lists
      850cb82b
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 2171ee8f
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
      
       - Fix an Oops in the pNFS layoutget code
      
       - Fix a number of NFSv4 and v4.1 state recovery deadlocks and hangs due
         to the interaction of the session drain lock and state management
         locks.
      
       - Remove task->tk_xprt, which was hiding a lot of RCU dereferencing
         bugs
      
       - Fix a long standing NFSv3 posix lock recovery bug.
      
       - Revert commit 324d003b ("NFS: add nfs_sb_deactive_async to avoid
         deadlock").  It turned out that the root cause of the deadlock was
         due to interactions with the workqueues that have now been resolved.
      
      * tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (22 commits)
        NLM: Ensure that we resend all pending blocking locks after a reclaim
        umount oops when remove blocklayoutdriver first
        sunrpc: silence build warning in gss_fill_context
        nfs: remove kfree() redundant null checks
        NFSv4.1: Don't decode skipped layoutgets
        NFSv4.1: Fix bulk recall and destroy of layouts
        NFSv4.1: Fix an ABBA locking issue with session and state serialisation
        NFSv4: Fix a reboot recovery race when opening a file
        NFSv4: Ensure delegation recall and byte range lock removal don't conflict
        NFSv4: Fix up the return values of nfs4_open_delegation_recall
        NFSv4.1: Don't lose locks when a server reboots during delegation return
        NFSv4.1: Prevent deadlocks between state recovery and file locking
        NFSv4: Allow the state manager to mark an open_owner as being recovered
        SUNRPC: Add missing static declaration to _gss_mech_get_by_name
        Revert "NFS: add nfs_sb_deactive_async to avoid deadlock"
        SUNRPC: Nuke the tk_xprt macro
        SUNRPC: Avoid RCU dereferences in the transport bind and connect code
        SUNRPC: Fix an RCU dereference in xprt_reserve
        SUNRPC: Pass pointers to struct rpc_xprt to the congestion window
        SUNRPC: Fix an RCU dereference in xs_local_rpcbind
        ...
      2171ee8f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 9b9a72a8
      Linus Torvalds authored
      Pull GFS2 updates from Steven Whitehouse:
       "This is one of the smallest collections of patches for the merge
        window for some time.  There are some clean ups relating to the
        transaction code and the shrinker, which are mostly in preparation for
        further development, but also make the code much easier to follow in
        these areas.
      
        There is a patch which allows the use of ->writepages even in the
        default ordered write mode for all writebacks.  This results in
        sending larger i/os to the block layer, and a subsequent increase in
        performance.  It also reduces the number of different i/o paths by
        one.
      
        There is also a bug fix reinstating the withdraw ack system which
        somehow got lost when the lock modules were merged into GFS2."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Reinstate withdraw ack system
        GFS2: Get a block reservation before resizing a file
        GFS2: Split glock lru processing into two parts
        GFS2: Use ->writepages for ordered writes
        GFS2: Clean up freeze code
        GFS2: Merge gfs2_attach_bufdata() into trans.c
        GFS2: Copy gfs2_trans_add_bh into new data/meta functions
        GFS2: Split gfs2_trans_add_bh() into two
        GFS2: Merge revoke adding functions
        GFS2: Separate LRU scanning from shrinker
      9b9a72a8
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.9-rc1' of git://oss.sgi.com/xfs/xfs · 736a4c11
      Linus Torvalds authored
      Pull xfs update from Ben Myers:
       "Primarily bugfixes and a few cleanups:
      
         - fix(es) for compound buffers
      
         - remove unused XFS_TRANS_DEBUG routines
      
         - fix for dquot soft timer asserts due to overflow of d_blk_softlimit
      
         - don't zero allocation args structure members after they are memset(0)
      
         - fix for regression in dir v2 code introduced in commit 20f7e9f3
      
         - remove obsolete simple_strto<foo>
      
         - fix return value when filesystem probe finds no XFS magic, a
           regression introduced in 98021821.
      
         - remove boolean_t typedef completely
      
         - fix stack switch in __xfs_bmapi_allocate by moving the check for
           stack switch up into xfs_bmapi_write.
      
         - fix build error due to incomplete boolean_t removal
      
         - fix oops in _xfs_buf_find by validating that the requested block is
           within the filesystem bounds.
      
         - limit speculative preallocation near ENOSPC.
      
         - fix an unmount hang in xfs_wait_buftarg by freeing the
           xfs_buf_log_item in xfs_buf_item_unlock.
      
         - fix a possible use after free with AIO.
      
         - fix xfs_swap_extents after removal of xfs_flushinval_pages, a
           regression introduced in fb595814.
      
         - replace hardcoded 128 with log header size
      
         - add memory barrier before wake_up_bit in xfs_ifunlock
      
         - limit speculative preallocation on sparse files
      
         - fix xa_lock recursion bug introduced in 90810b9e
      
         - fix write verifier for symlinks"
      
      Fixed up conflicts in fs/xfs/xfs_buf_item.c (due to bli_format rename in
      commit 0f22f9d0 affecting the removed XFS_TRANS_DEBUG routines in
      commit ec47eb6b).
      
      * tag 'for-linus-v3.9-rc1' of git://oss.sgi.com/xfs/xfs: (36 commits)
        xfs: xfs_bmap_add_attrfork_local is too generic
        xfs: remove log force from xfs_buf_trylock()
        xfs: recheck buffer pinned status after push trylock failure
        xfs: limit speculative prealloc size on sparse files
        xfs: memory barrier before wake_up_bit()
        xfs: refactor space log reservation for XFS_TRANS_ATTR_SET
        xfs: make use of XFS_SB_LOG_RES() at xfs_fs_log_dummy()
        xfs: make use of XFS_SB_LOG_RES() at xfs_mount_log_sb()
        xfs: make use of XFS_SB_LOG_RES() at xfs_log_sbcount()
        xfs: introduce XFS_SB_LOG_RES() for transactions that modify sb on disk
        xfs: calculate XFS_TRANS_QM_QUOTAOFF_END space log reservation at mount time
        xfs: calculate XFS_TRANS_QM_QUOTAOFF space log reservation at mount time
        xfs: calculate XFS_TRANS_QM_DQALLOC space log reservation at mount time
        xfs: calcuate XFS_TRANS_QM_SETQLIM space log reservation at mount time
        xfs: calculate xfs_qm_write_sb_changes() space log reservation at mount time
        xfs: calculate XFS_TRANS_QM_SBCHANGE space log reservation at mount time
        xfs: make use of xfs_calc_buf_res() in xfs_trans.c
        xfs: add a helper to figure out the space log reservation per item
        xfs: Fix xfs_swap_extents() after removal of xfs_flushinval_pages()
        xfs: Fix possible use-after-free with AIO
        ...
      736a4c11
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · c4bc705e
      Linus Torvalds authored
      Pull fuse updates from Miklos Szeredi:
       "The biggest part of this pull request is a patch series from Maxim
        Patlasov to optimize scatter-gather direct IO.  There's also the
        addition of a "readdirplus" API, poll events and various fixes and
        cleanups.
      
        There's a one line change outside of fuse to mm/filemap.c which makes
        the argument of iov_iter_single_seg_count() const, required by Maxim's
        patches."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (22 commits)
        fuse: allow control of adaptive readdirplus use
        Synchronize fuse header with one used in library
        fuse: send poll events
        fuse: don't WARN when nlink is zero
        fuse: avoid out-of-scope stack access
        fuse: bump version for READDIRPLUS
        FUSE: Adapt readdirplus to application usage patterns
        Do not use RCU for current process credentials
        fuse: cleanup fuse_direct_io()
        fuse: optimize __fuse_direct_io()
        fuse: optimize fuse_get_user_pages()
        fuse: pass iov[] to fuse_get_user_pages()
        mm: minor cleanup of iov_iter_single_seg_count()
        fuse: use req->page_descs[] for argpages cases
        fuse: add per-page descriptor <offset, length> to fuse_req
        fuse: rework fuse_do_ioctl()
        fuse: rework fuse_perform_write()
        fuse: rework fuse_readpages()
        fuse: rework fuse_retrieve()
        fuse: categorize fuse_get_req()
        ...
      c4bc705e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 2608e3d0
      Linus Torvalds authored
      Pull v9fs updates from Eric Van Hensbergen:
       "Just fixes and simplifications"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        fs/9p: Fix atomic_open
        fs/9p: Don't use O_TRUNC flag in TOPEN and TLOPEN request
        locking in fs/9p ->readdir()
      2608e3d0
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 33673dcb
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "This is basically a maintenance update for the TPM driver and EVM/IMA"
      
      Fix up conflicts in lib/digsig.c and security/integrity/ima/ima_main.c
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (45 commits)
        tpm/ibmvtpm: build only when IBM pseries is configured
        ima: digital signature verification using asymmetric keys
        ima: rename hash calculation functions
        ima: use new crypto_shash API instead of old crypto_hash
        ima: add policy support for file system uuid
        evm: add file system uuid to EVM hmac
        tpm_tis: check pnp_acpi_device return code
        char/tpm/tpm_i2c_stm_st33: drop temporary variable for return value
        char/tpm/tpm_i2c_stm_st33: remove dead assignment in tpm_st33_i2c_probe
        char/tpm/tpm_i2c_stm_st33: Remove __devexit attribute
        char/tpm/tpm_i2c_stm_st33: Don't use memcpy for one byte assignment
        tpm_i2c_stm_st33: removed unused variables/code
        TPM: Wait for TPM_ACCESS tpmRegValidSts to go high at startup
        tpm: Fix cancellation of TPM commands (interrupt mode)
        tpm: Fix cancellation of TPM commands (polling mode)
        tpm: Store TPM vendor ID
        TPM: Work around buggy TPMs that block during continue self test
        tpm_i2c_stm_st33: fix oops when i2c client is unavailable
        char/tpm: Use struct dev_pm_ops for power management
        TPM: STMicroelectronics ST33 I2C BUILD STUFF
        ...
      33673dcb
    • David Howells's avatar
      KEYS: Revert one application of "Fix unreachable code" patch · fe9453a1
      David Howells authored
      A patch to fix some unreachable code in search_my_process_keyrings() got
      applied twice by two different routes upstream as commits e67eab39
      and b010520a (both "fix unreachable code").
      
      Unfortunately, the second application removed something it shouldn't
      have and this wasn't detected by GIT.  This is due to the patch not
      having sufficient lines of context to distinguish the two places of
      application.
      
      The effect of this is relatively minor: inside the kernel, the keyring
      search routines may search multiple keyrings and then prioritise the
      errors if no keys or negative keys are found in any of them.  With the
      extra deletion, the presence of a negative key in the thread keyring
      (causing ENOKEY) is incorrectly overridden by an error searching the
      process keyring.
      
      So revert the second application of the patch.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: Jiri Kosina <jkosina@suse.cz>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fe9453a1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · a0b1c429
      Linus Torvalds authored
      Pull networking update from David Miller:
      
       1) Checkpoint/restarted TCP sockets now can properly propagate the TCP
          timestamp offset.  From Andrey Vagin.
      
       2) VMWARE VM VSOCK layer, from Andy King.
      
       3) Much improved support for virtual functions and SR-IOV in bnx2x,
          from Ariel ELior.
      
       4) All protocols on ipv4 and ipv6 are now network namespace aware, and
          all the compatability checks for initial-namespace-only protocols is
          removed.  Thanks to Tom Parkin for helping deal with the last major
          holdout, L2TP.
      
       5) IPV6 support in netpoll and network namespace support in pktgen,
          from Cong Wang.
      
       6) Multiple Registration Protocol (MRP) and Multiple VLAN Registration
          Protocol (MVRP) support, from David Ward.
      
       7) Compute packet lengths more accurately in the packet scheduler, from
          Eric Dumazet.
      
       8) Use per-task page fragment allocator in skb_append_datato_frags(),
          also from Eric Dumazet.
      
       9) Add support for connection tracking labels in netfilter, from
          Florian Westphal.
      
      10) Fix default multicast group joining on ipv6, and add anti-spoofing
          checks to 6to4 and 6rd.  From Hannes Frederic Sowa.
      
      11) Make ipv4/ipv6 fragmentation memory limits more reasonable in modern
          times, rearrange inet frag datastructures for better cacheline
          locality, and move more operations outside of locking.  From Jesper
          Dangaard Brouer.
      
      12) Instead of strict master <--> slave relationships, allow arbitrary
          scenerios with "upper device lists".  From Jiri Pirko.
      
      13) Improve rate limiting accuracy in TBF and act_police, also from Jiri
          Pirko.
      
      14) Add a BPF filter netfilter match target, from Willem de Bruijn.
      
      15) Orphan and delete a bunch of pre-historic networking drivers from
          Paul Gortmaker.
      
      16) Add TSO support for GRE tunnels, from Pravin B SHelar.  Although
          this still needs some minor bug fixing before it's %100 correct in
          all cases.
      
      17) Handle unresolved IPSEC states like ARP, with a resolution packet
          queue.  From Steffen Klassert.
      
      18) Remove TCP Appropriate Byte Count support (ABC), from Stephen
          Hemminger.  This was long overdue.
      
      19) Support SO_REUSEPORT, from Tom Herbert.
      
      20) Allow locking a socket BPF filter, so that it cannot change after a
          process drops capabilities.
      
      21) Add VLAN filtering to bridge, from Vlad Yasevich.
      
      22) Bring ipv6 on-par with ipv4 and do not cache neighbour entries in
          the ipv6 routes, from YOSHIFUJI Hideaki.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1538 commits)
        ipv6: fix race condition regarding dst->expires and dst->from.
        net: fix a wrong assignment in skb_split()
        ip_gre: remove an extra dst_release()
        ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
        atl1c: restore buffer state
        net: fix a build failure when !CONFIG_PROC_FS
        net: ipv4: fix waring -Wunused-variable
        net: proc: fix build failed when procfs is not configured
        Revert "xen: netback: remove redundant xenvif_put"
        net: move procfs code to net/core/net-procfs.c
        qmi_wwan, cdc-ether: add ADU960S
        bonding: set sysfs device_type to 'bond'
        bonding: fix bond_release_all inconsistencies
        b44: use netdev_alloc_skb_ip_align()
        xen: netback: remove redundant xenvif_put
        net: fec: Do a sanity check on the gpio number
        ip_gre: propogate target device GSO capability to the tunnel device
        ip_gre: allow CSUM capable devices to handle packets
        bonding: Fix initialize after use for 3ad machine state spinlock
        bonding: Fix race condition between bond_enslave() and bond_3ad_update_lacp_rate()
        ...
      a0b1c429
  3. 20 Feb, 2013 10 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 8ec49422
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Mostly more sparc64 THP bug fixes, and a refactoring of SMP bootup on
        sparc32 from Sam Ravnborg."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc32: refactor smp boot
        sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
        sparc64: Fix tsb_grow() in atomic context.
        sparc64: Handle hugepage TSB being NULL.
        sparc64: Fix gfp_flags setting in tsb_grow().
      8ec49422
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 79a69d34
      Linus Torvalds authored
      Pull arm64 patches from Catalin Marinas:
      
       - SMP support for the PSCI booting protocol (power state coordination
         interface).
      
       - Simple earlyprintk support.
      
       - Platform devices populated by default from the DT (SoC-agnostic).
      
       - CONTEXTIDR support (used by external trace tools).
      
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: update CONTEXTIDR register to contain PID of current process
        arm64: atomics: fix grossly inconsistent asm constraints for exclusives
        arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link
        arm64: Select ARCH_WANT_FRAME_POINTERS
        arm64: Add kvm_para.h and xor.h generic headers
        arm64: SMP: enable PSCI boot method
        arm64: psci: add support for PSCI invocations from the kernel
        arm64: SMP: rework the SMP code to be enabling method agnostic
        arm64: perf: add guest vs host discrimination
        arm64: add COMPAT_PSR_*_BIT flags
        arm64: Add simple earlyprintk support
        arm64: Populate the platform devices
      79a69d34
    • Linus Torvalds's avatar
      Merge branch 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm · 6db167df
      Linus Torvalds authored
      Pull ARM updates (part two) from Russell King:
      
       - breakpoint and perf updates from Will Deacon.
      
       - hypervisor boot mode updates from Will.
      
       - support for Power State Coordination Interface via the Hypervisor
      
       - core ARM support for KVM
      
      * 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
        KVM: ARM: Add maintainer entry for KVM/ARM
        KVM: ARM: Power State Coordination Interface implementation
        KVM: ARM: Handle I/O aborts
        KVM: ARM: Handle guest faults in KVM
        KVM: ARM: VFP userspace interface
        KVM: ARM: Demux CCSIDR in the userspace API
        KVM: ARM: User space API for getting/setting co-proc registers
        KVM: ARM: Emulation framework and CP15 emulation
        KVM: ARM: World-switch implementation
        KVM: ARM: Inject IRQs and FIQs from userspace
        KVM: ARM: Memory virtualization setup
        KVM: ARM: Hypervisor initialization
        KVM: ARM: Initial skeleton to compile KVM support
        ARM: Section based HYP idmap
        ARM: Add page table and page defines needed by KVM
        ARM: perf: simplify __hw_perf_event_init err handling
        ARM: perf: remove unnecessary checks for idx < 0
        ARM: perf: handle armpmu_register failing
        ARM: perf: don't pretend to support counting of L1I writes
        ARM: perf: remove redundant NULL check on cpu_pmu
        ...
      6db167df
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 32f9aab8
      Linus Torvalds authored
      Pull ARM updates (part one) from Russell King:
      
       - MMC patches from Ulf Hansson and Pawel Moll.  These add support for
         DDR mode and the latest variant found on ARM Versatile Express, as
         well as a number of cleanups.
      
       - A fix for to improve the behaviour of ARMs sched_clock()
      
       - Changes to the ARM ioremap() code.  I'm not convinced with the
         primary arguments for this, but it's been around for a while, and
         people seem happy with it - and the "other" justification for this is
         at
      
            http://lkml.org/lkml/2012/12/6/184
      
       - Add SCHED_HRTICK to ARMs Kconfig
      
       - Making the ARM SHA/AES code Thumb-2 compatible
      
       - A collection of other small updates.
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (26 commits)
        ARM: add SCHED_HRTICK config option
        ARM: 7650/1: mm: replace direct access to mm->context.id with new macro
        ARM: 7649/1: mm: mm->context.id fix for big-endian
        ARM: 7648/1: pci: Allow passing per-controller private data
        ARM: 7647/1: pci: Keep pci_common_init() around after init
        ARM: fix warnings introduced by previous patch
        ARM: 7646/1: mm: use static_vm for managing static mapped areas
        ARM: 7645/1: ioremap: introduce an infrastructure for static mapped area
        ARM: 7644/1: vmregion: remove vmregion code entirely
        MAINTAINERS: Re-assert MMCI driver maintainer status
        MAINTAINERS: add additional file for MMCI driver
        MAINTAINERS: add maintainer entry for AMBA serial drivers
        ARM: 7637/1: memory: use SZ_ constants for defining the virtual memory layout
        ARM: 7643/1: sched: correct update_sched_clock()
        ARM: 7635/1: versatile: fix the PCI IRQ regression
        ARM: 7639/1: cache-l2x0: add missed dummy outer_resume entry
        ARM: 7630/1: mmc: mmci: Fixup and cleanup code for DMA handling
        ARM: 7632/1: spinlock: avoid exclusive accesses on unlock() path
        ARM: 7631/1: mmc: mmci: Add new VE MMCI variant
        ARM: 7623/1: mmc: mmci: Fixup clock gating when freq is 0 for ST-variants
        ...
      32f9aab8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · e177bb58
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
        swim: Add missing spinlock init
      e177bb58
    • Sam Ravnborg's avatar
      sparc32: refactor smp boot · f9fd3488
      Sam Ravnborg authored
      Introduce a common smp_callin() function to call
      from trampoline_32.S.
      Add platform specific functions to handle the
      platform details.
      
      This is in preparation for a patch that will
      unify the smp boot stuff for all architectures.
      sparc32 was significantly different to warrant
      this patch in preparation.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f9fd3488
    • David S. Miller's avatar
      sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler. · 76968ad2
      David S. Miller authored
      When we set the sun4u version of the PTE execute bit, it's:
      
      	or	REG, _PAGE_EXEC_4U, REG
      
      _PAGE_EXEC_4U is 0x1000, unfortunately the immedate field of the
      'or' instruction is a signed 13-bit value.  So the above actually
      assembles into:
      
      	or	REG, -4096, REG
      
      completely corrupting the final PTE value.
      
      Set it with a:
      
      	sethi	%hi(_PAGE_EXEC_4U), TMP
      	or	REG, TMP, REG
      
      sequence instead.
      
      This fixes "git gc" crashes on sun4u machines.
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      76968ad2
    • YOSHIFUJI Hideaki / 吉藤英明's avatar
      ipv6: fix race condition regarding dst->expires and dst->from. · ecd98837
      YOSHIFUJI Hideaki / 吉藤英明 authored
      Eric Dumazet wrote:
      | Some strange crashes happen in rt6_check_expired(), with access
      | to random addresses.
      |
      | At first glance, it looks like the RTF_EXPIRES and
      | stuff added in commit 1716a961
      | (ipv6: fix problem with expired dst cache)
      | are racy : same dst could be manipulated at the same time
      | on different cpus.
      |
      | At some point, our stack believes rt->dst.from contains a dst pointer,
      | while its really a jiffie value (as rt->dst.expires shares the same area
      | of memory)
      |
      | rt6_update_expires() should be fixed, or am I missing something ?
      |
      | CC Neil because of https://bugzilla.redhat.com/show_bug.cgi?id=892060
      
      Because we do not have any locks for dst_entry, we cannot change
      essential structure in the entry; e.g., we cannot change reference
      to other entity.
      
      To fix this issue, split 'from' and 'expires' field in dst_entry
      out of union.  Once it is 'from' is assigned in the constructor,
      keep the reference until the very last stage of the life time of
      the object.
      
      Of course, it is unsafe to change 'from', so make rt6_set_from simple
      just for fresh entries.
      Reported-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Reported-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      CC: Gao Feng <gaofeng@cn.fujitsu.com>
      Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarSteinar H. Gunderson <sesse@google.com>
      Reviewed-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ecd98837
    • Amerigo Wang's avatar
      net: fix a wrong assignment in skb_split() · 68534c68
      Amerigo Wang authored
      commit c9af6db4 (net: Fix possible wrong checksum generation)
      has a suspicous piece:
      
      	-       skb_shinfo(skb1)->gso_type = skb_shinfo(skb)->gso_type;
      	-
      	+       skb_shinfo(skb)->tx_flags = skb_shinfo(skb1)->tx_flags & SKBTX_SHARED_FRAG;
      
      skb1 is the new skb, therefore should be on the left side of the assignment.
      This patch fixes it.
      
      Cc: Pravin B Shelar <pshelar@nicira.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      68534c68
    • Linus Torvalds's avatar
      Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 55529fa5
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "Mostly AMD's side of EDAC.  It is basically a new family enablement
        stuff: AMD F16h MCE decoding enablement from Jacob Shin.  The rest is
        trivial cleanups."
      
      * tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        mpc85xx_edac: Fix typo
        EDAC, MCE, AMD: Remove unneeded exports
        EDAC, MCE, AMD: Add MCE decoding support for Family 16h
        EDAC, MCE, AMD: Make MC2 decoding per-family
        amd64_edac: Remove dead code
      55529fa5