1. 14 Sep, 2009 40 commits
    • Linus Torvalds's avatar
      Merge branch 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 4142e0d1
      Linus Torvalds authored
      * 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        fsync: wait for data writeout completion before calling ->fsync
        vfs: Remove generic_osync_inode() and sync_page_range{_nolock}()
        fat: Opencode sync_page_range_nolock()
        pohmelfs: Use new syncing helper
        xfs: Convert sync_page_range() to simple filemap_write_and_wait_range()
        ocfs2: Update syncing after splicing to match generic version
        ntfs: Use new syncing helpers and update comments
        ext4: Remove syncing logic from ext4_file_write
        ext3: Remove syncing logic from ext3_file_write
        ext2: Update comment about generic_osync_inode
        vfs: Introduce new helpers for syncing after writing to O_SYNC file or IS_SYNC inode
        vfs: Rename generic_file_aio_write_nolock
        ocfs2: Use __generic_file_aio_write instead of generic_file_aio_write_nolock
        pohmelfs: Use __generic_file_aio_write instead of generic_file_aio_write_nolock
        vfs: Remove syncing from generic_file_direct_write() and generic_file_buffered_write()
        vfs: Export __generic_file_aio_write() and add some comments
        vfs: Introduce filemap_fdatawait_range
      4142e0d1
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 33f1de69
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Whitespace fixes
        GFS2: Remove unused sysfs file
        GFS2: Be extra careful about deallocating inodes
        GFS2: Remove no_formal_ino generating code
        GFS2: Rename eattr.[ch] as xattr.[ch]
        GFS2: Clean up of extended attribute support
        GFS2: Add explanation of extended attr on-disk format
        GFS2: Add "-o errors=panic|withdraw" mount options
        GFS2: jumping to wrong label?
        GFS2: free disk inode which is deleted by remote node -V2
        GFS2: Add a document explaining GFS2's uevents
        GFS2: Add sysfs link to device
        GFS2: Replace assertion with proper error handling
        GFS2: Improve error handling in inode allocation
        GFS2: Add some more info to uevents
        GFS2: Add online uevent to GFS2
      33f1de69
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 041d6d0b
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        udf: Fix possible corruption when close races with write
        udf: Perform preallocation only for regular files
        udf: Remove wrong assignment in udf_symlink
        udf: Remove dead code
      041d6d0b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · af8cb8aa
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (21 commits)
        fs/Kconfig: move nilfs2 outside misc filesystems
        nilfs2: convert nilfs_bmap_lookup to an inline function
        nilfs2: allow btree code to directly call dat operations
        nilfs2: add update functions of virtual block address to dat
        nilfs2: remove individual gfp constants for each metadata file
        nilfs2: stop zero-fill of btree path just before free it
        nilfs2: remove unused btree argument from btree functions
        nilfs2: remove nilfs_dat_abort_start and nilfs_dat_abort_free
        nilfs2: shorten freeze period due to GC in write operation v3
        nilfs2: add more check routines in mount process
        nilfs2: An unassigned variable is assigned to a never used structure member
        nilfs2: use GFP_NOIO for bio_alloc instead of GFP_NOWAIT
        nilfs2: stop using periodic write_super callback
        nilfs2: clean up nilfs_write_super
        nilfs2: fix disorder of nilfs_write_super in nilfs_sync_fs
        nilfs2: remove redundant super block commit
        nilfs2: implement nilfs_show_options to display mount options in /proc/mounts
        nilfs2: always lookup disk block address before reading metadata block
        nilfs2: use semaphore to protect pointer to a writable FS-instance
        nilfs2: fix format string compile warning (ino_t)
        ...
      af8cb8aa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 6cdb5930
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: consolidate reconnect logic in smb_init routines
        cifs: Replace wrtPending with a real reference count
        cifs: protect GlobalOplock_Q with its own spinlock
        cifs: use tcon pointer in cifs_show_options
        cifs: send IPv6 addr in upcall with colon delimiters
        [CIFS] Fix checkpatch warnings
        PATCH] cifs: fix broken mounts when a SSH tunnel is used (try #4)
        [CIFS] Memory leak in ntlmv2 hash calculation
        [CIFS] potential NULL dereference in parse_DFS_referrals()
      6cdb5930
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · 99bc4706
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (21 commits)
        sparc64: Initial niagara2 perf counter support.
        sparc64: Perf counter 'nop' event is not constant.
        sparc64: Provide a way to specify a perf counter overflow IRQ enable bit.
        sparc64: Provide hypervisor tracing bit support for perf counters.
        sparc64: Initial hw perf counter support.
        sparc64: Implement a real set_perf_counter_pending().
        sparc64: Use nmi_enter() and nmi_exit(), as needed.
        sparc64: Provide extern decls for sparc_??u_type strings.
        sparc64: Make touch_nmi_watchdog() actually work.
        sparc64: Kill unnecessary cast in profile_timer_exceptions_notify().
        sparc64: Manage NMI watchdog enabling like x86.
        sparc: add basic support for 'perf'
        sparc: convert /proc/io_map, /proc/dvma_map to seq_file
        sparc, leon: sparc-leon specific SRMMU initialization and bootup fixes.
        sparc,leon: Added support for AMBAPP bus.
        sparc,leon: Introduce the sparc-leon CPU type.
        sparc,leon: Redefine MMU register access asi if CONFIG_LEON
        sparc,leon: CONFIG_SPARC_LEON option and leon specific files.
        sparc64: cheaper asm/uaccess.h inclusion
        SPARC: fix duplicate declaration
        ...
      99bc4706
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · d7e9660a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
        netxen: update copyright
        netxen: fix tx timeout recovery
        netxen: fix file firmware leak
        netxen: improve pci memory access
        netxen: change firmware write size
        tg3: Fix return ring size breakage
        netxen: build fix for INET=n
        cdc-phonet: autoconfigure Phonet address
        Phonet: back-end for autoconfigured addresses
        Phonet: fix netlink address dump error handling
        ipv6: Add IFA_F_DADFAILED flag
        net: Add DEVTYPE support for Ethernet based devices
        mv643xx_eth.c: remove unused txq_set_wrr()
        ucc_geth: Fix hangs after switching from full to half duplex
        ucc_geth: Rearrange some code to avoid forward declarations
        phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
        drivers/net/phy: introduce missing kfree
        drivers/net/wan: introduce missing kfree
        net: force bridge module(s) to be GPL
        Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
        ...
      
      Fixed up trivial conflicts:
      
       - arch/x86/include/asm/socket.h
      
         converted to <asm-generic/socket.h> in the x86 tree.  The generic
         header has the same new #define's, so that works out fine.
      
       - drivers/net/tun.c
      
         fix conflict between 89f56d1e ("tun: reuse struct sock fields") that
         switched over to using 'tun->socket.sk' instead of the redundantly
         available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
         to the TUN driver") which added a new 'tun->sk' use.
      
         Noted in 'next' by Stephen Rothwell.
      d7e9660a
    • Linus Torvalds's avatar
      Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · b8cb48aa
      Linus Torvalds authored
      * 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: split __phys_addr out into separate file
        xen: use stronger barrier after unlocking lock
        xen: only enable interrupts while actually blocking for spinlock
        xen: make -fstack-protector work under Xen
      b8cb48aa
    • Jan Kara's avatar
      udf: Fix possible corruption when close races with write · cbc8cc33
      Jan Kara authored
      When we close a file, we remove preallocated blocks from it. But this
      truncation was not protected by i_mutex and thus it could have raced with a
      write through a different fd and cause crashes or even filesystem corruption.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      cbc8cc33
    • Jan Kara's avatar
      udf: Perform preallocation only for regular files · 81056dd0
      Jan Kara authored
      So far we preallocated blocks also for directories but that brings a
      problem, when to get rid of preallocated blocks we don't need. So far
      we removed them in udf_clear_inode() which has a disadvantage that
      1) blocks are unavailable long after writing to a directory finished
         and thus one can get out of space unnecessarily early
      2) releasing blocks from udf_clear_inode is problematic because VFS
         does not expect us to redirty inode there and it also slows down
         memory reclaim.
      
      So preallocate blocks only for regular files where we can drop preallocation
      in udf_release_file.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      81056dd0
    • Jan Kara's avatar
      udf: Remove wrong assignment in udf_symlink · 7c6e3d1a
      Jan Kara authored
      Recomputation of the pointer was wrong (it should have been just increment).
      Luckily, we never use the computed value. Remove it.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      7c6e3d1a
    • Jan Kara's avatar
      udf: Remove dead code · 5891d9dd
      Jan Kara authored
      Remove code that gets never used.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      5891d9dd
    • Christoph Hellwig's avatar
      fsync: wait for data writeout completion before calling ->fsync · 2daea67e
      Christoph Hellwig authored
      Currenly vfs_fsync(_range) first calls filemap_fdatawrite to write out
      the data, the calls into ->fsync to write out the metadata and then finally
      calls filemap_fdatawait to wait for the data I/O to complete.  What sounds
      like a clever micro-optimization actually is nast trap for many filesystems.
      
      For many modern filesystems i_size or other inode information is only
      updated on I/O completion and we need to wait for I/O to finish before
      we can write out the metadata.  For old fashionen filesystems that
      instanciate blocks during the actual write and also update the metadata
      at that point it opens up a large window were we could expose uninitialized
      blocks after a crash.  While a few filesystems that need it already wait
      for the I/O to finish inside their ->fsync methods it is rather suboptimal
      as it is done under the i_mutex and also always for the whole file instead
      of just a part as we could do for O_SYNC handling.
      
      Here is a small audit of all fsync instances in the tree:
      
       - spufs_mfc_fsync:
       - ps3flash_fsync:
       - vol_cdev_fsync:
       - printer_fsync:
       - fb_deferred_io_fsync:
       - bad_file_fsync:
       - simple_sync_file:
      
      	don't care - filesystems/drivers do't use the page cache or are
      	purely in-memory.
      
       - simple_fsync:
       - file_fsync:
       - affs_file_fsync:
       - fat_file_fsync:
       - jfs_fsync:
       - ubifs_fsync:
       - reiserfs_dir_fsync:
       - reiserfs_sync_file:
      
      	never touch pagecache themselves.  We need to wait before if we do
      	not want to expose stale data after an allocation.
      
       - afs_fsync:
       - fuse_fsync_common:
      
      	do the waiting writeback itself in awkward ways, would benefit from
      	proper semantics
      
       - block_fsync:
      
      	Does a filemap_write_and_wait on the block device inode.  Because we
      	now have f_mapping that is the same inode we call it on in vfs_fsync.
      	So just removing it and letting the VFS do the work in one go would
      	be an improvement.
      
       - btrfs_sync_file:
       - cifs_fsync:
       - xfs_file_fsync:
      
      	need the wait first and currently do it themselves. would benefit from
      	doing it outside i_mutex.
      
       - coda_fsync:
       - ecryptfs_fsync:
       - exofs_file_fsync:
       - shm_fsync:
      
      	only passes the fsync through to the lower layer
      
       - ext3_sync_file:
      
      	doesn't seem to care, comments are confusing.
      
       - ext4_sync_file:
      
      	would need the wait to work correctly for delalloc mode with late
      	i_size updates.  Otherwise the ext3 comment applies.
      
      	currently implemens it's own writeback and wait in an odd way,
      	could benefit from doing it properly.
      
       - gfs2_fsync:
      
      	not needed for journaled data mode, but probably harmless there.
      	Currently writes back data asynchronously itself.  Needs some
      	major audit.
      
       - hostfs_fsync:
      
      	just calls fsync/datasync on the host FD.  Without the wait before
      	data might not even be inflight yet if we're unlucky.
      
       - hpfs_file_fsync:
       - ncp_fsync:
      
      	no-ops.  Dangerous before and after.
      
       - jffs2_fsync:
      
      	just calls jffs2_flush_wbuf_gc, not sure how this relates to data.
      
       - nfs_fsync_dir:
      
      	just increments stats, claims all directory operations are synchronous
      
       - nfs_file_fsync:
      
      	only writes out data???  Looks very odd.
      
       - nilfs_sync_file:
      
      	looks like it expects all data done, but not sure from the code
      
       - ntfs_dir_fsync:
       - ntfs_file_fsync:
      
      	appear to do their own data writeback.  Very convoluted code.
      
       - ocfs2_sync_file:
      
      	does it's own data writeback, but no wait.  probably needs the wait.
      
       - smb_fsync:
      
      	according to a comment expects all pages written already, probably needs
      	the wait before.
      
      This patch only changes vfs_fsync_range, removal of the wait in the methods
      that have it is left to the filesystem maintainers.  Note that most
      filesystems really do need an audit for their fsync methods given the
      gems found in this very brief audit.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      2daea67e
    • Jan Kara's avatar
      vfs: Remove generic_osync_inode() and sync_page_range{_nolock}() · 18f2ee70
      Jan Kara authored
      Remove these three functions since nobody uses them anymore.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      18f2ee70
    • Jan Kara's avatar
      fat: Opencode sync_page_range_nolock() · 2f3d675b
      Jan Kara authored
      fat_cont_expand() is the only user of sync_page_range_nolock(). It's also the
      only user of generic_osync_inode() which does not have a file open.  So
      opencode needed actions for FAT so that we can convert generic_osync_inode() to
      a standard syncing path.
      
      Update a comment about generic_osync_inode().
      
      CC: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      2f3d675b
    • Jan Kara's avatar
      pohmelfs: Use new syncing helper · aa3caafe
      Jan Kara authored
      Use new generic_write_sync() helper instead of sync_page_range().
      Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      aa3caafe
    • Jan Kara's avatar
      xfs: Convert sync_page_range() to simple filemap_write_and_wait_range() · af0f4414
      Jan Kara authored
      Christoph Hellwig says that it is enough for XFS to call
      filemap_write_and_wait_range() instead of sync_page_range() because we do
      all the metadata syncing when forcing the log.
      
      CC: Felix Blyakher <felixb@sgi.com>
      CC: xfs@oss.sgi.com
      CC: Christoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      af0f4414
    • Jan Kara's avatar
      ocfs2: Update syncing after splicing to match generic version · d23c937b
      Jan Kara authored
      Update ocfs2 specific splicing code to use generic syncing helper. The sync now
      does not happen under rw_lock because generic_write_sync() acquires i_mutex
      which ranks above rw_lock. That should not matter because standard fsync path
      does not hold it either.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Acked-by: default avatarMark Fasheh <mfasheh@suse.com>
      CC: ocfs2-devel@oss.oracle.com
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      d23c937b
    • Jan Kara's avatar
      ntfs: Use new syncing helpers and update comments · ebbbf757
      Jan Kara authored
      Use new syncing helpers in .write and .aio_write functions. Also
      remove superfluous syncing in ntfs_file_buffered_write() and update
      comments about generic_osync_inode().
      
      CC: Anton Altaparmakov <aia21@cantab.net>
      CC: linux-ntfs-dev@lists.sourceforge.net
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      ebbbf757
    • Jan Kara's avatar
      ext4: Remove syncing logic from ext4_file_write · 0d34ec62
      Jan Kara authored
      The syncing is now properly handled by generic_file_aio_write() so
      no special ext4 code is needed.
      
      CC: linux-ext4@vger.kernel.org
      CC: tytso@mit.edu
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      0d34ec62
    • Jan Kara's avatar
      ext3: Remove syncing logic from ext3_file_write · e367626b
      Jan Kara authored
      Syncing is now properly done by generic_file_aio_write() so no special logic is
      needed in ext3.
      
      CC: linux-ext4@vger.kernel.org
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      e367626b
    • Jan Kara's avatar
      ext2: Update comment about generic_osync_inode · a2a735ad
      Jan Kara authored
      We rely on generic_write_sync() now.
      
      CC: linux-ext4@vger.kernel.org
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      a2a735ad
    • Jan Kara's avatar
      vfs: Introduce new helpers for syncing after writing to O_SYNC file or IS_SYNC inode · 148f948b
      Jan Kara authored
      Introduce new function for generic inode syncing (vfs_fsync_range) and use
      it from fsync() path. Introduce also new helper for syncing after a sync
      write (generic_write_sync) using the generic function.
      
      Use these new helpers for syncing from generic VFS functions. This makes
      O_SYNC writes to block devices acquire i_mutex for syncing. If we really
      care about this, we can make block_fsync() drop the i_mutex and reacquire
      it before it returns.
      
      CC: Evgeniy Polyakov <zbr@ioremap.net>
      CC: ocfs2-devel@oss.oracle.com
      CC: Joel Becker <joel.becker@oracle.com>
      CC: Felix Blyakher <felixb@sgi.com>
      CC: xfs@oss.sgi.com
      CC: Anton Altaparmakov <aia21@cantab.net>
      CC: linux-ntfs-dev@lists.sourceforge.net
      CC: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
      CC: linux-ext4@vger.kernel.org
      CC: tytso@mit.edu
      Acked-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      148f948b
    • Christoph Hellwig's avatar
      vfs: Rename generic_file_aio_write_nolock · eef99380
      Christoph Hellwig authored
      generic_file_aio_write_nolock() is now used only by block devices and raw
      character device. Filesystems should use __generic_file_aio_write() in case
      generic_file_aio_write() doesn't suit them. So rename the function to
      blkdev_aio_write() and move it to fs/blockdev.c.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      eef99380
    • Jan Kara's avatar
      ocfs2: Use __generic_file_aio_write instead of generic_file_aio_write_nolock · 918941a3
      Jan Kara authored
      Use the new helper. We have to submit data pages ourselves in case of O_SYNC
      write because __generic_file_aio_write does not do it for us. OCFS2 developpers
      might think about moving the sync out of i_mutex which seems to be easily
      possible but that's out of scope of this patch.
      
      CC: ocfs2-devel@oss.oracle.com
      Acked-by: default avatarJoel Becker <joel.becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      918941a3
    • Jan Kara's avatar
      pohmelfs: Use __generic_file_aio_write instead of generic_file_aio_write_nolock · b04f9321
      Jan Kara authored
      Use new helper __generic_file_aio_write(). Since the fs takes care of syncing
      by itself afterwards, there are no more changes needed.
      
      CC: Evgeniy Polyakov <zbr@ioremap.net>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      b04f9321
    • Jan Kara's avatar
      vfs: Remove syncing from generic_file_direct_write() and generic_file_buffered_write() · c7b50db2
      Jan Kara authored
      generic_file_direct_write() and generic_file_buffered_write() called
      generic_osync_inode() if it was called on O_SYNC file or IS_SYNC inode. But
      this is superfluous since generic_file_aio_write() does the syncing as well.
      Also XFS and OCFS2 which call these functions directly handle syncing
      themselves. So let's have a single place where syncing happens:
      generic_file_aio_write().
      
      We slightly change the behavior by syncing only the range of file to which the
      write happened for buffered writes but that should be all that is required.
      
      CC: ocfs2-devel@oss.oracle.com
      CC: Joel Becker <joel.becker@oracle.com>
      CC: Felix Blyakher <felixb@sgi.com>
      CC: xfs@oss.sgi.com
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      c7b50db2
    • Jan Kara's avatar
      vfs: Export __generic_file_aio_write() and add some comments · e4dd9de3
      Jan Kara authored
      Rename __generic_file_aio_write_nolock() to __generic_file_aio_write(), add
      comments to write helpers explaining how they should be used and export
      __generic_file_aio_write() since it will be used by some filesystems.
      
      CC: ocfs2-devel@oss.oracle.com
      CC: Joel Becker <joel.becker@oracle.com>
      Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      e4dd9de3
    • Jan Kara's avatar
      vfs: Introduce filemap_fdatawait_range · d3bccb6f
      Jan Kara authored
      This simple helper saves some filesystems conversion from byte offset
      to page numbers and also makes the fdata* interface more complete.
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      d3bccb6f
    • Linus Torvalds's avatar
      Merge branch 'x86-setup-for-linus' of... · 0cc6d77e
      Linus Torvalds authored
      Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, e820: Guard against array overflowed in __e820_add_region()
        x86, setup: remove obsolete pre-Kconfig CONFIG_VIDEO_ variables
      0cc6d77e
    • Linus Torvalds's avatar
      Merge branch 'x86-percpu-for-linus' of... · 55e0715f
      Linus Torvalds authored
      Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, percpu: Collect hot percpu variables into one cacheline
        x86, percpu: Fix DECLARE/DEFINE_PER_CPU_PAGE_ALIGNED()
        x86, percpu: Add 'percpu_read_stable()' interface for cacheable accesses
      55e0715f
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 7dfd54a9
      Linus Torvalds authored
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, highmem_32.c: Clean up comment
        x86, pgtable.h: Clean up types
        x86: Clean up dump_pagetable()
      7dfd54a9
    • Linus Torvalds's avatar
      Merge branch 'x86-kbuild-for-linus' of... · 6512c0d6
      Linus Torvalds authored
      Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Simplify the Makefile in a minor way through use of cc-ifversion
      6512c0d6
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 625037cc
      Linus Torvalds authored
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86-64: move clts into batch cpu state updates when preloading fpu
        x86-64: move unlazy_fpu() into lazy cpu state part of context switch
        x86-32: make sure clts is batched during context switch
        x86: split out core __math_state_restore
      625037cc
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of... · 8fafa0a7
      Linus Torvalds authored
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Decrease the level of some NUMA messages to KERN_DEBUG
      8fafa0a7
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · c7208de3
      Linus Torvalds authored
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits)
        x86: Fix code patching for paravirt-alternatives on 486
        x86, msr: change msr-reg.o to obj-y, and export its symbols
        x86: Use hard_smp_processor_id() to get apic id for AMD K8 cpus
        x86, sched: Workaround broken sched domain creation for AMD Magny-Cours
        x86, mcheck: Use correct cpumask for shared bank4
        x86, cacheinfo: Fixup L3 cache information for AMD multi-node processors
        x86: Fix CPU llc_shared_map information for AMD Magny-Cours
        x86, msr: Fix msr-reg.S compilation with gas 2.16.1, on 32-bit too
        x86: Move kernel_fpu_using to irq_fpu_usable in asm/i387.h
        x86, msr: fix msr-reg.S compilation with gas 2.16.1
        x86, msr: Export the register-setting MSR functions via /dev/*/msr
        x86, msr: Create _on_cpu helpers for {rw,wr}msr_safe_regs()
        x86, msr: Have the _safe MSR functions return -EIO, not -EFAULT
        x86, msr: CFI annotations, cleanups for msr-reg.S
        x86, asm: Make _ASM_EXTABLE() usable from assembly code
        x86, asm: Add 32-bit versions of the combined CFI macros
        x86, AMD: Disable wrongly set X86_FEATURE_LAHF_LM CPUID bit
        x86, msr: Rewrite AMD rd/wrmsr variants
        x86, msr: Add rd/wrmsr interfaces with preset registers
        x86: add specific support for Intel Atom architecture
        ...
      c7208de3
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of... · 15b04042
      Linus Torvalds authored
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Make memtype_seq_ops const
        x86: uv: Clean up uv_ptc_init(), use proc_create()
        x86: Use printk_once()
        x86/cpu: Clean up various files a bit
        x86: Remove duplicated #include
        x86, ipi: Clean up safe_smp_processor_id() by using the cpu_has_apic() macro helper
        x86: Clean up idt_descr and idt_tableby using NR_VECTORS instead of hardcoded number
        x86: Further clean up of mtrr/generic.c
        x86: Clean up mtrr/main.c
        x86: Clean up mtrr/state.c
        x86: Clean up mtrr/mtrr.h
        x86: Clean up mtrr/if.c
        x86: Clean up mtrr/generic.c
        x86: Clean up mtrr/cyrix.c
        x86: Clean up mtrr/cleanup.c
        x86: Clean up mtrr/centaur.c
        x86: Clean up mtrr/amd.c:
        x86: ds.c fix invalid assignment
      15b04042
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-generic-for-linus' of... · 9b74aec0
      Linus Torvalds authored
      Merge branch 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: remove all now-duplicate header files
        x86: convert termios.h to the asm-generic version
        x86: convert almost generic headers to asm-generic version
        x86: convert trivial headers to asm-generic version
        x86: add copies of some headers to convert to asm-generic
      9b74aec0
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · b581af51
      Linus Torvalds authored
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86/i386: Put aligned stack-canary in percpu shared_aligned section
        x86/i386: Make sure stack-protector segment base is cache aligned
        x86: Detect stack protector for i386 builds on x86_64
        x86: allow "=rm" in native_save_fl()
        x86: properly annotate alternatives.c
        x86: Introduce GDT_ENTRY_INIT(), initialize bad_bios_desc statically
        x86, 32-bit: Use generic sys_pipe()
        x86: Introduce GDT_ENTRY_INIT(), fix APM
        x86: Introduce GDT_ENTRY_INIT()
        x86: Introduce set_desc_base() and set_desc_limit()
        x86: Remove unused patch_espfix_desc()
        x86: Use get_desc_base()
      b581af51
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of... · ffaf854b
      Linus Torvalds authored
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
        ACPI, x86: expose some IO-APIC routines when CONFIG_ACPI=n
        x86, apic: Slim down stack usage in early_init_lapic_mapping()
        x86, ioapic: Get rid of needless check and simplify ioapic_setup_resources()
        x86, ioapic: Define IO_APIC_DEFAULT_PHYS_BASE constant
        x86: Fix x86_model test in es7000_apic_is_cluster()
        x86, apic: Move dmar_table_init() out of enable_IR()
        x86, ioapic: Panic on irq-pin binding only if needed
        x86/apic: Enable x2APIC without interrupt remapping under KVM
        x86, apic: Drop redundant bit assignment
        x86, ioapic: Throw BUG instead of NULL dereference
        x86, ioapic: Introduce for_each_irq_pin() helper
        x86: Remove superfluous NULL pointer check in destroy_irq()
        x86/ioapic.c: unify ioapic_retrigger_irq()
        x86/ioapic.c: convert __target_IO_APIC_irq to conventional for() loop
        x86/ioapic.c: clean up replace_pin_at_irq_node logic and comments
        x86/ioapic.c: convert replace_pin_at_irq_node to conventional for() loop
        x86/ioapic.c: simplify add_pin_to_irq_node()
        x86/ioapic.c: convert io_apic_level_ack_pending loop to normal for() loop
        x86/ioapic.c: move lost comment to what seems like appropriate place
        x86/ioapic.c: remove redundant declaration of irq_pin_list
        ...
      ffaf854b