1. 20 4月, 2010 14 次提交
    • D
      Merge branch 'drm-fbdev-cleanup' into drm-core-next · 7fff400b
      Dave Airlie 提交于
      * drm-fbdev-cleanup:
        drm/fb: remove drm_fb_helper_setcolreg
        drm/kms/fb: use slow work mechanism for normal hotplug also.
        drm/kms/fb: add polling support for when nothing is connected.
        drm/kms/fb: provide a 1024x768 fbcon if no outputs found.
        drm/kms/fb: separate fbdev connector list from core drm connectors
        drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list
        drm/fb: fix fbdev object model + cleanup properly.
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_drv.h
      	drivers/gpu/drm/nouveau/nouveau_drv.h
      7fff400b
    • D
      Merge branch 'drm-radeon-lockup' into drm-core-next · 0bcb1d84
      Dave Airlie 提交于
      * drm-radeon-lockup:
        drm/radeon/kms: simplify & improve GPU reset V2
        drm/radeon/kms: rename gpu_reset to asic_reset
        drm/radeon/kms: fence cleanup + more reliable GPU lockup detection V4
      
      Conflicts:
      	drivers/gpu/drm/radeon/r300.c
      0bcb1d84
    • D
      Merge branch 'drm-edid-fixes' into drm-core-next · c9c2625f
      Dave Airlie 提交于
      * drm-edid-fixes:
        drm/edid: When checking duplicate standard modes, walked the probed list
        drm/edid: Fix sync polarity for secondary GTF curve
        drm/modes: Fix interlaced mode names
        drm/edid: Add secondary GTF curve support
        drm/edid: Strengthen the algorithm for standard mode codes
        drm/edid: Fix the HDTV hack.
        drm/edid: Extend range-based mode addition for EDID 1.4
        drm/edid: Add test for monitor reduced blanking support.
        drm/edid: Fix preferred mode parse for EDID 1.4
        drm/edid: Remove some silly comments
        drm/edid: Remove arbitrary EDID extension limit
        drm/edid: Add modes for Established Timings III section
        drm/edid: Reshuffle mode list construction to closer match the spec
        drm/edid: Remove a redundant check
        drm/edid: Remove some misleading comments
        drm/edid: Fix secondary block fetch.
      c9c2625f
    • D
      Merge branch 'drm-ttm-pool' into drm-core-next · c2b41276
      Dave Airlie 提交于
      * drm-ttm-pool:
        drm/ttm: using kmalloc/kfree requires including slab.h
        drm/ttm: include linux/seq_file.h for seq_printf
        drm/ttm: Add sysfs interface to control pool allocator.
        drm/ttm: Use set_pages_array_wc instead of set_memory_wc.
        arch/x86: Add array variants for setting memory to wc caching.
        drm/nouveau: Add ttm page pool debugfs file.
        drm/radeon/kms: Add ttm page pool debugfs file.
        drm/ttm: Add debugfs output entry to pool allocator.
        drm/ttm: add pool wc/uc page allocator V3
      c2b41276
    • D
      Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into drm-core-next · 97921a5b
      Dave Airlie 提交于
      * 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next: (48 commits)
        agp/intel-gtt: kill previous_size assignments
        agp/intel-gtt: kill intel_i830_tlbflush
        agp/intel: split out gmch/gtt probe, part 1
        agp/intel: kill mutli_gmch_chip
        agp/intel: uncoditionally reconfigure driver on resume
        agp/intel: split out the GTT support
        agp/intel: introduce intel-agp.h header file
        drm/i915: Don't touch PORT_HOTPLUG_EN in intel_dp_detect()
        drm/i915/pch: Use minimal number of FDI lanes (v2)
        drm/i915: Add the support of memory self-refresh on Ironlake
        drm/i915: Move Pineview CxSR and watermark code into update_wm hook.
        drm/i915: Only save/restore FBC on the platform that supports FBC
        drm/i915: Fix the incorrect argument for SDVO SET_TV_format command
        drm/i915: Add support of SDVO on Ibexpeak PCH
        drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on).
        drm/i915: do not read uninitialized ->dev_private
        Revert "drm/i915: Use a dmi quirk to skip a broken SDVO TV output."
        drm/i915: implement multifunction SDVO device support
        drm/i915: remove unused intel_pipe_get_connector()
        drm/i915: remove connector object in old output structure
        ...
      97921a5b
    • L
      Linux 2.6.34-rc5 · 01bf0b64
      Linus Torvalds 提交于
      01bf0b64
    • R
      rmap: add exclusively owned pages to the newest anon_vma · e8a03feb
      Rik van Riel 提交于
      The recent anon_vma fixes cause many anonymous pages to end up
      in the parent process anon_vma, even when the page is exclusively
      owned by the current process.
      
      Adding exclusively owned anonymous pages to the top anon_vma
      reduces rmap scanning overhead, especially in workloads with
      forking servers.
      
      This patch adds a parameter to __page_set_anon_rmap that can
      be used to indicate whether or not the added page is exclusively
      owned by the current process.
      
      Pages added through page_add_new_anon_rmap are exclusively
      owned by the current process, and can be added to the top
      anon_vma.
      
      Pages added through page_add_anon_rmap can be either shared
      or exclusively owned, so we do the conservative thing and
      add it to the oldest anon_vma.
      
      A next step would be to add the exclusive parameter to
      page_add_anon_rmap, to be used from functions where we do
      know for sure whether a page is exclusively owned.
      Signed-off-by: NRik van Riel <riel@redhat.com>
      Reviewed-by: NJohannes Weiner <hannes@cmpxchg.org>
      Lightly-tested-by: NBorislav Petkov <bp@alien8.de>
      Reviewed-by: NMinchan Kim <minchan.kim@gmail.com>
      [ Edited to look nicer  - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e8a03feb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · 9b030e20
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        eCryptfs: Turn lower lookup error messages into debug messages
        eCryptfs: Copy lower directory inode times and size on link
        ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode
        ecryptfs: fix error code for missing xattrs in lower fs
        eCryptfs: Decrypt symlink target for stat size
        eCryptfs: Strip metadata in xattr flag in encrypted view
        eCryptfs: Clear buffer before reading in metadata xattr
        eCryptfs: Rename ecryptfs_crypt_stat.num_header_bytes_at_front
        eCryptfs: Fix metadata in xattr feature regression
      9b030e20
    • T
      eCryptfs: Turn lower lookup error messages into debug messages · 9f37622f
      Tyler Hicks 提交于
      Vaugue warnings about ENAMETOOLONG errors when looking up an encrypted
      file name have caused many users to become concerned about their data.
      Since this is a rather harmless condition, I'm moving this warning to
      only be printed when the ecryptfs_verbosity module param is 1.
      Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      9f37622f
    • T
      eCryptfs: Copy lower directory inode times and size on link · 3a8380c0
      Tyler Hicks 提交于
      The timestamps and size of a lower inode involved in a link() call was
      being copied to the upper parent inode.  Instead, we should be
      copying lower parent inode's timestamps and size to the upper parent
      inode.  I discovered this bug using the POSIX test suite at Tuxera.
      Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      3a8380c0
    • J
      ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode · 133b8f9d
      Jeff Mahoney 提交于
      Since tmpfs has no persistent storage, it pins all its dentries in memory
      so they have d_count=1 when other file systems would have d_count=0.
      ->lookup is only used to create new dentries. If the caller doesn't
      instantiate it, it's freed immediately at dput(). ->readdir reads
      directly from the dcache and depends on the dentries being hashed.
      
      When an ecryptfs mount is mounted, it associates the lower file and dentry
      with the ecryptfs files as they're accessed. When it's umounted and
      destroys all the in-memory ecryptfs inodes, it fput's the lower_files and
      d_drop's the lower_dentries. Commit 4981e081 added this and a d_delete in
      2008 and several months later commit caeeeecf removed the d_delete. I
      believe the d_drop() needs to be removed as well.
      
      The d_drop effectively hides any file that has been accessed via ecryptfs
      from the underlying tmpfs since it depends on it being hashed for it to
      be accessible. I've removed the d_drop on my development node and see no
      ill effects with basic testing on both tmpfs and persistent storage.
      
      As a side effect, after ecryptfs d_drops the dentries on tmpfs, tmpfs
      BUGs on umount. This is due to the dentries being unhashed.
      tmpfs->kill_sb is kill_litter_super which calls d_genocide to drop
      the reference pinning the dentry. It skips unhashed and negative dentries,
      but shrink_dcache_for_umount_subtree doesn't. Since those dentries
      still have an elevated d_count, we get a BUG().
      
      This patch removes the d_drop call and fixes both issues.
      
      This issue was reported at:
      https://bugzilla.novell.com/show_bug.cgi?id=567887Reported-by: NÁrpád Bíró <biroa@demasz.hu>
      Signed-off-by: NJeff Mahoney <jeffm@suse.com>
      Cc: Dustin Kirkland <kirkland@canonical.com>
      Cc: stable@kernel.org
      Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      133b8f9d
    • C
      ecryptfs: fix error code for missing xattrs in lower fs · cfce08c6
      Christian Pulvermacher 提交于
      If the lower file system driver has extended attributes disabled,
      ecryptfs' own access functions return -ENOSYS instead of -EOPNOTSUPP.
      This breaks execution of programs in the ecryptfs mount, since the
      kernel expects the latter error when checking for security
      capabilities in xattrs.
      Signed-off-by: NChristian Pulvermacher <pulvermacher@gmx.de>
      Cc: stable@kernel.org
      Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      cfce08c6
    • T
      eCryptfs: Decrypt symlink target for stat size · 3a60a168
      Tyler Hicks 提交于
      Create a getattr handler for eCryptfs symlinks that is capable of
      reading the lower target and decrypting its path.  Prior to this patch,
      a stat's st_size field would represent the strlen of the encrypted path,
      while readlink() would return the strlen of the decrypted path.  This
      could lead to confusion in some userspace applications, since the two
      values should be equal.
      
      https://bugs.launchpad.net/bugs/524919Reported-by: NLoïc Minier <loic.minier@canonical.com>
      Cc: stable@kernel.org
      Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      3a60a168
    • L
      Fix ISDN/Gigaset build failure · 76e506a7
      Linus Torvalds 提交于
      Commit b91ecb00 ("gigaset: include cleanup cleanup") removed an implicit
      sched.h inclusion that came in via slab.h, and caused various compile
      problems as a result.
      
      This should fix it.
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      76e506a7
  2. 19 4月, 2010 24 次提交
  3. 18 4月, 2010 2 次提交