1. 11 8月, 2010 12 次提交
    • A
      serial: replace open coded mutex with a real mutex in mrst_max3110.c · 68c16b41
      Arjan van de Ven 提交于
      The mrst_max3110.c driver uses an open coded, non atomic variable
      to create exclusion between two of its worker threads. More than that,
      while the main thread does a proper set-work-clear sequence,
      the other thread only does a test, with the result that no actual
      exclusion is happening.
      
      this patch replaces this open coded variable with a proper mutex
      
      in addition, the 'lock' spinlock is removed from the per adapter structure,
      the lock was only ever initialized but never used
      Signed-off-by: NArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      68c16b41
    • J
      max3110 sanity check a register · 99dd3f6b
      jianwei.yang 提交于
      MAX3111 is the SPI/UART IC installed on the MRST SPI Port Card as a serial
      debug goal, and the SPI Port Card will be frequently mounted and unmounted
      from the main board by developers depending whether debug serial is
      required or not.
      
      As the MAX3111 has no subvendor or product id registers available, the patch
      will try to access one register to decide if this IC is present or not.
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      99dd3f6b
    • F
      mrst_max3110: add UART driver for Max3110 on Moorestown · 22510995
      Feng Tang 提交于
      This driver enable the max3110 device, it can be used as
      a system console. the IRQ needs be enabled if user want a
      better performance. MRST max3110 works in 3.684MHz clock,
      which supports 230400 as its maximum rate.
      Signed-off-by: NFeng Tang <feng.tang@intel.com>
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      22510995
    • Y
      serial: add UART_CAP_EFR and UART_CAP_SLEEP flags to 16C950 UARTs definition · 7a56aa45
      Yegor Yefremov 提交于
      Adding UART_CAP_EFR and UART_CAP_SLEEP flags will enable sleep mode
      and automatic CTS flow control for 16C950 UARTs. It will also avoid
      capabilities detection warning like this:
      
      "ttyS0: detected caps 00000700 should be 00000100"
      Signed-off-by: NYegor Yefremov <yegorslists@googlemail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      7a56aa45
    • A
      vt: clean up the code - use kernel library · 74c807ce
      Andy Shevchenko 提交于
      Signed-off-by: NAndy Shevchenko <ext-andriy.shevchenko@nokia.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Alan Cox <alan@linux.intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      74c807ce
    • C
      serial: There's no config CONSOLE · 690b781b
      Christoph Egger 提交于
      as there's no config CONSOLE (never has been as far as I can tell) and
      noone has ever missed that piece of code, it should be safe to remove
      it making the kernel a tiny bit less complex.
      Signed-off-by: NChristoph Egger <siccegge@cs.fau.de>
      Acked-by: NGreg Ungerer <gerg@snapgear.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      690b781b
    • A
      n_gsm.c: removed duplicated #includes · ea5d0236
      Andrea Gelmini 提交于
      drivers/char/n_gsm.c: linux/timer.h is included more than once.
      Signed-off-by: NAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      ea5d0236
    • L
      Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux · b34d8915
      Linus Torvalds 提交于
      * 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux:
        unistd: add __NR_prlimit64 syscall numbers
        rlimits: implement prlimit64 syscall
        rlimits: switch more rlimit syscalls to do_prlimit
        rlimits: redo do_setrlimit to more generic do_prlimit
        rlimits: add rlimit64 structure
        rlimits: do security check under task_lock
        rlimits: allow setrlimit to non-current tasks
        rlimits: split sys_setrlimit
        rlimits: selinux, do rlimits changes under task_lock
        rlimits: make sure ->rlim_max never grows in sys_setrlimit
        rlimits: add task_struct to update_rlimit_cpu
        rlimits: security, add task_struct to setrlimit
      
      Fix up various system call number conflicts.  We not only added fanotify
      system calls in the meantime, but asm-generic/unistd.h added a wait4
      along with a range of reserved per-architecture system calls.
      b34d8915
    • L
      Merge git://git.infradead.org/mtd-2.6 · e8a89ceb
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (79 commits)
        mtd: Remove obsolete <mtd/compatmac.h> include
        mtd: Update copyright notices
        jffs2: Update copyright notices
        mtd-physmap: add support users can assign the probe type in board files
        mtd: remove redwood map driver
        mxc_nand: Add v3 (i.MX51) Support
        mxc_nand: support 8bit ecc
        mxc_nand: fix correct_data function
        mxc_nand: add V1_V2 namespace to registers
        mxc_nand: factor out a check_int function
        mxc_nand: make some internally used functions overwriteable
        mxc_nand: rework get_dev_status
        mxc_nand: remove 0xe00 offset from registers
        mtd: denali: Add multi connected NAND support
        mtd: denali: Remove set_ecc_config function
        mtd: denali: Remove unuseful code in get_xx_nand_para functions
        mtd: denali: Remove device_info_tag structure
        mtd: m25p80: add support for the Winbond W25Q32 SPI flash chip
        mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips
        mtd: m25p80: add support for the EON EN25P{32, 64} SPI flash chips
        ...
      
      Fix up trivial conflicts in drivers/mtd/maps/{Kconfig,redwood.c} due to
      redwood driver removal.
      e8a89ceb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs · 8196867c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs:
        omfs: fix uninitialized variable warning
        omfs: sanity check cluster size
        omfs: refuse to mount if bitmap pointer is obviously wrong
        omfs: check bounds on block numbers before passing to sb_bread
        omfs: fix memory leak
      8196867c
    • L
      Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify · 8c8946f5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.infradead.org/users/eparis/notify: (132 commits)
        fanotify: use both marks when possible
        fsnotify: pass both the vfsmount mark and inode mark
        fsnotify: walk the inode and vfsmount lists simultaneously
        fsnotify: rework ignored mark flushing
        fsnotify: remove global fsnotify groups lists
        fsnotify: remove group->mask
        fsnotify: remove the global masks
        fsnotify: cleanup should_send_event
        fanotify: use the mark in handler functions
        audit: use the mark in handler functions
        dnotify: use the mark in handler functions
        inotify: use the mark in handler functions
        fsnotify: send fsnotify_mark to groups in event handling functions
        fsnotify: Exchange list heads instead of moving elements
        fsnotify: srcu to protect read side of inode and vfsmount locks
        fsnotify: use an explicit flag to indicate fsnotify_destroy_mark has been called
        fsnotify: use _rcu functions for mark list traversal
        fsnotify: place marks on object in order of group memory address
        vfs/fsnotify: fsnotify_close can delay the final work in fput
        fsnotify: store struct file not struct path
        ...
      
      Fix up trivial delete/modify conflict in fs/notify/inotify/inotify.c.
      8c8946f5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 5f248c9c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (96 commits)
        no need for list_for_each_entry_safe()/resetting with superblock list
        Fix sget() race with failing mount
        vfs: don't hold s_umount over close_bdev_exclusive() call
        sysv: do not mark superblock dirty on remount
        sysv: do not mark superblock dirty on mount
        btrfs: remove junk sb_dirt change
        BFS: clean up the superblock usage
        AFFS: wait for sb synchronization when needed
        AFFS: clean up dirty flag usage
        cifs: truncate fallout
        mbcache: fix shrinker function return value
        mbcache: Remove unused features
        add f_flags to struct statfs(64)
        pass a struct path to vfs_statfs
        update VFS documentation for method changes.
        All filesystems that need invalidate_inode_buffers() are doing that explicitly
        convert remaining ->clear_inode() to ->evict_inode()
        Make ->drop_inode() just return whether inode needs to be dropped
        fs/inode.c:clear_inode() is gone
        fs/inode.c:evict() doesn't care about delete vs. non-delete paths now
        ...
      
      Fix up trivial conflicts in fs/nilfs2/super.c
      5f248c9c
  2. 10 8月, 2010 28 次提交