1. 26 Jul, 2010 29 commits
  2. 25 Jul, 2010 2 commits
  3. 23 Jul, 2010 9 commits
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 86c65a78
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)
        powerpc: Fix erroneous lmb->memblock conversions
        powerpc/mm: Add some debug output when hash insertion fails
        powerpc/mm: Fix bugs in huge page hashing
        powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
        powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge
        powerpc/kexec: Fix boundary case for book-e kexec memory limits
    • Linus Torvalds's avatar
      Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 20a52d4f
      Linus Torvalds authored
      * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        nconfig: Fix segfault when help contains special characters
        kbuild: Fix make rpm
        kbuild: Make the setlocalversion script POSIX-compliant
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · 339a2afc
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf tools: Fix fallback to cplus_demangle() when bfd_demangle() is not available
        perf annotate: Fix handling of goto labels that are valid hex numbers
        tracing: Properly align linker defined symbols
        perf symbols: Fix directory descriptor leaking
        perf: Fix various display bugs with parent filtering
    • Stephen Boyd's avatar
      nconfig: Fix segfault when help contains special characters · 58f915a3
      Stephen Boyd authored
      nconfig segfaults when help text contains the character '%'. For a quick
      example, navigate to the kernel compression options and get the help for
      bzip2. Doing so triggers a call to mvwprintw() with a string containing
      '%' and no extra arguments to fill in the specifier's value. Fix this
      case by printing the literal string retrieved from the kconfig.
       #0  0x00002b52b6b11d83 in vfprintf () from /lib/libc.so.6
       #1  0x00002b52b6bad010 in __vsnprintf_chk () from /lib/libc.so.6
       #2  0x00002b52b623991b in _nc_printf_string () from
       #3  0x00002b52b6234cff in vwprintw () from /lib/libncursesw.so.5
       #4  0x00002b52b6234db9 in mvwprintw () from /lib/libncursesw.so.5
       #5  0x00000000004151d8 in fill_window (win=0x21b64c0,
           text=0x21b62b0 "CONFIG_KERNEL_BZIP2:\n\nIts compression ratio and
           speed is intermediate.\nDecompression speed is slowest among the
           three.  The kernel\nsize is about 10% smaller with bzip2, in
           comparison to gzip.\nBzip2 us"...)
           at scripts/kconfig/nconf.gui.c:229
       #6  0x0000000000416335 in show_scroll_win (main_window=0x21a5630,
               title=0x157fa30 "Bzip2",
       	    text=0x21b62b0 "CONFIG_KERNEL_BZIP2:\n\nIts compression
       	    ratio and speed is intermediate.\nDecompression speed is
       	    slowest among the three.  The kernel\nsize is about 10%
       	    smaller with bzip2, in comparison to gzip.\nBzip2 us"...)
           at scripts/kconfig/nconf.gui.c:535
       #7  0x00000000004055b2 in show_help (menu=0x157f9d0)
               at scripts/kconfig/nconf.c:1257
       #8  0x0000000000405897 in conf_choice (menu=0x157f130)
       	    at scripts/kconfig/nconf.c:1321
       #9  0x0000000000405326 in conf (menu=0x157d130) at
       #10 0x00000000004052e8 in conf (menu=0xb434a0) at
       #11 0x0000000000406092 in main (ac=2, av=0x7fff96a93c38)
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Nir Tzachar <nir.tzachar@gmail.com>
      Signed-off-by: default avatarStephen Boyd <bebarino@gmail.com>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
    • Avi Kivity's avatar
      KVM: Use kmalloc() instead of vmalloc() for KVM_[GS]ET_MSR · 7a73c028
      Avi Kivity authored
      We don't need more than a page, and vmalloc() is slower (much
      slower recently due to a regression).
      Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
    • Xiao Guangrong's avatar
      KVM: MMU: fix conflict access permissions in direct sp · 6aa0b9de
      Xiao Guangrong authored
      In no-direct mapping, we mark sp is 'direct' when we mapping the
      guest's larger page, but its access is encoded form upper page-struct
      entire not include the last mapping, it will cause access conflict.
      For example, have this mapping:
            / PDE1 -> |---|
        P[W]          |   | LPA
            \ PDE2 -> |---|
      P have two children, PDE1 and PDE2, both PDE1 and PDE2 mapping the
      same lage page(LPA). The P's access is WR, PDE1's access is WR,
      PDE2's access is RO(just consider read-write permissions here)
      When guest access PDE1, we will create a direct sp for LPA, the sp's
      access is from P, is W, then we will mark the ptes is W in this sp.
      Then, guest access PDE2, we will find LPA's shadow page, is the same as
      PDE's, and mark the ptes is RO.
      So, if guest access PDE1, the incorrect #PF is occured.
      Fixed by encode the last mapping access into direct shadow page
      Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
      Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
      Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
    • Benjamin Herrenschmidt's avatar
    • Sam Ravnborg's avatar
      vmlinux.lds: fix .data..init_task output section (fix popwerpc boot) · da5e37ef
      Sam Ravnborg authored
      The .data..init_task output section was missing
      a load offset causing a popwerpc target to fail to boot.
      Sean MacLennan tracked it down to the definition of
      There are only two users of INIT_TASK_DATA_SECTION()
      in the kernel today: cris and popwerpc.
      cris do not support relocatable kernels and is thus not
      impacted by this change.
      Fix INIT_TASK_DATA_SECTION() to specify load offset like
      all other output sections.
      Reported-by: default avatarSean MacLennan <smaclennan@pikatech.com>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
    • Benjamin Herrenschmidt's avatar
      powerpc: Fix erroneous lmb->memblock conversions · 3fdfd990
      Benjamin Herrenschmidt authored
      Oooops... we missed these. We incorrectly converted strings
      used when parsing the device-tree on pseries, thus breaking
      access to drconf memory and hotplug memory.
      While at it, also revert some variable names that represent
      something the FW calls "lmb" and thus don't need to be converted
      to "memblock".
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>