Eric Lee / smarc-fsl-linux-kernel

16 Dec, 2010

4 commits

  • e42a98b52   input: mt: Add hovering distance axis ... Browse Code »

    Touch devices capable of hovering, i.e., fingers detected a
    distance from the surface, are not supported by the current
    input MT protocol. This patch adds ABS_MT_DISTANCE, which may
    be used to indicate the distance between the contact and the
    surface.

    Signed-off-by: Henrik Rydberg

    Henrik Rydberg
     
  • c5f4dec1c   input: mt: Move tracking and pointer emulation to input-mt ... Browse Code »

    The drivers using the type B protocol all report tracking information
    the same way. The contact id is semantically equivalent to
    ABS_MT_SLOT, and the handling of ABS_MT_TRACKING_ID only complicates
    the driver. The situation can be improved upon by providing a common
    pointer emulation code, thereby removing the need for the tracking id
    in the driver. This patch moves all tracking event handling over to
    the input core, simplifying both the existing drivers and the ones
    currently in preparation.

    Acked-by: Ping Cheng
    Acked-by: Jiri Kosina
    Signed-off-by: Henrik Rydberg

    Henrik Rydberg
     
  • 8cde81001   input: mt: Collect slots initialization code ... Browse Code »

    The MT slots devices all follow the same initialization pattern
    of creating slots and hinting about buffer size. Let drivers call
    an initialization function instead, and make sure it can be called
    repeatedly without side effects.

    Signed-off-by: Henrik Rydberg

    Henrik Rydberg
     
  • 47c78e891   input: mt: Break out slots handling ... Browse Code »

    In preparation for common code to handle a larger set of MT slots
    devices, move the slots handling over to a separate file.

    Signed-off-by: Henrik Rydberg

    Henrik Rydberg
     

01 Nov, 2010

5 commits

31 Oct, 2010

7 commits

  • bb8430a2c   locks: remove fl_copy_lock lock_manager operation ... Browse Code »

    This one was only used for a nasty hack in nfsd, which has recently
    been removed.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Linus Torvalds

    Christoph Hellwig
     
  • 3985c7ce8   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
    isdn: mISDN: socket: fix information leak to userland
    netdev: can: Change mail address of Hans J. Koch
    pcnet_cs: add new_id
    net: Truncate recvfrom and sendto length to INT_MAX.
    RDS: Let rds_message_alloc_sgs() return NULL
    RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace
    RDS: Clean up error handling in rds_cmsg_rdma_args
    RDS: Return -EINVAL if rds_rdma_pages returns an error
    net: fix rds_iovec page count overflow
    can: pch_can: fix section mismatch warning by using a whitelisted name
    can: pch_can: fix sparse warning
    netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probe
    ip_gre: fix fallback tunnel setup
    vmxnet: trivial annotation of protocol constant
    vmxnet3: remove unnecessary byteswapping in BAR writing macros
    ipv6/udp: report SndbufErrors and RcvbufErrors
    phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr

    Linus Torvalds
     
  • 05fa3135f   locks: fix setlease methods to free passed-in lock ... Browse Code »

    We modified setlease to require the caller to allocate the new lease in
    the case of creating a new lease, but forgot to fix up the filesystem
    methods.

    Cc: Steven Whitehouse
    Cc: Steve French
    Cc: Trond Myklebust
    Signed-off-by: J. Bruce Fields
    Acked-by: Arnd Bergmann
    Signed-off-by: Linus Torvalds

    J. Bruce Fields
     
  • 1792f17b7   Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify ... Browse Code »

    * 'for-linus' of git://git.infradead.org/users/eparis/notify: (22 commits)
    Ensure FMODE_NONOTIFY is not set by userspace
    make fanotify_read() restartable across signals
    fsnotify: remove alignment padding from fsnotify_mark on 64 bit builds
    fs/notify/fanotify/fanotify_user.c: fix warnings
    fanotify: Fix FAN_CLOSE comments
    fanotify: do not recalculate the mask if the ignored mask changed
    fanotify: ignore events on directories unless specifically requested
    fsnotify: rename FS_IN_ISDIR to FS_ISDIR
    fanotify: do not send events for irregular files
    fanotify: limit number of listeners per user
    fanotify: allow userspace to override max marks
    fanotify: limit the number of marks in a single fanotify group
    fanotify: allow userspace to override max queue depth
    fsnotify: implement a default maximum queue depth
    fanotify: ignore fanotify ignore marks if open writers
    fanotify: allow userspace to flush all marks
    fsnotify: call fsnotify_parent in perm events
    fsnotify: correctly handle return codes from listeners
    fanotify: use __aligned_u64 in fanotify userspace metadata
    fanotify: implement fanotify listener ordering
    ...

    Linus Torvalds
     
  • f02a38d86   Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.ker… ... Browse Code »

    …nel.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:
    jump label: Add work around to i386 gcc asm goto bug
    x86, ftrace: Use safe noops, drop trap test
    jump_label: Fix unaligned traps on sparc.
    jump label: Make arch_jump_label_text_poke_early() optional
    jump label: Fix error with preempt disable holding mutex
    oprofile: Remove deprecated use of flush_scheduled_work()
    oprofile: Fix the hang while taking the cpu offline
    jump label: Fix deadlock b/w jump_label_mutex vs. text_mutex
    jump label: Fix module __init section race

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Check irq_remapped instead of remapping_enabled in destroy_irq()

    Linus Torvalds
     
  • 6bff7eccb   Ensure FMODE_NONOTIFY is not set by userspace ... Browse Code »

    In fsnotify_open() ensure that FMODE_NONOTIFY is never set by userspace.
    Also always call fsnotify_parent and fsnotify.

    Signed-off-by: Lino Sanfilippo
    Signed-off-by: Eric Paris

    Lino Sanfilippo
     
  • 925d169f5   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (39 commits)
    Btrfs: deal with errors from updating the tree log
    Btrfs: allow subvol deletion by unprivileged user with -o user_subvol_rm_allowed
    Btrfs: make SNAP_DESTROY async
    Btrfs: add SNAP_CREATE_ASYNC ioctl
    Btrfs: add START_SYNC, WAIT_SYNC ioctls
    Btrfs: async transaction commit
    Btrfs: fix deadlock in btrfs_commit_transaction
    Btrfs: fix lockdep warning on clone ioctl
    Btrfs: fix clone ioctl where range is adjacent to extent
    Btrfs: fix delalloc checks in clone ioctl
    Btrfs: drop unused variable in block_alloc_rsv
    Btrfs: cleanup warnings from gcc 4.6 (nonbugs)
    Btrfs: Fix variables set but not read (bugs found by gcc 4.6)
    Btrfs: Use ERR_CAST helpers
    Btrfs: use memdup_user helpers
    Btrfs: fix raid code for removing missing drives
    Btrfs: Switch the extent buffer rbtree into a radix tree
    Btrfs: restructure try_release_extent_buffer()
    Btrfs: use the flusher threads for delalloc throttling
    Btrfs: tune the chunk allocation to 5% of the FS as metadata
    ...

    Fix up trivial conflicts in fs/btrfs/super.c and fs/fs-writeback.c, and
    remove use of INIT_RCU_HEAD in fs/btrfs/extent_io.c (that init macro was
    useless and removed in commit 5e8067adfdba: "rcu head remove init")

    Linus Torvalds
     

30 Oct, 2010

12 commits

  • 847f87760   Merge branch 'audit.b64' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current ... Browse Code »

    * 'audit.b64' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
    audit mmap
    audit: make link()/linkat() match "attribute change" predicate
    audit: Use rcu for task lookup protection
    audit: Do not send uninitialized data for AUDIT_TTY_GET
    audit: Call tty_audit_push_task() outside preempt disabled
    in untag_chunk() we need to do alloc_chunk() a bit earlier
    audit: make functions static
    Audit: add support to match lsm labels on user audit messages

    Linus Torvalds
     
  • 79346507a   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (82 commits)
    mtd: fix build error in m25p80.c
    mtd: Remove redundant mutex from mtd_blkdevs.c
    MTD: Fix wrong check register_blkdev return value
    Revert "mtd: cleanup Kconfig dependencies"
    mtd: cfi_cmdset_0002: make sector erase command variable
    mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
    mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
    mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
    block2mtd: dubious assignment
    P4080/mtd: Fix the freescale lbc issue with 36bit mode
    P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
    mtd: phram: use KBUILD_MODNAME
    mtd: OneNAND: S5PC110: Fix double call suspend & resume function
    mtd: nand: fix MTD_MODE_RAW writes
    jffs2: use kmemdup
    mtd: sm_ftl: cosmetic, use bool when possible
    mtd: r852: remove useless pci powerup/down from suspend/resume routines
    mtd: blktrans: fix a race vs kthread_stop
    mtd: blktrans: kill BKL
    mtd: allow to unload the mtdtrans module if its block devices aren't open
    ...

    Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c

    Linus Torvalds
     
  • 120a795da   audit mmap ... Browse Code »

    Normal syscall audit doesn't catch 5th argument of syscall. It also
    doesn't catch the contents of userland structures pointed to be
    syscall argument, so for both old and new mmap(2) ABI it doesn't
    record the descriptor we are mapping. For old one it also misses
    flags.

    Signed-off-by: Al Viro

    Al Viro
     
  • 3c80fe4ac   audit: Call tty_audit_push_task() outside preempt disabled ... Browse Code »

    While auditing all tasklist_lock read_lock sites I stumbled over the
    following call chain:

    audit_prepare_user_tty()
    read_lock(&tasklist_lock);
    tty_audit_push_task();
    mutex_lock(&buf->mutex);

    --> buf->mutex is locked with preemption disabled.

    Solve this by acquiring a reference to the task struct under
    rcu_read_lock and call tty_audit_push_task outside of the preempt
    disabled region.

    Move all code which needs to be protected by sighand lock into
    tty_audit_push_task() and use lock/unlock_sighand as we do not hold
    tasklist_lock.

    Signed-off-by: Thomas Gleixner
    Cc: Al Viro
    Cc: Eric Paris
    Cc: Oleg Nesterov
    Signed-off-by: Al Viro

    Thomas Gleixner
     
  • 67577927e   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Browse Code »

    Conflicts:
    drivers/mtd/mtd_blkdevs.c

    Merge Grant's device-tree bits so that we can apply the subsequent fixes.

    Signed-off-by: David Woodhouse

    David Woodhouse
     
  • 4882720b2   semaphore: Remove mutex emulation ... Browse Code »

    Semaphores used as mutexes have been deprecated for years. Now that
    all users are either converted to real semaphores or to mutexes remove
    the cruft.

    Signed-off-by: Thomas Gleixner
    Cc: Peter Zijlstra
    Cc: Christoph Hellwig
    LKML-Reference:

    Thomas Gleixner
     
  • 1840897ab   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
    b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd
    mac80211: fix failure to check kmalloc return value in key_key_read
    libertas: Fix sd8686 firmware reload
    ath9k: Fix incorrect access of rate flags in RC
    netfilter: xt_socket: Make tproto signed in socket_mt6_v1().
    stmmac: enable/disable rx/tx in the core with a single write.
    net: atarilance - flags should be unsigned long
    netxen: fix kdump
    pktgen: Limit how much data we copy onto the stack.
    net: Limit socket I/O iovec total length to INT_MAX.
    USB: gadget: fix ethernet gadget crash in gether_setup
    fib: Fix fib zone and its hash leak on namespace stop
    cxgb3: Fix panic in free_tx_desc()
    cxgb3: fix crash due to manipulating queues before registration
    8390: Don't oops on starting dev queue
    dccp ccid-2: Stop polling
    dccp: Refine the wait-for-ccid mechanism
    dccp: Extend CCID packet dequeueing interface
    dccp: Return-value convention of hc_tx_send_packet()
    igbvf: fix panic on load
    ...

    Linus Torvalds
     
  • 337ac9d52   phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr ... Browse Code »

    The marvell 88ec048's official part number is 88e1318s. This patch renames
    definitions in the driver to reflect this.

    In addition, a minor bug fix has been added to write back the MSCR1 register
    value properly.

    Signed-off-by: Cyril Chemparathy
    Signed-off-by: David S. Miller

    Cyril Chemparathy
     
  • 1e431a9d6   Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb ... Browse Code »

    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    kgdb,ppc: Individual register get/set for ppc
    kgdbts: prevent re-entry to kgdbts before it unregisters
    debug_core,x86,blackfin: Clean up hw debug disable API
    kdb: Fix early debugging crash regression
    kgdb,arm: fix register dump
    kdb: fix per_cpu command to remove supress mask
    kdb: Add kdb kernel module sample

    Linus Torvalds
     
  • 45f81b1c9   jump label: Add work around to i386 gcc asm goto bug ... Browse Code »

    On i386 (not x86_64) early implementations of gcc would have a bug
    with asm goto causing it to produce code like the following:

    (This was noticed by Peter Zijlstra)

    56 pushl 0
    67 nopl jmp 0x6f
    popl
    jmp 0x8c

    6f mov
    test
    je 0x8c

    8c mov
    call *(%esp)

    The jump added in the asm goto skipped over the popl that matched
    the pushl 0, which lead up to a quick crash of the system when
    the jump was enabled. The nopl is defined in the asm goto () statement
    and when tracepoints are enabled, the nop changes to a jump to the label
    that was specified by the asm goto. asm goto is suppose to tell gcc that
    the code in the asm might jump to an external label. Here gcc obviously
    fails to make that work.

    The bug report for gcc is here:

    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226

    The bug only appears on x86 when not compiled with
    -maccumulate-outgoing-args. This option is always set on x86_64 and it
    is also the work around for a function graph tracer i386 bug.
    (See commit: 746357d6a526d6da9d89a2ec645b28406e959c2e)
    This explains why the bug only showed up on i386 when function graph
    tracer was not enabled.

    This patch now adds a CONFIG_JUMP_LABEL option that is default
    off instead of using jump labels by default. When jump labels are
    enabled, the -maccumulate-outgoing-args will be used (causing a
    slightly larger kernel image on i386). This option will exist
    until we have a way to detect if the gcc compiler in use is safe
    to use on all configurations without the work around.

    Note, there exists such a test, but for now we will keep the enabling
    of jump label as a manual option.

    Archs that know the compiler is safe with asm goto, may choose to
    select JUMP_LABEL and enable it by default.

    Reported-by: Ingo Molnar
    Cause-discovered-by: Peter Zijlstra
    Cc: Peter Zijlstra
    Cc: Thomas Gleixner
    Cc: Jason Baron
    Cc: H. Peter Anvin
    Cc: David Daney
    Cc: Mathieu Desnoyers
    Cc: Masami Hiramatsu
    Cc: David Miller
    Cc: Richard Henderson
    LKML-Reference:
    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • d7ba979d4   debug_core,x86,blackfin: Clean up hw debug disable API ... Browse Code »

    The kgdb_disable_hw_debug() was an architecture specific function for
    disabling all hardware breakpoints on a per cpu basis when entering
    the debug core.

    This patch will remove the weak function kdbg_disable_hw_debug() and
    change it into a call back which lives with the rest of hw breakpoint
    call backs in struct kgdb_arch.

    Signed-off-by: Dongdong Deng
    Signed-off-by: Jason Wessel

    Dongdong Deng
     
  • 435f49a51   readv/writev: do the same MAX_RW_COUNT truncation that read/write does ... Browse Code »

    We used to protect against overflow, but rather than return an error, do
    what read/write does, namely to limit the total size to MAX_RW_COUNT.
    This is not only more consistent, but it also means that any broken
    low-level read/write routine that still keeps counts in 'int' can't
    break.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

29 Oct, 2010

12 commits