1. 19 1月, 2013 3 次提交
    • L
      Merge tag 'stable/for-linus-3.8-rc3-tag' of... · 5c69bed2
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.8-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       - CVE-2013-0190/XSA-40 (or stack corruption for 32-bit PV kernels)
       - Fix racy vma access spotted by Al Viro
       - Fix mmap batch ioctl potentially resulting in large O(n) page allcations.
       - Fix vcpu online/offline BUG:scheduling while atomic..
       - Fix unbound buffer scanning for more than 32 vCPUs.
       - Fix grant table being incorrectly initialized
       - Fix incorrect check in pciback
       - Allow privcmd in backend domains.
      
      Fix up whitespace conflict due to ugly merge resolution in Xen tree in
      arch/arm/xen/enlighten.c
      
      * tag 'stable/for-linus-3.8-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: Fix stack corruption in xen_failsafe_callback for 32bit PVOPS guests.
        Revert "xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic."
        xen/gntdev: remove erronous use of copy_to_user
        xen/gntdev: correctly unmap unlinked maps in mmu notifier
        xen/gntdev: fix unsafe vma access
        xen/privcmd: Fix mmap batch ioctl.
        Xen: properly bound buffer access when parsing cpu/*/availability
        xen/grant-table: correctly initialize grant table version 1
        x86/xen : Fix the wrong check in pciback
        xen/privcmd: Relax access control in privcmd_ioctl_mmap
      5c69bed2
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · b814469a
      Linus Torvalds 提交于
      Pull m68knommu arch fixes from Greg Ungerer:
       "This contains a couple of fixes, both affecting compilation of non-mmu
        m68k targets."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: fix conditional use of init_pointer_table
        m68knommu: add KMAP definitions for non-MMU definitions
      b814469a
    • K
      asm-generic, mm: pgtable: convert my_zero_pfn() to macros to fix build · 2f91ec8c
      Kirill A. Shutemov 提交于
      Commit 816422ad ("asm-generic, mm: pgtable: consolidate zero page
      helpers") broke the compile on MIPS if SPARSEMEM is enabled.  We get
      this:
      
        In file included from arch/mips/include/asm/pgtable.h:552,
                         from include/linux/mm.h:44,
                         from arch/mips/kernel/asm-offsets.c:14:
        include/asm-generic/pgtable.h: In function 'my_zero_pfn':
        include/asm-generic/pgtable.h:466: error: implicit declaration of function 'page_to_section'
        In file included from arch/mips/kernel/asm-offsets.c:14:
        include/linux/mm.h: At top level:
        include/linux/mm.h:738: error: conflicting types for 'page_to_section'
        include/asm-generic/pgtable.h:466: note: previous implicit declaration of 'page_to_section' was here
      
      Due header files inter-dependencies, the only way I see to fix it is
      convert my_zero_pfn() for __HAVE_COLOR_ZERO_PAGE to macros.
      Signed-off-by: NKirill A. Shutemov <kirill@shutemov.name>
      Tested-by: NAaro Koskinen <aaro.koskinen@iki.fi>
      Acked-by: NDavid Daney <david.daney@cavium.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2f91ec8c
  2. 18 1月, 2013 2 次提交
  3. 17 1月, 2013 23 次提交
  4. 16 1月, 2013 12 次提交