1. 30 Oct, 2011 24 commits
    • Martin Schwidefsky's avatar
      [S390] allow all addressing modes · d4e81b35
      Martin Schwidefsky authored
      The user space program can change its addressing mode between the
      24-bit, 31-bit and the 64-bit mode if the kernel is 64 bit. Currently
      the kernel always forces the standard amode on signal delivery and
      signal return and on ptrace: 64-bit for a 64-bit process, 31-bit for
      a compat process and 31-bit kernels. Change the signal and ptrace code
      to allow the full range of addressing modes. Signal handlers are
      run in the standard addressing mode for the process.
      One caveat is that even an 31-bit compat process can switch to the
      64-bit mode. The next signal will switch back into the 31-bit mode
      and there is no room in the 31-bit compat signal frame to store the
      information that the program came from the 64-bit mode.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] cleanup psw related bits and pieces · b50511e4
      Martin Schwidefsky authored
      Split out addressing mode bits from PSW_BASE_BITS, rename PSW_BASE_BITS
      to PSW_MASK_BASE, get rid of psw_user32_bits, remove unused function
      enabled_wait(), introduce PSW_MASK_USER, and drop PSW_MASK_MERGE macros.
      Change psw_kernel_bits / psw_user_bits to contain only the bits that
      are always set in the respective mode.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] add TIF_SYSCALL thread flag · b6ef5bb3
      Martin Schwidefsky authored
      Add an explicit TIF_SYSCALL bit that indicates if a task is inside
      a system call. The svc_code in the pt_regs structure is now only
      valid if TIF_SYSCALL is set. With this definition TIF_RESTART_SVC
      can be replaced with TIF_SYSCALL. Overall do_signal is a bit more
      readable and it saves a few lines of code.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] addressing mode limits and psw address wrapping · ccf45caf
      Martin Schwidefsky authored
      An instruction with an address right below the adress limit for the
      current addressing mode will wrap. The instruction restart logic in
      the protection fault handler and the signal code need to follow the
      wrapping rules to find the correct instruction address.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] signal race with restarting system calls · 20b40a79
      Martin Schwidefsky authored
      do_signal will prepare the restart of the system call with a rewind of
      the PSW before calling get_signal_to_deliver (where the debugger might
      take control). For A ERESTART_RESTARTBLOCK restarting system call
      do_signal will set -EINTR as return code.
      There are two issues with this approach:
         ERESTART_RESTARTBLOCK as the rewinding already took place or the
         return code has been changed to -EINTR
      2) if get_signal_to_deliver does not return with a signal to deliver
         the restart via the repeat of the svc instruction is left in place.
         This opens a race if another signal is made pending before the
         system call instruction can be reexecuted. The original system call
         will be restarted even if the second signal would have ended the
         system call with -EINTR.
      These two issues can be solved by dropping the early rewind of the
      system call before get_signal_to_deliver has been called and by using
      the TIF_RESTART_SVC magic to do the restart if no signal has to be
      delivered. The only situation where the system call restart via the
      repeat of the svc instruction is appropriate is when a SA_RESTART
      signal is delivered to user space.
      Unfortunately this breaks inferior calls by the debugger again. The
      system call number and the length of the system call instruction is
      lost over the inferior call and user space will see ERESTARTNOHAND/
      new ptrace interface is added to save/restore the system call number
      and system call instruction length.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Hendrik Brueckner's avatar
      [S390] defconfig: switch on CONFIG_DEVTMPFS · 3ee49c8f
      Hendrik Brueckner authored
      Switching on the DEVTMPFS kernel option helpes to maintain a /dev
      file system early in the boot process, especially, in limited
      Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] lowcore cleanup · 0edc8faa
      Martin Schwidefsky authored
      Remove the save_area_64 field from the 0xe00 - 0xf00 area in the lowcore.
      Use a free slot in the save_area array instead.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] Add architecture code for unmapping crashkernel memory · dab7a7b1
      Michael Holzheu authored
      This patch implements the crash_map_pages() function for s390.
      KEXEC_CRASH_MEM_ALIGN is set to HPAGE_SIZE, in order to support
      kernel mappings that use large pages. We also use HPAGE_SIZE alignment
      for CONFIG_HUGETLB_PAGE=n in order to have the same 1 MiB alignment on
      all s390 systems.
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] kdump: Add infrastructure for unmapping crashkernel memory · 558df720
      Michael Holzheu authored
      This patch introduces a mechanism that allows architecture backends to
      remove page tables for the crashkernel memory. This can protect the loaded
      kdump kernel from being overwritten by broken kernel code.  Two new
      functions crash_map_reserved_pages() and crash_unmap_reserved_pages() are
      added that can be implemented by architecture code.  The
      crash_map_reserved_pages() function is called before and
      crash_unmap_reserved_pages() after the crashkernel segments are loaded.  The
      functions are also called in crash_shrink_memory() to create/remove page
      tables when the crashkernel memory size is reduced.
      To support architectures that have large pages this patch also introduces
      a new define KEXEC_CRASH_MEM_ALIGN. The crashkernel start and size must
      always be aligned with KEXEC_CRASH_MEM_ALIGN.
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] Export vmcoreinfo note · d38593f9
      Michael Holzheu authored
      This patch defines for s390 an ABI defined pointer to the vmcoreinfo note at
      a well known address. With this patch tools are able to find this information
      in dumps created by stand-alone or hypervisor dump tools.
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] kdump: Initialize vmcoreinfo note at startup · fa8ff292
      Michael Holzheu authored
      Currently the vmcoreinfo note is only initialized in case of kdump. On s390
      it is possible to create kernel dumps with other dump mechanisms than kdump
      (e.g. via hypervisor dump or stand-alone dump tools). For those dumps it
      would also be desirable to include the vmcoreinfo data. To accomplish this,
      with this patch the vmcoreinfo ELF note is always initialized, not only in
      case of a (kdump) crash. On s390 we will add an ABI defined pointer at
      a well known address to vmcoreinfo so that dump analysis tools are able to
      find this information.
      In particular on s390 we have a tool named zgetdump. With this tool it is
      possible to convert dump formats on the fly using fuse. E.g. you can mount a
      s390 stand-alone dump as ELF dump. When this is done, the tool finds the
      vmcoreinfo in the stand-alone dump via the well known ABI defined address and
      it creates the respective VMCOREINFO ELF note in the output ELF dump. This then
      can be used e.g. by makedumpfile for dump filtering.  No more need for a
      vmlinux file with debug information.
      So this will look like the following:
      $ zgetdump --mount standalone.dump -f elf /mnt
      $ ls /mnt
      $ readelf -n /mnt/dump.elf
      $ ...
        VMCOREINFO            0x00000474      Unknown note type: (0x00000000)
      $ makedumpfile -c -d 31 /mnt/dump.elf dump.kdump
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] kdump backend code · 60a0c68d
      Michael Holzheu authored
      This patch provides the architecture specific part of the s390 kdump
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] Add real memory access functions · 7f0bf656
      Michael Holzheu authored
      Add access function for real memory needed by s390 kdump backend.
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] Force PSW restart on online CPU · 1943f53c
      Michael Holzheu authored
      PSW restart can be triggered on offline CPUs. If this happens, currently
      the PSW restart code fails, because functions like smp_processor_id()
      do not work on offline CPUs. This patch fixes this as follows:
      If PSW restart is triggered on an offline CPU, the PSW restart (sigp restart)
      is done a second time on another CPU that is online and the old CPU is
      stopped afterwards.
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] kdump: Add size to elfcorehdr kernel parameter · d3bf3795
      Michael Holzheu authored
      Currently only the address of the pre-allocated ELF header is passed with
      the elfcorehdr= kernel parameter. In order to reserve memory for the header
      in the 2nd kernel also the size is required. Current kdump architecture
      backends use different methods to do that, e.g. x86 uses the memmap= kernel
      parameter. On s390 there is no easy way to transfer this information.
      Therefore the elfcorehdr kernel parameter is extended to also pass the size.
      This now can also be used as standard mechanism by all future kdump
      architecture backends.
      The syntax of the kernel parameter is extended as follows:
      This change is backward compatible because elfcorehdr=size is still allowed.
      Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
      Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Michael Holzheu's avatar
      [S390] kdump: Add KEXEC_CRASH_CONTROL_MEMORY_LIMIT · 3d214fae
      Michael Holzheu authored
      On s390 there is a different KEXEC_CONTROL_MEMORY_LIMIT for the normal and
      the kdump kexec case. Therefore this patch introduces a new macro
      KEXEC_CONTROL_MEMORY_LIMIT for all architectures that do not define
      Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
      Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Tejun Heo's avatar
      [S390] fix _TIF_SINGLE_STEP definition · 80853a8a
      Tejun Heo authored
      _TIF_SINGLE_STEP is incorrectly defined as 1<<TIF_FREEZE.  Fix it.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Sebastian Ott's avatar
      [S390] cio: add message for timeouts on internal I/O · 75a1c61b
      Sebastian Ott authored
      Print a message in case we do not receive an IRQ in time (for internal
      I/O). Also print the ID of the last used channel path, since it is
      possible that not the device itself but this specific path might have
      a defect.
      Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Jan Glauber's avatar
      [S390] use ENTRY macro for sys_setns_wrapper · 017ec183
      Jan Glauber authored
      Use the ENTRY macro for the system call wrapper sys_setns_wrapper
      similarly to the other wrappers.
      Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] memory leak with RCU_TABLE_FREE · e73b7fff
      Martin Schwidefsky authored
      The rcu page table free code uses a couple of bits in the page table
      pointer passed to tlb_remove_table to discern the different page table
      types. __tlb_remove_table extracts the type with an incorrect mask which
      leads to memory leaks. The correct mask is ((FRAG_MASK << 4) | FRAG_MASK).
      Cc: stable@kernel.org
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] user per registers vs. ptrace single stepping · a45aff52
      Martin Schwidefsky authored
      git commit 5e9a2692 "[S390] ptrace cleanup" introduced a regression
      for the case when both a user PER set (e.g. a storage alteration trace) and
      PTRACE_SINGLESTEP are active. The new code will overrule the user PER set
      with a instruction-fetch PER set over the whole address space for ptrace
      single stepping. The inferior process will be stopped after each instruction
      with an instruction fetch event. Any other events that may have occurred
      concurrently are not reported (e.g. storage alteration event) because the
      control bits for them are not set. The solution is to merge the PER control
      bits of the user PER set with the PER_EVENT_IFETCH control bit for
      Cc: stable@kernel.org
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Sebastian Ott's avatar
      [S390] topology: fix alloc_masks annotation · caa04f69
      Sebastian Ott authored
      Fix this warning:
      WARNING: vmlinux.o(.text+0x199b6): Section mismatch in reference from
      the function alloc_masks() to the function .init.text:__alloc_bootmem()
      Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Martin Schwidefsky's avatar
      [S390] avoid warning in show_cpuinfo · dd4a5a31
      Martin Schwidefsky authored
      The .start function and indirectly the .next function of the show_cpuinfo
      sequential operation uses NR_CPUS as limit instead of nr_cpu_ids.
      This can cause warnings like this:
      WARNING: at /usr/src/linux/include/linux/cpumask.h:107
      Process lscpu (pid: 575, task: 000000007deb4338, ksp: 000000007794f588)
      Krnl PSW : 0704000180000000 0000000000106db4 (show_cpuinfo+0x108/0x234)
                 R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:0 PM:0 EA:3
      Krnl GPRS: 0000000000000003 0000000000791988 000000000071b478 0000000000000004
                 0000000000000001 0000000000000000 000000007d139500 0000000000000400
                 0000000000000000 000000000070e24c 000000007d48d600 0000000000000005
                 000000007d48d600 00000000004dfa10 0000000000106cf8 000000007794fcc0
      Krnl Code: 0000000000106da8: 95001000           cli     0(%r1),0
                 0000000000106dac: a774ffac           brc     7,106d04
                 0000000000106db0: a7f40001           brc     15,106db2
                >0000000000106db4: 92011000           mvi     0(%r1),1
                 0000000000106db8: a7f4ffa6           brc     15,106d04
                 0000000000106dbc: c0e5000065b4       brasl   %r14,113924
                 0000000000106dc2: c09000303a45       larl    %r9,70e24c
                 0000000000106dc8: c020001eefd4       larl    %r2,4e4d70
      Replacing NR_CPUS with nr_cpu_ids fixes it.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
    • Peter Oberparleiter's avatar
      [S390] fix mismatch in summation of I/O IRQ statistics · de400d6b
      Peter Oberparleiter authored
      Current IRQ statistics support does not show detail counts for I/O
      interrupts which are processed internally only. The result is a
      summation count which is way off such as this one:
                 CPU0       CPU1       CPU2
      I/O:       1331        710        442
      QAI:         15         16         16   [I/O] QDIO Adapter Interrupt
      QDI:          1          0          0   [I/O] QDIO Interrupt
      DAS:        706        645        381   [I/O] DASD
      C15:         26         10          0   [I/O] 3215
      C70:          0          0          0   [I/O] 3270
      TAP:          0          0          0   [I/O] Tape
      VMR:          0          0          0   [I/O] Unit Record Devices
      LCS:          0          0          0   [I/O] LCS
      CLW:          0          0          0   [I/O] CLAW
      CTC:          0          0          0   [I/O] CTC
      APB:          0          0          0   [I/O] AP Bus
      Fix this by moving I/O interrupt accounting into the common I/O layer.
      Signed-off-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
  2. 29 Oct, 2011 7 commits
  3. 28 Oct, 2011 9 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ec7ae517
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)
        [SCSI] qla4xxx: export address/port of connection (fix udev disk names)
        [SCSI] ipr: Fix BUG on adapter dump timeout
        [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer
        [SCSI] hpsa: change confusing message to be more clear
        [SCSI] iscsi class: fix vlan configuration
        [SCSI] qla4xxx: fix data alignment and use nl helpers
        [SCSI] iscsi class: fix link local mispelling
        [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA
        [SCSI] aacraid: use lower snprintf() limit
        [SCSI] lpfc 8.3.27: Change driver version to 8.3.27
        [SCSI] lpfc 8.3.27: T10 additions for SLI4
        [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery
        [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name
        [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout
        [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes
        [SCSI] megaraid_sas: Changelog and version update
        [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic
        [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support
        [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers
        [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client · 97d2eb13
      Linus Torvalds authored
      * 'for-linus' of git://ceph.newdream.net/git/ceph-client:
        libceph: fix double-free of page vector
        ceph: fix 32-bit ino numbers
        libceph: force resend of osd requests if we skip an osdmap
        ceph: use kernel DNS resolver
        ceph: fix ceph_monc_init memory leak
        ceph: let the set_layout ioctl set single traits
        Revert "ceph: don't truncate dirty pages in invalidate work thread"
        ceph: replace leading spaces with tabs
        libceph: warn on msg allocation failures
        libceph: don't complain on msgpool alloc failures
        libceph: always preallocate mon connection
        libceph: create messenger with client
        ceph: document ioctls
        ceph: implement (optional) max read size
        ceph: rename rsize -> rasize
        ceph: make readpages fully async
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 68d99b2c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
        ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
        ALSA: hda - Keep EAPD turned on for old Conexant chips
        ALSA: hda/realtek - Fix missing volume controls with ALC260
        ASoC: wm8940: Properly set codec->dapm.bias_level
        ALSA: hda - Fix pin-config for ASUS W90V
        ALSA: hda - Fix surround/CLFE headphone and speaker pins order
        ALSA: hda - Fix typo
        ALSA: Update the sound git tree URL
        ALSA: HDA: Add new revision for ALC662
        ASoC: max98095: Convert codec->hw_write to snd_soc_write
        ASoC: keep pointer to resource so it can be freed
        ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
        ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
        ASoC: da7210: Add support for line out and DAC
        ASoC: da7210: Add support for DAPM
        ALSA: hda/realtek - Fix DAC assignments of multiple speakers
        ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
        ASoC: Set sgtl5000->ldo in ldo_regulator_register
        ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
        ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
    • Linus Torvalds's avatar
      Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci · 0e59e7e7
      Linus Torvalds authored
      * 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
        PCI: Clean-up MPS debug output
        pci: Clamp pcie_set_readrq() when using "performance" settings
        PCI: enable MPS "performance" setting to properly handle bridge MPS
        PCI: Workaround for Intel MPS errata
        PCI: Add support for PASID capability
        PCI: Add implementation for PRI capability
        PCI: Export ATS functions to modules
        PCI: Move ATS implementation into own file
        PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
        PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
        PCI / PM: Extend PME polling to all PCI devices
        PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
        PCI: Make pci_setup_bridge() non-static for use by arch code
        x86: constify PCI raw ops structures
        PCI: Add quirk for known incorrect MPSS
        PCI: Add Solarflare vendor ID and SFC4000 device IDs
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 46b51ea2
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (83 commits)
        mmc: fix compile error when CONFIG_BLOCK is not enabled
        mmc: core: Cleanup eMMC4.5 conditionals
        mmc: omap_hsmmc: if multiblock reads are broken, disable them
        mmc: core: add workaround for controllers with broken multiblock reads
        mmc: core: Prevent too long response times for suspend
        mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00
        mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode
        mmc: core: support HPI send command
        mmc: core: Add cache control for eMMC4.5 device
        mmc: core: Modify the timeout value for writing power class
        mmc: core: new discard feature support at eMMC v4.5
        mmc: core: mmc sanitize feature support for v4.5
        mmc: dw_mmc: modify DATA register offset
        mmc: sdhci-pci: add flag for devices that can support runtime PM
        mmc: omap_hsmmc: ensure pbias configuration is always done
        mmc: core: Add Power Off Notify Feature eMMC 4.5
        mmc: sdhci-s3c: fix potential NULL dereference
        mmc: replace printk with appropriate display macro
        mmc: core: Add default timeout value for CMD6
        mmc: sdhci-pci: add runtime pm support
    • Linus Torvalds's avatar
      Merge branch 'devel-stable' of... · 1fdb24e9
      Linus Torvalds authored
      Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
      * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
        ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
        ARM: gic, local timers: use the request_percpu_irq() interface
        ARM: gic: consolidate PPI handling
        ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
        ARM: mach-s5p64x0: remove mach/memory.h
        ARM: mach-s3c64xx: remove mach/memory.h
        ARM: plat-mxc: remove mach/memory.h
        ARM: mach-prima2: remove mach/memory.h
        ARM: mach-zynq: remove mach/memory.h
        ARM: mach-bcmring: remove mach/memory.h
        ARM: mach-davinci: remove mach/memory.h
        ARM: mach-pxa: remove mach/memory.h
        ARM: mach-ixp4xx: remove mach/memory.h
        ARM: mach-h720x: remove mach/memory.h
        ARM: mach-vt8500: remove mach/memory.h
        ARM: mach-s5pc100: remove mach/memory.h
        ARM: mach-tegra: remove mach/memory.h
        ARM: plat-tcc: remove mach/memory.h
        ARM: mach-mmp: remove mach/memory.h
        ARM: mach-cns3xxx: remove mach/memory.h
      Fix up mostly pretty trivial conflicts in:
       - arch/arm/Kconfig
       - arch/arm/include/asm/localtimer.h
       - arch/arm/kernel/Makefile
       - arch/arm/mach-shmobile/board-ap4evb.c
       - arch/arm/mach-u300/core.c
       - arch/arm/mm/dma-mapping.c
       - arch/arm/mm/proc-v7.S
       - arch/arm/plat-omap/Kconfig
      largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
      CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
      addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue · f362f98e
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue: (21 commits)
        leases: fix write-open/read-lease race
        nfs: drop unnecessary locking in llseek
        ext4: replace cut'n'pasted llseek code with generic_file_llseek_size
        vfs: add generic_file_llseek_size
        vfs: do (nearly) lockless generic_file_llseek
        direct-io: merge direct_io_walker into __blockdev_direct_IO
        direct-io: inline the complete submission path
        direct-io: separate map_bh from dio
        direct-io: use a slab cache for struct dio
        direct-io: rearrange fields in dio/dio_submit to avoid holes
        direct-io: fix a wrong comment
        direct-io: separate fields only used in the submission path from struct dio
        vfs: fix spinning prevention in prune_icache_sb
        vfs: add a comment to inode_permission()
        vfs: pass all mask flags check_acl and posix_acl_permission
        vfs: add hex format for MAY_* flag values
        vfs: indicate that the permission functions take all the MAY_* flags
        compat: sync compat_stats with statfs.
        vfs: add "device" tag to /proc/self/mountstats
        cleanup: vfs: small comment fix for block_invalidatepage
      Fix up trivial conflict in fs/gfs2/file.c (llseek changes)
    • Linus Torvalds's avatar
      Merge http://sucs.org/~rohan/git/gfs2-3.0-nmw · f793f296
      Linus Torvalds authored
      * http://sucs.org/~rohan/git/gfs2-3.0-nmw: (24 commits)
        GFS2: Move readahead of metadata during deallocation into its own function
        GFS2: Remove two unused variables
        GFS2: Misc fixes
        GFS2: rewrite fallocate code to write blocks directly
        GFS2: speed up delete/unlink performance for large files
        GFS2: Fix off-by-one in gfs2_blk2rgrpd
        GFS2: Clean up ->page_mkwrite
        GFS2: Correctly set goal block after allocation
        GFS2: Fix AIL flush issue during fsync
        GFS2: Use cached rgrp in gfs2_rlist_add()
        GFS2: Call do_strip() directly from recursive_scan()
        GFS2: Remove obsolete assert
        GFS2: Cache the most recently used resource group in the inode
        GFS2: Make resource groups "append only" during life of fs
        GFS2: Use rbtree for resource groups and clean up bitmap buffer ref count scheme
        GFS2: Fix lseek after SEEK_DATA, SEEK_HOLE have been added
        GFS2: Clean up gfs2_create
        GFS2: Use ->dirty_inode()
        GFS2: Fix bug trap and journaled data fsync
        GFS2: Fix inode allocation error path
    • Linus Torvalds's avatar
      Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6 · dabcbb1b
      Linus Torvalds authored
      * '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6: (52 commits)
        Fix build break when freezer not configured
        Add definition for share encryption
        CIFS: Make cifs_push_locks send as many locks at once as possible
        CIFS: Send as many mandatory unlock ranges at once as possible
        CIFS: Implement caching mechanism for posix brlocks
        CIFS: Implement caching mechanism for mandatory brlocks
        CIFS: Fix DFS handling in cifs_get_file_info
        CIFS: Fix error handling in cifs_readv_complete
        [CIFS] Fixup trivial checkpatch warning
        [CIFS] Show nostrictsync and noperm mount options in /proc/mounts
        cifs, freezer: add wait_event_freezekillable and have cifs use it
        cifs: allow cifs_max_pending to be readable under /sys/module/cifs/parameters
        cifs: tune bdi.ra_pages in accordance with the rsize
        cifs: allow for larger rsize= options and change defaults
        cifs: convert cifs_readpages to use async reads
        cifs: add cifs_async_readv
        cifs: fix protocol definition for READ_RSP
        cifs: add a callback function to receive the rest of the frame
        cifs: break out 3rd receive phase into separate function
        cifs: find mid earlier in receive codepath