1. 18 Jan, 2012 11 commits
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6a488979
      Linus Torvalds authored
      ARM: fixes for ARM platforms
      
      Some fallout from the 3.3. merge window as well as a couple bug fixes
      for older preexisting bugs that seem valid to include at this time:
      
      * sched_clock changes broke picoxcell, fix included
      * BSYM bugs causing issues with thumb2-built kernels on SMP
      * Missing module.h include on msm.
      * A collection of bugfixes for samsung platforms that didn't make it into
        the first pull requests.
      
      * tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: make BSYM macro assembly only
        ARM: highbank: remove incorrect BSYM usage
        ARM: imx: remove incorrect BSYM usage
        ARM: exynos: remove incorrect BSYM usage
        ARM: ux500: add missing ENDPROC to headsmp.S
        ARM: msm: Add missing ENDPROC to headsmp.S
        ARM: versatile: Add missing ENDPROC to headsmp.S
        ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN
        ARM: S3C64XX: Fix interrupt configuration for PCA935x on Cragganmore
        ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
        ARM: S3C64XX: Remove hsmmc1 from Cragganmore
        ARM: S3C64XX: Remove unconditional power domain disables
        ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h
        ARM: SAMSUNG: dma-ops.h needs mach/dma.h
        ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
        ARM: picoxcell: fix sched_clock() cleanup fallout
        ARM: msm: vreg is a module and so needs module.h
      6a488979
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · 57f2685c
      Linus Torvalds authored
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
        ARM: mach-shmobile: specify CHCLR registers on SH7372
        dma: shdma: fix runtime PM: clear channel buffers on reset
        dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
        dmaengine/ste_dma40: clear LNK on channel startup
        dmaengine: intel_mid_dma: remove legacy pm interface
        ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
        dmaengine: intel_mid_dma: error path fix
        dmaengine: intel_mid_dma: locking and freeing fixes
        mtd: gpmi-nand: move to dma_transfer_direction
        mtd: fix compile error for gpmi-nand
        mmc: mxs-mmc: fix the dma_transfer_direction migration
        dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
        dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
        dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
        dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
        dma: mxs-dma: fix a typo in comment
        DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
        video i.MX IPU: Fix display connections
        i.MX IPU DMA: Fix wrong burstsize settings
        dmaengine/ste_dma40: allow fixed physical channel
        ...
      
      Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}
      
      The conflicts looked pretty trivial, but I'll ask people to verify them.
      57f2685c
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev · 488a9d01
      Linus Torvalds authored
      * 'upstream-linus' of git://github.com/jgarzik/libata-dev:
        [libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list due to broken suspend functionality.
        [libata] add DVRTD08A and DVR-215 to NOSETXFER device quirk list
        [libata] pata_bf54x: Support sg list in bmdma transfer.
        [libata] sata_fsl: fix the controller operating mode
        [libata] enable ata port async suspend
      488a9d01
    • Al Viro's avatar
      x86-32: Fix build failure with AUDIT=y, AUDITSYSCALL=n · 6015ff10
      Al Viro authored
      JONGMAN HEO reports:
      
        With current linus git (commit a25a2b84), I got following build error,
      
        arch/x86/kernel/vm86_32.c: In function 'do_sys_vm86':
        arch/x86/kernel/vm86_32.c:340: error: implicit declaration of function '__audit_syscall_exit'
        make[3]: *** [arch/x86/kernel/vm86_32.o] Error 1
      
      OK, I can reproduce it (32bit allmodconfig with AUDIT=y, AUDITSYSCALL=n)
      
      It's due to commit d7e7528b: "Audit: push audit success and retcode
      into arch ptrace.h".
      Reported-by: default avatarJONGMAN HEO <jongman.heo@samsung.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6015ff10
    • Benjamin Larsson's avatar
      [libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list · b73fa463
      Benjamin Larsson authored
      due to broken suspend functionality.
      Signed-off-by: default avatarBenjamin Larsson <benjamin@southpole.se>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      b73fa463
    • Vladimir LAVALLADE's avatar
    • Sonic Zhang's avatar
      [libata] pata_bf54x: Support sg list in bmdma transfer. · 81b0287d
      Sonic Zhang authored
      BF54x on-chip ATAPI controller allows maximum 0x1fffe bytes to be transfered
      in one ATAPI transfer. So, set the max sg_tablesize to 4.
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      81b0287d
    • Jerry Huang's avatar
      [libata] sata_fsl: fix the controller operating mode · 93272b13
      Jerry Huang authored
      Configure the FSL SATA controller to the preferred, enterprise mode.
      Signed-off-by: default avatarYutaka Ando <r46913@freescale.com>
      Signed-off-by: default avatarJerry Huang <Chang-Ming.Huang@freescale.com>
      CC: Jeff Garzik <jgarzik@pobox.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      93272b13
    • Lin Ming's avatar
      [libata] enable ata port async suspend · 966f1212
      Lin Ming authored
      This saves devices suspend/resume time.
      
      Tested system suspend/resume with SATA IDE/AHCI mode 3 times.
      Below is the time took for devices suspend/resume.
      
      SATA mode    vanilla-kernel           patched-kernel
      ---------    ---------------------    ---------------------
      IDE          suspend: 0.744           suspend: 0.432
                   (0.716, 0.768, 0.748)    (0.440, 0.428, 0.428)
      
                   resume: 5.084            resume: 2.209
                   (5.100, 5.064, 5.088)    (2.168, 2.232, 2.228)
      
      AHCI:        suspend: 0.725           suspend: 0.449
                   (0.740, 0.708, 0.728)    (0.456, 0.448, 0.444)
      
                   resume: 2.556            resume: 1.896
                   (2.604, 2.492, 2.572)    (1.932, 1.872, 1.884)
      Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      966f1212
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · a25a2b84
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        integrity: digital signature config option name change
        lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts
        lib: MPILIB Kconfig description update
        lib: digital signature dependency fix
        lib: digital signature config option name change
        encrypted-keys: fix rcu and sparse messages
        keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages
        KEYS: Add missing smp_rmb() primitives to the keyring search code
        TOMOYO: Accept \000 as a valid character.
        security: update MAINTAINERS file with new git repo
      a25a2b84
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit · f429ee3b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)
        audit: no leading space in audit_log_d_path prefix
        audit: treat s_id as an untrusted string
        audit: fix signedness bug in audit_log_execve_info()
        audit: comparison on interprocess fields
        audit: implement all object interfield comparisons
        audit: allow interfield comparison between gid and ogid
        audit: complex interfield comparison helper
        audit: allow interfield comparison in audit rules
        Kernel: Audit Support For The ARM Platform
        audit: do not call audit_getname on error
        audit: only allow tasks to set their loginuid if it is -1
        audit: remove task argument to audit_set_loginuid
        audit: allow audit matching on inode gid
        audit: allow matching on obj_uid
        audit: remove audit_finish_fork as it can't be called
        audit: reject entry,always rules
        audit: inline audit_free to simplify the look of generic code
        audit: drop audit_set_macxattr as it doesn't do anything
        audit: inline checks for not needing to collect aux records
        audit: drop some potentially inadvisable likely notations
        ...
      
      Use evil merge to fix up grammar mistakes in Kconfig file.
      
      Bad speling and horrible grammar (and copious swearing) is to be
      expected, but let's keep it to commit messages and comments, rather than
      expose it to users in config help texts or printouts.
      f429ee3b
  2. 17 Jan, 2012 29 commits