1. 01 2月, 2009 1 次提交
    • L
      Stop playing silly games with the VM_ACCOUNT flag · fc8744ad
      Linus Torvalds 提交于
      The mmap_region() code would temporarily set the VM_ACCOUNT flag for
      anonymous shared mappings just to inform shmem_zero_setup() that it
      should enable accounting for the resulting shm object.  It would then
      clear the flag after calling ->mmap (for the /dev/zero case) or doing
      shmem_zero_setup() (for the MAP_ANON case).
      
      This just resulted in vma merge issues, but also made for just
      unnecessary confusion.  Use the already-existing VM_NORESERVE flag for
      this instead, and let shmem_{zero|file}_setup() just figure it out from
      that.
      
      This also happens to make it obvious that the new DRI2 GEM layer uses a
      non-reserving backing store for its object allocation - which is quite
      possibly not intentional.  But since I didn't want to change semantics
      in this patch, I left it alone, and just updated the caller to use the
      new flag semantics.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fc8744ad
  2. 31 1月, 2009 5 次提交
    • L
      Allow opportunistic merging of VM_CAN_NONLINEAR areas · 33bfad54
      Linus Torvalds 提交于
      Commit de33c8db ("Fix OOPS in
      mmap_region() when merging adjacent VM_LOCKED file segments") unified
      the vma merging of anonymous and file maps to just one place, which
      simplified the code and fixed a use-after-free bug that could cause an
      oops.
      
      But by doing the merge opportunistically before even having called
      ->mmap() on the file method, it now compares two different 'vm_flags'
      values: the pre-mmap() value of the new not-yet-formed vma, and previous
      mappings of the same file around it.
      
      And in doing so, it refused to merge the common file case, which adds a
      marker to say "I can be made non-linear".
      
      This fixes it by just adding a set of flags that don't have to match,
      because we know they are ok to merge.  Currently it's only that single
      VM_CAN_NONLINEAR flag, but at least conceptually there could be others
      in the future.
      Reported-and-acked-by: NHugh Dickins <hugh@veritas.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
      Cc: Nick Piggin <npiggin@suse.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <gregkh@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      33bfad54
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · c01a25e7
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: Remove bogus BUG() check in ext4_bmap()
        ext4: Fix building with EXT4FS_DEBUG
        ext4: Initialize the new group descriptor when resizing the filesystem
        ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks
        jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs"
        ext3: Add sanity check to make_indexed_dir
        ext4: Add sanity check to make_indexed_dir
        ext4: only use i_size_high for regular files
        ext4: fix wrong use of do_div
      c01a25e7
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · ae704e9f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        cfq-iosched: Allow RT requests to pre-empt ongoing BE timeslice
        block: add sysfs file for controlling io stats accounting
        Mark mandatory elevator functions in the biodoc.txt
        include/linux: Add bsg.h to the Kernel exported headers
        block: silently error an unsupported barrier bio
        block: Fix documentation for blkdev_issue_flush()
        block: add bio_rw_flagged() for testing bio->bi_rw
        block: seperate bio/request unplug and sync bits
        block: export SSD/non-rotational queue flag through sysfs
        Fix small typo in bio.h's documentation
        block: get rid of the manual directory counting in blktrace
        block: Allow empty integrity profile
        block: Remove obsolete BUG_ON
        block: Don't verify integrity metadata on read error
      ae704e9f
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · dbeb1701
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits)
        tulip: fix 21142 with 10Mbps without negotiation
        drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic
        gianfar: Fix Wake-on-LAN support
        smsc911x: timeout reaches -1
        smsc9420: fix interrupt signalling test failures
        ucc_geth: Change uec phy id to the same format as gianfar's
        wimax: fix build issue when debugfs is disabled
        netxen: fix memory leak in drivers/net/netxen_nic_init.c
        tun: Add some missing TUN compat ioctl translations.
        ipv4: fix infinite retry loop in IP-Config
        net: update documentation ip aliases
        net: Fix OOPS in skb_seq_read().
        net: Fix frag_list handling in skb_seq_read
        netxen: revert jumbo ringsize
        ath5k: fix locking in ath5k_config
        cfg80211: print correct intersected regulatory domain
        cfg80211: Fix sanity check on 5 GHz when processing country IE
        iwlwifi: fix kernel oops when ucode DMA memory allocation failure
        rtl8187: Fix error in setting OFDM power settings for RTL8187L
        mac80211: remove Michael Wu as maintainer
        ...
      dbeb1701
    • P
      Add enable_ms to jsm driver · 0461ec5b
      Paul Larson 提交于
      This fixes a crash observed when non-existant enable_ms function is
      called for jsm driver.
      Signed-off-by: NScott Kilau <Scott.Kilau@digi.com>
      Signed-off-by: NPaul Larson <pl@linux.vnet.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0461ec5b
  3. 30 1月, 2009 34 次提交