1. 29 1月, 2014 37 次提交
  2. 28 1月, 2014 3 次提交
    • J
      CRISv10: Readd missing header · cd065a01
      Jesper Nilsson 提交于
      The svinto architecture header was mistakenly removed,
      leading to a compile error.
      Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>
      cd065a01
    • L
      Merge branch 'akpm' (incoming from Andrew) · 54c0a4b4
      Linus Torvalds 提交于
      Merge misc updates from Andrew Morton:
      
       - a few hotfixes
      
       - dynamic-debug updates
      
       - ipc updates
      
       - various other sweepings off the factory floor
      
      * akpm: (31 commits)
        firmware/google: drop 'select EFI' to avoid recursive dependency
        compat: fix sys_fanotify_mark
        checkpatch.pl: check for function declarations without arguments
        mm/migrate.c: fix setting of cpupid on page migration twice against normal page
        softirq: use const char * const for softirq_to_name, whitespace neatening
        softirq: convert printks to pr_<level>
        softirq: use ffs() in __do_softirq()
        kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()
        splice: fix unexpected size truncation
        ipc: fix compat msgrcv with negative msgtyp
        ipc,msg: document barriers
        ipc: delete seq_max field in struct ipc_ids
        ipc: simplify sysvipc_proc_open() return
        ipc: remove useless return statement
        ipc: remove braces for single statements
        ipc: standardize code comments
        ipc: whitespace cleanup
        ipc: change kern_ipc_perm.deleted type to bool
        ipc: introduce ipc_valid_object() helper to sort out IPC_RMID races
        ipc/sem.c: avoid overflow of semop undo (semadj) value
        ...
      54c0a4b4
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 1b17366d
      Linus Torvalds 提交于
      Pull powerpc updates from Ben Herrenschmidt:
       "So here's my next branch for powerpc.  A bit late as I was on vacation
        last week.  It's mostly the same stuff that was in next already, I
        just added two patches today which are the wiring up of lockref for
        powerpc, which for some reason fell through the cracks last time and
        is trivial.
      
        The highlights are, in addition to a bunch of bug fixes:
      
         - Reworked Machine Check handling on kernels running without a
           hypervisor (or acting as a hypervisor).  Provides hooks to handle
           some errors in real mode such as TLB errors, handle SLB errors,
           etc...
      
         - Support for retrieving memory error information from the service
           processor on IBM servers running without a hypervisor and routing
           them to the memory poison infrastructure.
      
         - _PAGE_NUMA support on server processors
      
         - 32-bit BookE relocatable kernel support
      
         - FSL e6500 hardware tablewalk support
      
         - A bunch of new/revived board support
      
         - FSL e6500 deeper idle states and altivec powerdown support
      
        You'll notice a generic mm change here, it has been acked by the
        relevant authorities and is a pre-req for our _PAGE_NUMA support"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (121 commits)
        powerpc: Implement arch_spin_is_locked() using arch_spin_value_unlocked()
        powerpc: Add support for the optimised lockref implementation
        powerpc/powernv: Call OPAL sync before kexec'ing
        powerpc/eeh: Escalate error on non-existing PE
        powerpc/eeh: Handle multiple EEH errors
        powerpc: Fix transactional FP/VMX/VSX unavailable handlers
        powerpc: Don't corrupt transactional state when using FP/VMX in kernel
        powerpc: Reclaim two unused thread_info flag bits
        powerpc: Fix races with irq_work
        Move precessing of MCE queued event out from syscall exit path.
        pseries/cpuidle: Remove redundant call to ppc64_runlatch_off() in cpu idle routines
        powerpc: Make add_system_ram_resources() __init
        powerpc: add SATA_MV to ppc64_defconfig
        powerpc/powernv: Increase candidate fw image size
        powerpc: Add debug checks to catch invalid cpu-to-node mappings
        powerpc: Fix the setup of CPU-to-Node mappings during CPU online
        powerpc/iommu: Don't detach device without IOMMU group
        powerpc/eeh: Hotplug improvement
        powerpc/eeh: Call opal_pci_reinit() on powernv for restoring config space
        powerpc/eeh: Add restore_config operation
        ...
      1b17366d