Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Jan 10, 2012
  1. @pershoot @rmcc
Commits on Dec 22, 2011
  1. @rmcc
Commits on Jan 14, 2011
  1. Merge commit 'M76XXTSNCJNLYA6110' into 7x27_common-2.6.35

    junyeong.han committed
Commits on Dec 16, 2010
  1. Merge commit 'v2.6.35.10' into 7x27_common-2.6.35

    Munyoung Hwang committed
    Change-Id: I7b17bb0975d8b888f6005863ee51af287fa70327
  2. Merge commit 'v2.6.35.9' into 7x27_common-2.6.35

    Munyoung Hwang committed
    Change-Id: Ie1e611f12dae81a43384628c619cd071cc4bb8c4
Commits on Dec 14, 2010
  1. @torvalds

    Un-inline get_pipe_info() helper function

    torvalds committed with Andi Kleen
    commit 7208364 upstream.
    This avoids some include-file hell, and the function isn't really
    important enough to be inlined anyway.
    Reported-by: Ingo Molnar <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  2. @torvalds

    Export 'get_pipe_info()' to other users

    torvalds committed with Andi Kleen
    commit c66fb34 upstream.
    And in particular, use it in 'pipe_fcntl()'.
    The other pipe functions do not need to use the 'careful' version, since
    they are only ever called for things that are already known to be pipes.
    The normal read/write/ioctl functions are called through the file
    operations structures, so if a file isn't a pipe, they'd never get
    called.  But pipe_fcntl() is special, and called directly from the
    generic fcntl code, and needs to use the same careful function that the
    splice code is using.
    Cc: Jens Axboe <>
    Cc: Andrew Morton <>
    Cc: Al Viro <>
    Cc: Dave Jones <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  3. @torvalds

    Rename 'pipe_info()' to 'get_pipe_info()'

    torvalds committed with Andi Kleen
    commit 71993e6 upstream.
    .. and change it to take the 'file' pointer instead of an inode, since
    that's what all users want anyway.
    The renaming is preparatory to exporting it to other users.  The old
    'pipe_info()' name was too generic and is already used elsewhere, so
    before making the function public we need to use a more specific name.
    Cc: Jens Axboe <>
    Cc: Andrew Morton <>
    Cc: Al Viro <>
    Cc: Dave Jones <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  4. cifs: fix another memleak, in cifs_root_iget

    Oskar Schirmer committed with Andi Kleen
    commit a7851ce upstream.
    cifs_root_iget allocates full_path through
    cifs_build_path_to_root, but fails to kfree it upon
    cifs_get_inode_info* failure.
    Make all failure exit paths traverse clean up
    handling at the end of the function.
    Signed-off-by: Oskar Schirmer <>
    Signed-off-by: Andi Kleen <>
    Reviewed-by: Jesper Juhl <>
    Signed-off-by: Steve French <>
    Signed-off-by: Greg Kroah-Hartman <>
  5. fuse: fix attributes after open(O_TRUNC)

    Ken Sumrall committed with Andi Kleen
    commit a0822c5 upstream.
    The attribute cache for a file was not being cleared when a file is opened
    with O_TRUNC.
    If the filesystem's open operation truncates the file ("atomic_o_trunc"
    feature flag is set) then the kernel should invalidate the cached st_mtime
    and st_ctime attributes.
    Also i_size should be explicitly be set to zero as it is used sometimes
    without refreshing the cache.
    Signed-off-by: Ken Sumrall <>
    Cc: Anfei <>
    Cc: "Anand V. Avati" <>
    Signed-off-by: Miklos Szeredi <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  6. @utrace

    exec: copy-and-paste the fixes into compat_do_execve() paths

    utrace committed with Andi Kleen
    commit 114279b upstream.
    Note: this patch targets 2.6.37 and tries to be as simple as possible.
    That is why it adds more copy-and-paste horror into fs/compat.c and
    uglifies fs/exec.c, this will be cleanuped later.
    compat_copy_strings() plays with bprm->vma/mm directly and thus has
    two problems: it lacks the RLIMIT_STACK check and argv/envp memory
    is not visible to oom killer.
    Export acct_arg_size() and get_arg_page(), change compat_copy_strings()
    to use get_arg_page(), change compat_do_execve() to do acct_arg_size(0)
    as do_execve() does.
    Add the fatal_signal_pending/cond_resched checks into compat_count() and
    compat_copy_strings(), this matches the code in fs/exec.c and certainly
    makes sense.
    Signed-off-by: Oleg Nesterov <>
    Cc: KOSAKI Motohiro <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  7. @utrace

    exec: make argv/envp memory visible to oom-killer

    utrace committed with Andi Kleen
    commit 3c77f84 upstream.
    Brad Spengler published a local memory-allocation DoS that
    evades the OOM-killer (though not the virtual memory RLIMIT):
    execve()->copy_strings() can allocate a lot of memory, but
    this is not visible to oom-killer, nobody can see the nascent
    bprm->mm and take it into account.
    With this patch get_arg_page() increments current's MM_ANONPAGES
    counter every time we allocate the new page for argv/envp. When
    do_execve() succeds or fails, we change this counter back.
    Technically this is not 100% correct, we can't know if the new
    page is swapped out and turn MM_ANONPAGES into MM_SWAPENTS, but
    I don't think this really matters and everything becomes correct
    once exec changes ->mm or fails.
    Compared to upstream:
    	before 2.6.36 kernel, oom-killer's badness() takes
    	mm->total_vm into account and nothing else. So
    	acct_arg_size() has to play with this counter too.
    Reported-by: Brad Spengler <>
    Signed-off-by: Andi Kleen <>
    Reviewed-and-discussed-by: KOSAKI Motohiro <>
    Signed-off-by: Oleg Nesterov <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
  8. bio: take care not overflow page count when mapping/copying user data

    Jens Axboe committed with Andi Kleen
    commit cb4644c upstream.
    If the iovec is being set up in a way that causes uaddr + PAGE_SIZE
    to overflow, we could end up attempting to map a huge number of
    pages. Check for this invalid input type.
    Reported-by: Dan Rosenberg <>
    Signed-off-by: Jens Axboe <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  9. ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()

    Roberto Sassu committed with Andi Kleen
    commit 48b512e upstream.
    Ecryptfs is a stackable filesystem which relies on lower filesystems the
    ability of setting/getting extended attributes.
    If there is a security module enabled on the system it updates the
    'security' field of inodes according to the owned extended attribute set
    with the function vfs_setxattr().  When this function is performed on a
    ecryptfs filesystem the 'security' field is not updated for the lower
    filesystem since the call security_inode_post_setxattr() is missing for
    the lower inode.
    Further, the call security_inode_setxattr() is missing for the lower inode,
    leading to policy violations in the security module because specific
    checks for this hook are not performed (i. e. filesystem
    'associate' permission on SELinux is not checked for the lower filesystem).
    This patch replaces the call of the setxattr() method of the lower inode
    in the function ecryptfs_setxattr() with vfs_setxattr().
    Signed-off-by: Roberto Sassu <>
    Cc: Dustin Kirkland <>
    Acked-by: James Morris <>
    Signed-off-by: Tyler Hicks <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  10. eCryptfs: Clear LOOKUP_OPEN flag when creating lower file

    Tyler Hicks committed with Andi Kleen
    commit 2e21b3f upstream.
    eCryptfs was passing the LOOKUP_OPEN flag through to the lower file
    system, even though ecryptfs_create() doesn't support the flag. A valid
    filp for the lower filesystem could be returned in the nameidata if the
    lower file system's create() function supported LOOKUP_OPEN, possibly
    resulting in unencrypted writes to the lower file.
    However, this is only a potential problem in filesystems (FUSE, NFS,
    CIFS, CEPH, 9p) that eCryptfs isn't known to support today.
    Reported-by: Kevin Buhr
    Signed-off-by: Tyler Hicks <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  11. @fweisbec

    reiserfs: don't acquire lock recursively in reiserfs_acl_chmod

    fweisbec committed with Andi Kleen
    commit 238af87 upstream.
    reiserfs_acl_chmod() can be called by reiserfs_set_attr() and then take
    the reiserfs lock a second time.  Thereafter it may call journal_begin()
    that definitely requires the lock not to be nested in order to release
    it before taking the journal mutex because the reiserfs lock depends on
    the journal mutex already.
    So, aviod nesting the lock in reiserfs_acl_chmod().
    Reported-by: Pawel Zawora <>
    Signed-off-by: Frederic Weisbecker <>
    Tested-by: Pawel Zawora <>
    Cc: Jeff Mahoney <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  12. @fweisbec

    reiserfs: fix inode mutex - reiserfs lock misordering

    fweisbec committed with Andi Kleen
    commit da90587 upstream.
    reiserfs_unpack() locks the inode mutex with reiserfs_mutex_lock_safe()
    to protect against reiserfs lock dependency.  However this protection
    requires to have the reiserfs lock to be locked.
    This is the case if reiserfs_unpack() is called by reiserfs_ioctl but
    not from reiserfs_quota_on() when it tries to unpack tails of quota
    Fix the ordering of the two locks in reiserfs_unpack() to fix this
    Signed-off-by: Frederic Weisbecker <>
    Reported-by: Markus Gapp <>
    Reported-by: Jan Kara <>
    Cc: Jeff Mahoney <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  13. NFS: Don't SIGBUS if nfs_vm_page_mkwrite races with a cache invalidation

    Trond Myklebust committed with Andi Kleen
    commit bc4866b upstream.
    In the case where we lock the page, and then find out that the page has
    been thrown out of the page cache, we should just return VM_FAULT_NOPAGE.
    This is what block_page_mkwrite() does in these situations.
    Signed-off-by: Trond Myklebust <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  14. NFSv4: Fix open recovery

    Trond Myklebust committed with Andi Kleen
    commit b0ed9db upstream.
    NFSv4 open recovery is currently broken: since we do not clear the
    state->flags states before attempting recovery, we end up with the
    'can_open_cached()' function triggering. This again leads to no OPEN call
    being put on the wire.
    Reported-by: Sachin Prabhu <>
    Signed-off-by: Trond Myklebust <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  15. NFSv4: Don't call nfs4_state_mark_reclaim_reboot() from error handlers

    Trond Myklebust committed with Andi Kleen
    commit ae1007d upstream.
    In the case of a server reboot, the state recovery thread starts by calling
    nfs4_state_end_reclaim_reboot() in order to avoid edge conditions when
    the server reboots while the client is in the middle of recovery.
    However, if the client has already marked the nfs4_state as requiring
    reboot recovery, then the above behaviour will cause the recovery thread to
    treat the open as if it was part of such an edge condition: the open will
    be recovered as if it was part of a lease expiration (and all the locks
    will be lost).
    Fix is to remove the call to nfs4_state_mark_reclaim_reboot from
    nfs4_async_handle_error(), and nfs4_handle_exception(). Instead we leave it
    to the recovery thread to do this for us.
    Signed-off-by: Trond Myklebust <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  16. NFSv4: Don't call nfs4_reclaim_complete() on receiving NFS4ERR_STALE_…

    Trond Myklebust committed with Andi Kleen
    commit 6eaa614 upstream.
    If the server sends us an NFS4ERR_STALE_CLIENTID while the state management
    thread is busy reclaiming state, we do want to treat all state that wasn't
    reclaimed before the STALE_CLIENTID as if a network partition occurred (see
    the edge conditions described in RFC3530 and RFC5661).
    What we do not want to do is to send an nfs4_reclaim_complete(), since we
    haven't yet even started reclaiming state after the server rebooted.
    Signed-off-by: Trond Myklebust <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
  17. block: limit vec count in bio_kmalloc() and bio_alloc_map_data()

    Jens Axboe committed with Andi Kleen
    commit f3f63c1 upstream.
    Reported-by: Dan Rosenberg <>
    Signed-off-by: Jens Axboe <>
    Signed-off-by: Greg Kroah-Hartman <>
    Signed-off-by: Andi Kleen <>
Commits on Nov 22, 2010
  1. @nikai3d @gregkh

    pipe: fix failure to return error code on ->confirm()

    nikai3d committed with gregkh
    commit e5953cb upstream.
    The arguments were transposed, we want to assign the error code to
    'ret', which is being returned.
    Signed-off-by: Nicolas Kaiser <>
    Signed-off-by: Jens Axboe <>
    Signed-off-by: Greg Kroah-Hartman <>
  2. @gregkh

    cifs: fix broken oplock handling

    Suresh Jayaraman committed with gregkh
    commit aa91c7e upstream.
    cifs_new_fileinfo() does not use the 'oplock' value from the callers. Instead,
    it sets it to REQ_OPLOCK which seems wrong. We should be using the oplock value
    obtained from the Server to set the inode's clientCanCacheAll or
    clientCanCacheRead flags. Fix this by passing oplock from the callers to
    This change dates back to commit a6ce493 (2.6.30-rc3). So, all the affected
    versions will need this fix. Please Cc stable once reviewed and accepted.
    Reviewed-by: Jeff Layton <>
    Signed-off-by: Suresh Jayaraman <>
    Signed-off-by: Steve French <>
    Signed-off-by: Greg Kroah-Hartman <>
Commits on Nov 16, 2010
  1. [COMMON] first 2.6.35 based kernel

    cleaneye committed
    	- enabled uart console and booting
Commits on Nov 3, 2010
  1. [COMMON] Modified exception handler for block & disable logs for fat …

    fred.cho committed with cleaneye
    Signed-off-by: cleaneye <>
Commits on Nov 2, 2010
  1. [COMMON] some patches from yaffs pubic git,

    cleaneye committed
    	- hopes that these patches mitigate yaffs crash when mount time
    Signed-off-by: cleaneye <>
Commits on Nov 1, 2010
  1. [COMMON] Modify auotcheck point of yaffs file system.

    junyeong.han committed with cleaneye
      - To improve file system mount time.
    Signed-off-by: cleaneye <>
Commits on Oct 29, 2010
  1. fs: yaffs2: Revert to older version

    Michael Bohan committed
    The most recent version of yaffs2 in Google's tree prohibits the
    ST 1.5 (and possibly others) from being able to mount the
    filesystem. Revert here until the root cause can be identified.
    commit a77b163
    Author: Dima Zavin <>
    Date:   Thu Oct 14 15:59:27 2010 -0700
        yaffs: Import yaffs from Thu Oct 7 10:05:05 2010 +1300
    Change-Id: Ida7a2f79adc0681a728705314a39442d480fe76a
    Signed-off-by: Michael Bohan <>
  2. Merge remote branch 'google_msm/android-msm-2.6.35' into msm_merge1

    Michael Bohan committed
           arch/arm/Kconfig <merged>
            arch/arm/configs/mahimahi_defconfig <Google>
            arch/arm/configs/msm_defconfig <Google>
            arch/arm/include/asm/mach/mmc.h <QUIC>
            arch/arm/include/asm/pgtable.h <merge - update macros>
            arch/arm/kernel/head.S <merged in changes f5a5c37 and
            arch/arm/mach-msm/Kconfig <QUIC>
            arch/arm/mach-msm/Makefile <QUIC>
            arch/arm/mach-msm/Makefile.boot <QUIC>
            arch/arm/mach-msm/acpuclock-7x30.c <QUIC>
            arch/arm/mach-msm/board-halibut.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi-audio.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi-microp.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi-mmc.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi-panel.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi-rfkill.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi-tpa2018d1.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi-wifi.c <GOOGLE>
            arch/arm/mach-msm/board-mahimahi.c <GOOGLE>
            arch/arm/mach-msm/board-qsd8x50.c <QUIC>
            arch/arm/mach-msm/board-sapphire-gpio.c <GOOGLE>
            arch/arm/mach-msm/board-sapphire-keypad.c <GOOGLE>
            arch/arm/mach-msm/board-sapphire-mmc.c <GOOGLE>
            arch/arm/mach-msm/board-sapphire-panel.c <GOOGLE>
            arch/arm/mach-msm/board-sapphire-rfkill.c <GOOGLE>
            arch/arm/mach-msm/board-sapphire.c <GOOGLE>
    	arch/arm/mach-msm/board-sapphire.h <GOOGLE>
            arch/arm/mach-msm/board-swordfish-mmc.c <GOOGLE>
            arch/arm/mach-msm/board-swordfish.c <GOOGLE>
            arch/arm/mach-msm/board-trout-keypad.c <GOOGLE>
            arch/arm/mach-msm/board-trout-mmc.c <GOOGLE>
            arch/arm/mach-msm/board-trout-panel.c <GOOGLE>
            arch/arm/mach-msm/board-trout-rfkill.c <GOOGLE>
            arch/arm/mach-msm/board-trout.c <GOOGLE>
            arch/arm/mach-msm/clock-pcom.h <QUIC>
            arch/arm/mach-msm/clock.c <QUIC>
            arch/arm/mach-msm/cpufreq.c <QUIC>
            arch/arm/mach-msm/dal.c <QUIC>
            arch/arm/mach-msm/devices-msm7x30.c <QUIC>
            arch/arm/mach-msm/devices-qsd8x50.c <QUIC>
            arch/arm/mach-msm/devices.h <QUIC>
            arch/arm/mach-msm/devices_htc.c <QUIC>
            arch/arm/mach-msm/dma.c <QUIC>
            arch/arm/mach-msm/fiq_glue.S <Taking Google's new version
            which supports 8K also. First introduced in .32>
            arch/arm/mach-msm/gpio.c <QUIC>
            arch/arm/mach-msm/gpio_hw.h <QUIC>
            arch/arm/mach-msm/htc_35mm_jack.c <QUIC>
            arch/arm/mach-msm/htc_acoustic.c <QUIC>
            arch/arm/mach-msm/htc_battery.c <QUIC>
            arch/arm/mach-msm/htc_headset.c <QUIC>
            arch/arm/mach-msm/htc_power_supply.c <QUIC>
            arch/arm/mach-msm/htc_pwrsink.c <QUIC>
            arch/arm/mach-msm/htc_wifi_nvs.c <QUIC>
            arch/arm/mach-msm/hw3d.c <QUIC>
            arch/arm/mach-msm/idle-v7.S <QUIC>
            arch/arm/mach-msm/include/mach/board.h <QUIC>
            arch/arm/mach-msm/include/mach/board_htc.h <QUIC>
            arch/arm/mach-msm/include/mach/camera.h <QUIC>
            arch/arm/mach-msm/include/mach/dma.h <QUIC>
            arch/arm/mach-msm/include/mach/fiq.h <QUIC>
    	arch/arm/mach-msm/include/mach/gpio.h <QUIC>
            arch/arm/mach-msm/include/mach/htc_headset.h <QUIC>
            arch/arm/mach-msm/include/mach/irqs-7x30.h <QUIC>
            arch/arm/mach-msm/include/mach/irqs.h <QUIC>
            arch/arm/mach-msm/include/mach/memory.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_adsp.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_hsusb.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_hsusb_hw.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_iomap-7x30.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_iomap-8x50.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_qdsp6_audio.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_rpcrouter.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_serial_hs.h <QUIC>
            arch/arm/mach-msm/include/mach/msm_spi.h <QUIC>
            arch/arm/mach-msm/include/mach/qdsp5/qdsp5lpmmsg.h <QUIC>
            arch/arm/mach-msm/include/mach/qdsp5/qdsp5vfemsg.h <QUIC>
            arch/arm/mach-msm/include/mach/remote_spinlock.h <QUIC>
            arch/arm/mach-msm/include/mach/vmalloc.h <QUIC>
            arch/arm/mach-msm/io.c <QUIC>
            arch/arm/mach-msm/irq-vic.c <QUIC>
            arch/arm/mach-msm/irq.c <QUIC>
            arch/arm/mach-msm/memory.c <QUIC>
            arch/arm/mach-msm/msm_vibrator.c <QUIC>
            arch/arm/mach-msm/nand_partitions.c <QUIC>
            arch/arm/mach-msm/pm.c <QUIC>
            arch/arm/mach-msm/pm.h <QUIC>
            arch/arm/mach-msm/pmic.c <QUIC>
            arch/arm/mach-msm/pmic.h <QUIC>
            arch/arm/mach-msm/qdsp5/Makefile <QUIC>
            arch/arm/mach-msm/qdsp5/adsp.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp.h <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_6210.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_6220.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_6225.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_driver.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_info.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_jpeg_patch_event.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_jpeg_verify_cmd.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_lpm_verify_cmd.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_vfe_patch_event.c <QUIC>
    	arch/arm/mach-msm/qdsp5/adsp_vfe_verify_cmd.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_video_verify_cmd.c <QUIC>
            arch/arm/mach-msm/qdsp5/adsp_videoenc_verify_cmd.c <QUIC>
            arch/arm/mach-msm/qdsp5/audio_aac.c <QUIC>
            arch/arm/mach-msm/qdsp5/audio_amrnb.c <QUIC>
            arch/arm/mach-msm/qdsp5/audio_evrc.c <QUIC>
            arch/arm/mach-msm/qdsp5/audio_in.c <QUIC>
            arch/arm/mach-msm/qdsp5/audio_mp3.c <QUIC>
            arch/arm/mach-msm/qdsp5/audio_out.c <QUIC>
            arch/arm/mach-msm/qdsp5/audio_qcelp.c <QUIC>
            arch/arm/mach-msm/qdsp5/audmgr.c <QUIC>
            arch/arm/mach-msm/qdsp5/audmgr.h <QUIC>
            arch/arm/mach-msm/qdsp5/audpp.c <QUIC>
            arch/arm/mach-msm/qdsp5/evlog.h <QUIC>
            arch/arm/mach-msm/qdsp5/snd.c <QUIC>
            arch/arm/mach-msm/qdsp5v2/Makefile <QUIC>
            arch/arm/mach-msm/qdsp5v2/adsp.c <QUIC>
            arch/arm/mach-msm/qdsp5v2/adsp.h <QUIC>
            arch/arm/mach-msm/qdsp5v2/audio_out.c <QUIC>
            arch/arm/mach-msm/qdsp6/Makefile <QUIC>
            arch/arm/mach-msm/qdsp6/analog_audio.c <QUIC>
            arch/arm/mach-msm/qdsp6/audio_ctl.c <QUIC>
            arch/arm/mach-msm/qdsp6/dal_acdb.h <QUIC>
            arch/arm/mach-msm/qdsp6/dal_adie.h <QUIC>
            arch/arm/mach-msm/qdsp6/dal_audio.h <QUIC>
            arch/arm/mach-msm/qdsp6/dal_audio_format.h <QUIC>
            arch/arm/mach-msm/qdsp6/dsp_debug.c <QUIC>
            arch/arm/mach-msm/qdsp6/mp3.c <QUIC>
            arch/arm/mach-msm/qdsp6/msm_q6vdec.c <QUIC>
            arch/arm/mach-msm/qdsp6/msm_q6venc.c <QUIC>
            arch/arm/mach-msm/qdsp6/pcm_in.c <QUIC>
            arch/arm/mach-msm/qdsp6/pcm_out.c <QUIC>
            arch/arm/mach-msm/qdsp6/q6audio.c <QUIC>
            arch/arm/mach-msm/qdsp6/q6audio_devices.h <QUIC>
            arch/arm/mach-msm/remote_spinlock.c <QUIC>
    	arch/arm/mach-msm/rpc_server_dog_keepalive.c <QUIC>
            arch/arm/mach-msm/rpc_server_time_remote.c <QUIC>
            arch/arm/mach-msm/sirc.h <QUIC>
            arch/arm/mach-msm/smd.c <QUIC>
            arch/arm/mach-msm/smd_debug.c <QUIC>
            arch/arm/mach-msm/smd_private.h <QUIC>
            arch/arm/mach-msm/smd_qmi.c <QUIC>
            arch/arm/mach-msm/smd_rpcrouter.c <QUIC>
            arch/arm/mach-msm/smd_rpcrouter.h <QUIC>
            arch/arm/mach-msm/smd_rpcrouter_device.c <QUIC>
            arch/arm/mach-msm/smd_rpcrouter_servers.c <QUIC>
            arch/arm/mach-msm/smd_tty.c <QUIC>
            arch/arm/mach-msm/timer.c <QUIC>
            arch/arm/mm/proc-v7.S <QUIC>
            drivers/i2c/busses/Kconfig <QUIC>
            drivers/i2c/busses/Makefile <QUIC>
            drivers/i2c/busses/i2c-msm.c <QUIC>
            drivers/i2c/busses/i2c-qup.c <QUIC>
            drivers/input/misc/Kconfig <QUIC>
            drivers/input/touchscreen/Kconfig <QUIC>
            drivers/input/touchscreen/msm_ts.c <QUIC>
            drivers/leds/Kconfig <QUIC>
            drivers/media/video/Kconfig <QUIC>
            drivers/media/video/Makefile <QUIC>
            drivers/media/video/msm/Kconfig <QUIC>
            drivers/media/video/msm/Makefile <QUIC>
            drivers/media/video/msm/msm_camera.c <QUIC>
            drivers/media/video/msm/msm_io7x.c <QUIC>
            drivers/media/video/msm/msm_io8x.c <QUIC>
            drivers/media/video/msm/msm_io_vfe31.c <QUIC>
            drivers/media/video/msm/msm_v4l2.c <QUIC>
            drivers/media/video/msm/msm_vfe31.c <QUIC>
            drivers/media/video/msm/msm_vfe31.h <QUIC>
            drivers/media/video/msm/msm_vfe7x.c <QUIC>
            drivers/media/video/msm/msm_vfe7x.h <QUIC>
    	drivers/media/video/msm/msm_vfe8x.c <QUIC>
            drivers/media/video/msm/msm_vfe8x.h <QUIC>
            drivers/media/video/msm/msm_vfe8x_proc.c <QUIC>
            drivers/media/video/msm/msm_vfe8x_proc.h <QUIC>
            drivers/media/video/msm/mt9d112.c <QUIC>
            drivers/media/video/msm/mt9d112.h <QUIC>
            drivers/media/video/msm/mt9d112_reg.c <QUIC>
            drivers/media/video/msm/mt9p012.h <QUIC>
            drivers/media/video/msm/mt9p012_fox.c <QUIC>
            drivers/media/video/msm/mt9p012_reg.c <QUIC>
            drivers/media/video/msm/mt9t013.c <QUIC>
            drivers/media/video/msm/mt9t013.h <QUIC>
            drivers/media/video/msm/mt9t013_reg.c <QUIC>
            drivers/media/video/msm/s5k3e2fx.c <QUIC>
            drivers/mfd/Kconfig <QUIC>
            drivers/mfd/Makefile <QUIC>
            drivers/misc/Makefile <QUIC>
            drivers/mmc/core/core.c <merged>
            drivers/mmc/host/msm_sdcc.c <QUIC>
            drivers/mtd/devices/Kconfig <QUIC>
            drivers/mtd/devices/msm_nand.c <QUIC>
            drivers/mtd/devices/msm_nand.h <QUIC>
            drivers/net/Kconfig <QUIC>
            drivers/net/Makefile <QUIC>
            drivers/net/msm_rmnet.c <QUIC>
            drivers/power/Kconfig <QUIC>
            drivers/power/Makefile <QUIC>
            drivers/rtc/rtc-msm7x00a.c <QUIC>
            drivers/serial/Kconfig <QUIC>
            drivers/serial/Makefile <QUIC>
            drivers/serial/msm_serial.c <QUIC>
            drivers/serial/msm_serial.h <QUIC>
            drivers/serial/msm_serial_debugger.c <QUIC>
            drivers/serial/msm_serial_hs.c <QUIC>
            drivers/serial/msm_serial_hs_hwreg.h <QUIC>
    	drivers/spi/spi_qsd.c <QUIC>
            drivers/usb/gadget/Kconfig <QUIC>
            drivers/usb/gadget/Makefile <QUIC>
            drivers/usb/gadget/msm72k_udc.c <QUIC>
            drivers/video/Kconfig <QUIC>
            drivers/video/msm/Kconfig <QUIC>
            drivers/video/msm/Makefile <QUIC>
            drivers/video/msm/mddi.c <QUIC>
            drivers/video/msm/mddi_client_dummy.c <QUIC>
            drivers/video/msm/mddi_client_nt35399.c <QUIC>
            drivers/video/msm/mdp.c <QUIC>
            drivers/video/msm/mdp_hw.h <QUIC>
            drivers/video/msm/mdp_lcdc.c <QUIC>
            drivers/video/msm/mdp_ppp.c <QUIC>
            drivers/video/msm/mdp_ppp.h <QUIC>
            drivers/video/msm/mdp_ppp22.c <QUIC>
            drivers/video/msm/mdp_ppp31.c <QUIC>
            drivers/video/msm/msm_fb.c <QUIC>
            include/linux/bma150.h <QUIC>
            include/linux/msm_adsp.h <QUIC>
            include/linux/msm_audio.h <QUIC>
            include/linux/msm_kgsl.h <QUIC>
            include/linux/msm_mdp.h <QUIC>
            include/linux/msm_q6vdec.h <QUIC>
            include/linux/msm_q6venc.h <QUIC>
            include/linux/msm_rpcrouter.h <QUIC>
            include/linux/msm_vidc_dec.h <QUIC>
            include/linux/msm_vidc_enc.h <QUIC>
            include/media/msm_camera.h <QUIC>
            drivers/misc/pmem.c <QUIC>
            fs/yaffs2/*	<GOOGLE>
    Added TCSR mapping in:
        due to this commit:
        commit 5b3aa20
        Author: Iliyan Malchev <>
        Date:   Thu Dec 10 00:30:03 2009 -0800
        [ARM] qsd8k: print TCSR_SPARE2 in do_imprecise_ext
        Signed-off-by: Iliyan Malchev <>
        Change-Id: I642ac2368403777f8862178afce7c609ed085c15
        FIRST_SIRC_IRQ moved back to this file contradicting this change:
     arch/arm/mach-msm/memory.c: Taken from QUIC from before
     arch/arm/mach-msm/include/mach/memory.h: Taken from QUIC from before
        Change-Id: I27737be7ffc5689b90b39f43b74249eb1b5c8089
        Signed-off-by: Michael Bohan <>
    arch/arm/mach-msm/sirc.c: Taken from Google
    drivers/video/msm/gpu/*: Deleted
      This is Google's version of kgsl which contradicts ours in
    Change-Id: I02897191ad25923d936159f4cfdfdf56884764fc
  3. Merge remote branch 'google_common/android-2.6.35' into msm_merge2a

    Michael Bohan committed
    Change-Id: Ib6629c3ad1962823a111f5c35c01521884630278
  4. @gregkh

    mm: Move vma_stack_continue into mm.h

    Stefan Bader committed with gregkh
    commit 39aa3cb upstream.
    So it can be used by all that need to check for that.
    Signed-off-by: Stefan Bader <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
  5. @gregkh

    execve: make responsive to SIGKILL with large arguments

    Roland McGrath committed with gregkh
    commit 9aea5a6 upstream.
    An execve with a very large total of argument/environment strings
    can take a really long time in the execve system call.  It runs
    uninterruptibly to count and copy all the strings.  This change
    makes it abort the exec quickly if sent a SIGKILL.
    Note that this is the conservative change, to interrupt only for
    SIGKILL, by using fatal_signal_pending().  It would be perfectly
    correct semantics to let any signal interrupt the string-copying in
    execve, i.e. use signal_pending() instead of fatal_signal_pending().
    We'll save that change for later, since it could have user-visible
    consequences, such as having a timer set too quickly make it so that
    an execve can never complete, though it always happened to work before.
    Signed-off-by: Roland McGrath <>
    Reviewed-by: KOSAKI Motohiro <>
    Cc: Chuck Ebbert <>
    Signed-off-by: Linus Torvalds <>
  6. @gregkh

    execve: improve interactivity with large arguments

    Roland McGrath committed with gregkh
    commit 7993bc1 upstream.
    This adds a preemption point during the copying of the argument and
    environment strings for execve, in copy_strings().  There is already
    a preemption point in the count() loop, so this doesn't add any new
    points in the abstract sense.
    When the total argument+environment strings are very large, the time
    spent copying them can be much more than a normal user time slice.
    So this change improves the interactivity of the rest of the system
    when one process is doing an execve with very large arguments.
    Signed-off-by: Roland McGrath <>
    Reviewed-by: KOSAKI Motohiro <>
    Signed-off-by: Linus Torvalds <>
    Cc: Chuck Ebbert <>
    Signed-off-by: Greg Kroah-Hartman <>
  7. @gregkh

    setup_arg_pages: diagnose excessive argument size

    Roland McGrath committed with gregkh
    commit 1b52818 upstream.
    The CONFIG_STACK_GROWSDOWN variant of setup_arg_pages() does not
    check the size of the argument/environment area on the stack.
    When it is unworkably large, shift_arg_pages() hits its BUG_ON.
    This is exploitable with a very large RLIMIT_STACK limit, to
    create a crash pretty easily.
    Check that the initial stack is not too large to make it possible
    to map in any executable.  We're not checking that the actual
    executable (or intepreter, for binfmt_elf) will fit.  So those
    mappings might clobber part of the initial stack mapping.  But
    that is just userland lossage that userland made happen, not a
    kernel problem.
    Signed-off-by: Roland McGrath <>
    Reviewed-by: KOSAKI Motohiro <>
    Signed-off-by: Linus Torvalds <>
    Cc: Chuck Ebbert <>
    Signed-off-by: Greg Kroah-Hartman <>
Something went wrong with that request. Please try again.