1. 08 Jun, 2011 10 commits
  2. 07 Jun, 2011 2 commits
  3. 06 Jun, 2011 11 commits
    • Martin Schwidefsky's avatar
      [S390] fix kvm defines for 31 bit compile · 6c61cfe9
      Martin Schwidefsky authored
      KVM is not available for 31 bit but the KVM defines cause warnings:
      arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_dirty':
      arch/s390/include/asm/pgtable.h:817: warning: integer constant is too large for 'unsigned long' type
      arch/s390/include/asm/pgtable.h:818: warning: integer constant is too large for 'unsigned long' type
      arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_young':
      arch/s390/include/asm/pgtable.h:837: warning: integer constant is too large for 'unsigned long' type
      arch/s390/include/asm/pgtable.h:838: warning: integer constant is too large for 'unsigned long' type
      Add 31 bit versions of the KVM defines to remove the warnings.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] use generic RCU page-table freeing code · 36409f63
      Martin Schwidefsky authored
      Replace the s390 specific rcu page-table freeing code with the
      generic variant. This requires to duplicate the definition for the
      struct mmu_table_batch as s390 does not use the generic tlb flush
      While we are at it remove the restriction that page table fragments
      can not be reused after a single fragment has been freed with rcu
      and split out allocation and freeing of page tables with pgstes.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Jan Glauber's avatar
      [S390] qdio: Split SBAL entry flags · 3ec90878
      Jan Glauber authored
      The qdio SBAL entry flag is made-up of four different values that are
      independent of one another. Some of the bits are reserved by the
      hardware and should not be changed by qdio. Currently all four values
      are overwritten since the SBAL entry flag is defined as an u32.
      Split the SBAL entry flag into four u8's as defined by the hardware
      and don't touch the reserved bits.
      Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Christian Borntraeger's avatar
      [S390] kvm-s390: fix stfle facilities numbers >=64 · 9950f8be
      Christian Borntraeger authored
      Currently KVM masks out the known good facilities only for the first
      double word, but passed the 2nd double word without filtering. This
      breaks some code on newer systems:
      [    0.593966] ------------[ cut here ]------------
      [    0.594086] WARNING: at arch/s390/oprofile/hwsampler.c:696
      [    0.594213] Modules linked in:
      [    0.594321] Modules linked in:
      [    0.594439] CPU: 0 Not tainted 3.0.0-rc1 #46
      [    0.594564] Process swapper (pid: 1, task: 00000001effa8038, ksp: 00000001effafab8)
      [    0.594735] Krnl PSW : 0704100180000000 00000000004ab89a (hwsampler_setup+0x75a/0x7b8)
      [    0.594910]            R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3
      [    0.595120] Krnl GPRS: ffffffff00000000 00000000ffffffea ffffffffffffffea 00000000004a98f8
      [    0.595351]            00000000004aa002 0000000000000001 000000000080e720 000000000088b9f8
      [    0.595522]            000000000080d3e8 0000000000000000 0000000000000000 000000000080e464
      [    0.595725]            0000000000000000 00000000005db198 00000000004ab3a2 00000001effafd98
      [    0.595901] Krnl Code: 00000000004ab88c: c0e5000673ca        brasl   %r14,57a020
      [    0.596071]            00000000004ab892: a7f4fc77            brc     15,4ab180
      [    0.596276]            00000000004ab896: a7f40001            brc     15,4ab898
      [    0.596454]           >00000000004ab89a: a7c8ffa1            lhi     %r12,-95
      [    0.596657]            00000000004ab89e: a7f4fc71            brc     15,4ab180
      [    0.596854]            00000000004ab8a2: a7f40001            brc     15,4ab8a4
      [    0.597029]            00000000004ab8a6: a7f4ff22            brc     15,4ab6ea
      [    0.597230]            00000000004ab8aa: c0200011009a        larl    %r2,6cb9de
      [    0.597441] Call Trace:
      [    0.597511] ([<00000000004ab3a2>] hwsampler_setup+0x262/0x7b8)
      [    0.597676]  [<0000000000875812>] oprofile_arch_init+0x32/0xd0
      [    0.597834]  [<0000000000875788>] oprofile_init+0x28/0x74
      [    0.597991]  [<00000000001001be>] do_one_initcall+0x3a/0x170
      [    0.598151]  [<000000000084fa22>] kernel_init+0x142/0x1ec
      [    0.598314]  [<000000000057db16>] kernel_thread_starter+0x6/0xc
      [    0.598468]  [<000000000057db10>] kernel_thread_starter+0x0/0xc
      [    0.598606] Last Breaking-Event-Address:
      [    0.598707]  [<00000000004ab896>] hwsampler_setup+0x756/0x7b8
      [    0.598863] ---[ end trace ce3179037f4e3e5b ]---
      So lets also mask the 2nd double word. Facilites 66,76,76,77 should be fine.
      Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Christian Borntraeger's avatar
      [S390] kvm-s390: Fix host crash on misbehaving guests · a578b37c
      Christian Borntraeger authored
      commit 9ff4cfb3 ([S390] kvm-390: Let
      kernel exit SIE instruction on work) fixed a problem of commit
      commit cd3b70f5 ([S390] virtualization
      aware cpu measurement) but uncovered another one.
      If a kvm guest accesses guest real memory that doesnt exist, the
      page fault handler calls the sie hook, which then rewrites
      the return psw from sie_inst to either sie_exit or sie_reenter.
      On return, the page fault handler will then detect the wrong access
      as a kernel fault causing a kernel oops in sie_reenter or sie_exit.
      We have to add these two addresses to the exception  table to allow
      graceful exits.
      Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Bruno Prémont's avatar
      video: Fix use-after-free by vga16fb on rmmod · a50d28de
      Bruno Prémont authored
      Since fb_info is now refcounted and thus may get freed at any time it
      gets unregistered module unloading will try to unregister framebuffer
      as stored in platform data on probe though this pointer may
      be stale.
      Cleanup platform data on framebuffer release.
      CC: stable@kernel.org
      Signed-off-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
    • Linus Torvalds's avatar
      Linux 3.0-rc2 · 59c5f46f
      Linus Torvalds authored
    • Hugh Dickins's avatar
      mm: fix ENOSPC returned by handle_mm_fault() · e0dcd8a0
      Hugh Dickins authored
      Al Viro observes that in the hugetlb case, handle_mm_fault() may return
      a value of the kind ENOSPC when its caller is expecting a value of the
      kind VM_FAULT_SIGBUS: fix alloc_huge_page()'s failure returns.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 0d6925d4
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: usb - turn off de-emphasis in s/pdif for cm6206
        ALSA: asihpi: Use angle brackets for system includes
        ALSA: fm801: add error handling if auto-detect fails
        ALSA: hda - Check pin support EAPD in ad198x_power_eapd_write
        ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd()
        ALSA: 6fire: Don't leak firmware in error path
        ASoC: Fix wm_hubs input PGA ZC bits
        ASoC: Fix dapm_is_shared_kcontrol so everything isn't shared
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · c12f667e
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
        hwmon: (max6642): Better chip detection schema
        hwmon: (coretemp) Further relax temperature range checks
        hwmon: (coretemp) Fix TjMax detection for older CPUs
        hwmon: (coretemp) Relax target temperature range check
        hwmon: (max6642) Rename temp_fault sysfs attribute to temp2_fault
    • Takashi Iwai's avatar
      Merge branch 'fix/asoc' into for-linus · 3190dad9
      Takashi Iwai authored
  4. 04 Jun, 2011 17 commits