1. 29 12月, 2008 40 次提交
    • T
      block: remove duplicate or unused barrier/discard error paths · a7384677
      Tejun Heo 提交于
      * Because barrier mode can be changed dynamically, whether barrier is
        supported or not can be determined only when actually issuing the
        barrier and there is no point in checking it earlier.  Drop barrier
        support check in generic_make_request() and __make_request(), and
        update comment around the support check in blk_do_ordered().
      
      * There is no reason to check discard support in both
        generic_make_request() and __make_request().  Drop the check in
        __make_request().  While at it, move error action block to the end
        of the function and add unlikely() to q existence test.
      
      * Barrier request, be it empty or not, is never passed to low level
        driver and thus it's meaningless to try to copy back req->sector to
        bio->bi_sector on error.  In addition, the notion of failed sector
        doesn't make any sense for empty barrier to begin with.  Drop the
        code block from __end_that_request_first().
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      a7384677
    • T
      block: reorganize QUEUE_ORDERED_* constants · 313e4299
      Tejun Heo 提交于
      Separate out ordering type (drain,) and action masks (preflush,
      postflush, fua) from visible ordering mode selectors
      (QUEUE_ORDERED_*).  Ordering types are now named QUEUE_ORDERED_BY_*
      while action masks are named QUEUE_ORDERED_DO_*.
      
      This change is necessary to add QUEUE_ORDERED_DO_BAR and make it
      optional to improve empty barrier implementation.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      313e4299
    • R
      block: reorder struct bio to remove padding on 64bit · ba744d5e
      Richard Kennedy 提交于
      Remove 8 bytes of padding from struct bio which also removes 16 bytes from
      struct bio_pair to make it 248 bytes.  bio_pair then fits into one fewer
      cache lines & into a smaller slab.
      Signed-off-by: NRichard Kennedy <richard@rsk.demon.co.uk>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      ba744d5e
    • C
      block: use cancel_work_sync() instead of kblockd_flush_work() · 64d01dc9
      Cheng Renquan 提交于
      After many improvements on kblockd_flush_work, it is now identical to
      cancel_work_sync, so a direct call to cancel_work_sync is suggested.
      
      The only difference is that cancel_work_sync is a GPL symbol,
      so no non-GPL modules anymore.
      Signed-off-by: NCheng Renquan <crquan@gmail.com>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      64d01dc9
    • K
      block: Supress Buffer I/O errors when SCSI REQ_QUIET flag set · 08bafc03
      Keith Mannthey 提交于
      Allow the scsi request REQ_QUIET flag to be propagated to the buffer
      file system layer. The basic ideas is to pass the flag from the scsi
      request to the bio (block IO) and then to the buffer layer.  The buffer
      layer can then suppress needless printks.
      
      This patch declutters the kernel log by removed the 40-50 (per lun)
      buffer io error messages seen during a boot in my multipath setup . It
      is a good chance any real errors will be missed in the "noise" it the
      logs without this patch.
      
      During boot I see blocks of messages like
      "
      __ratelimit: 211 callbacks suppressed
      Buffer I/O error on device sdm, logical block 5242879
      Buffer I/O error on device sdm, logical block 5242879
      Buffer I/O error on device sdm, logical block 5242847
      Buffer I/O error on device sdm, logical block 1
      Buffer I/O error on device sdm, logical block 5242878
      Buffer I/O error on device sdm, logical block 5242879
      Buffer I/O error on device sdm, logical block 5242879
      Buffer I/O error on device sdm, logical block 5242879
      Buffer I/O error on device sdm, logical block 5242879
      Buffer I/O error on device sdm, logical block 5242872
      "
      in my logs.
      
      My disk environment is multipath fiber channel using the SCSI_DH_RDAC
      code and multipathd.  This topology includes an "active" and "ghost"
      path for each lun. IO's to the "ghost" path will never complete and the
      SCSI layer, via the scsi device handler rdac code, quick returns the IOs
      to theses paths and sets the REQ_QUIET scsi flag to suppress the scsi
      layer messages.
      
       I am wanting to extend the QUIET behavior to include the buffer file
      system layer to deal with these errors as well. I have been running this
      patch for a while now on several boxes without issue.  A few runs of
      bonnie++ show no noticeable difference in performance in my setup.
      
      Thanks for John Stultz for the quiet_error finalization.
      Submitted-by: NKeith Mannthey <kmannth@us.ibm.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      08bafc03
    • W
      block: don't take lock on changing ra_pages · 7c239517
      Wu Fengguang 提交于
      There's no need to take queue_lock or kernel_lock when modifying
      bdi->ra_pages. So remove them. Also remove out of date comment for
      queue_max_sectors_store().
      Signed-off-by: NWu Fengguang <wfg@linux.intel.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      7c239517
    • N
      Documentation: remove reference to ll_rw_blk.c and moved drivers/block/elevator.c · 42364690
      Nikanth Karthikesan 提交于
      The drivers/block/ll_rw_block.c has been split and organized in the block/
      directory, and also drivers/block/elevator.c has been moved to the block/
      directory. Update Documentation/block/biodoc.txt accordingly
      Signed-off-by: NNikanth Karthikesan <knikanth@suse.de>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      42364690
    • Q
      block/blk-tag.c: cleanup kernel-doc · c6a06f70
      Qinghuang Feng 提交于
      There is no argument named @tags in blk_init_tags,
      remove its' comment.
      Signed-off-by: NQinghuang Feng <qhfeng.kernel@gmail.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      c6a06f70
    • J
      cciss: switch to using hlist for command list management · 8a3173de
      Jens Axboe 提交于
      This both cleans up the code and also helps detect the spurious case
      of a command attempted being removed from a queue it doesn't belong
      to.
      Acked-by: NMike Miller <mike.miller@hp.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      8a3173de
    • N
      Do not free io context when taking recursive faults in do_exit · 7c0990c7
      Nikanth Karthikesan 提交于
      When taking recursive faults in do_exit, if the io_context is not null,
      exit_io_context() is being called. But it might decrement the refcount
      more than once. It is better to leave this task alone.
      Signed-off-by: NNikanth Karthikesan <knikanth@suse.de>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      7c0990c7
    • M
      cdrom: reduce stack usage of mmc_ioctl_dvd_read_struct · d194139c
      Marcin Slusarz 提交于
      1. kmalloc 192 bytes in dvd_read_bca (which is inlined into dvd_read_struct)
      2. Pass struct packet_command to all dvd_read_* functions.
      
      Checkstack output:
      Before: mmc_ioctl_dvd_read_struct:         280
      After:  mmc_ioctl_dvd_read_struct:         56
      Signed-off-by: NMarcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      d194139c
    • M
      cdrom: split mmc_ioctl to lower stack usage · 3147c531
      Marcin Slusarz 提交于
      Checkstack output:
      
      Before:
      mmc_ioctl:                  584
      
      After:
      mmc_ioctl_dvd_read_struct:  280
      mmc_ioctl_cdrom_subchannel: 152
      mmc_ioctl_cdrom_read_data:  120
      mmc_ioctl_cdrom_volume:     104
      mmc_ioctl_cdrom_read_audio: 104
      (mmc_ioctl is inlined into cdrom_ioctl - 104 bytes)
      Signed-off-by: NMarcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      3147c531
    • M
      scsi-ioctl: use clock_t <> jiffies · 2b91bafc
      Milton Miller 提交于
      Convert the timeout ioctl scalling to use the clock_t functions
      which are much more accurate with some USER_HZ vs HZ combinations.
      Signed-off-by: NMilton Miller <miltonm@bga.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      2b91bafc
    • J
      block: leave the request timeout timer running even on an empty list · 70ed28b9
      Jens Axboe 提交于
      For sync IO, we'll often do them serialized. This means we'll be touching
      the queue timer for every IO, as opposed to only occasionally like we
      do for queued IO. Instead of deleting the timer when the last request
      is removed, just let continue running. If a new request comes up soon
      we then don't have to readd the timer again. If no new requests arrive,
      the timer will expire without side effect later.
      
      This improves high iops sync IO by ~1%.
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      70ed28b9
    • J
    • M
      block: optimizations in blk_rq_timed_out_timer() · 565e411d
      malahal@us.ibm.com 提交于
      Now the rq->deadline can't be zero if the request is in the
      timeout_list, so there is no need to have next_set. There is no need to
      access a request's deadline field if blk_rq_timed_out is called on it.
      Signed-off-by: NMalahal Naineni <malahal@us.ibm.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      565e411d
    • F
      xen-blkfront: set queue paravirt flag · 66d352e1
      Fernando Luis Vázquez Cao 提交于
      Xen's blkfront sets noop as the default I/O scheduler at initialization
      time to avoid elevator overheads such as idling, but with the advent of
      basic disk profiling capabilities this is not necessary anymore. We
      should just tell the block layer that we are a paravirt front-end driver
      and the elevator will automatically make the necessary adjustments.
      Signed-off-by: NFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      66d352e1
    • F
      virtio_blk: set queue paravirt flag · 7d116b62
      Fernando Luis Vázquez Cao 提交于
      As a paravirt front-end driver, virtio_blk is not a rotational device so
      we want do avoid idling in AS/CFQ. Tell the block layer about this.
      Signed-off-by: NFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      7d116b62
    • F
      block: add queue flag for paravirt frontend drivers · 88e740f1
      Fernando Luis Vázquez Cao 提交于
      As is the case with SSD devices, we do not want to idle in AS/CFQ when
      the block device is a paravirt front-end driver. This patch adds a flag
      (QUEUE_FLAG_VIRT) which should be used by front-end drivers such as
      virtio_blk and xen-blkfront to indicate a paravirtualized device.
      Signed-off-by: NFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      88e740f1
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 3c92ec8a
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
        powerpc/44x: Support 16K/64K base page sizes on 44x
        powerpc: Force memory size to be a multiple of PAGE_SIZE
        powerpc/32: Wire up the trampoline code for kdump
        powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
        powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
        powerpc/32: Setup OF properties for kdump
        powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
        powerpc: Prepare xmon_save_regs for use with kdump
        powerpc: Remove default kexec/crash_kernel ops assignments
        powerpc: Make default kexec/crash_kernel ops implicit
        powerpc: Setup OF properties for ppc32 kexec
        powerpc/pseries: Fix cpu hotplug
        powerpc: Fix KVM build on ppc440
        powerpc/cell: add QPACE as a separate Cell platform
        powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
        powerpc/mpc5200: fix error paths in PSC UART probe function
        powerpc/mpc5200: add rts/cts handling in PSC UART driver
        powerpc/mpc5200: Make PSC UART driver update serial errors counters
        powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
        powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
        ...
      
      Fix trivial conflict in drivers/char/Makefile as per Paul's directions
      3c92ec8a
    • S
      net: ehea NAPI interface cleanup fix · c4c9f018
      Stephen Rothwell 提交于
      Commit 908a7a16 ("net: Remove unused
      netdev arg from some NAPI interfaces") missed two spots.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c4c9f018
    • S
    • L
      Merge branch 'for-linus' of... · d05a788f
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
        smackfs: check for allocation failures in smk_set_access()
      d05a788f
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next · 96faec94
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (25 commits)
        allow stripping of generated symbols under CONFIG_KALLSYMS_ALL
        kbuild: strip generated symbols from *.ko
        kbuild: simplify use of genksyms
        kernel-doc: check for extra kernel-doc notations
        kbuild: add headerdep used to detect inclusion cycles in header files
        kbuild: fix string equality testing in tags.sh
        kbuild: fix make tags/cscope
        kbuild: fix make incompatibility
        kbuild: remove TAR_IGNORE
        setlocalversion: add git-svn support
        setlocalversion: print correct subversion revision
        scripts: improve the decodecode script
        scripts/package: allow custom options to rpm
        genksyms: allow to ignore symbol checksum changes
        genksyms: track symbol checksum changes
        tags and cscope support really belongs in a shell script
        kconfig: fix options to check-lxdialog.sh
        kbuild: gen_init_cpio expands shell variables in file names
        remove bashisms from scripts/extract-ikconfig
        kbuild: teach mkmakfile to be silent
        ...
      96faec94
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram · 29263285
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram:
        [PATCH] nvram - convert PRINT_PROC to seq_file
        [PATCH] nvram - CodingStyle
      29263285
    • J
      Merge branch 'next' into for-linus · 54d2f649
      James Morris 提交于
      54d2f649
    • I
      powerpc/44x: Support 16K/64K base page sizes on 44x · ca9153a3
      Ilya Yanok 提交于
      This adds support for 16k and 64k page sizes on PowerPC 44x processors.
      
      The PGDIR table is much smaller than a page when using 16k or 64k
      pages (512 and 32 bytes respectively) so we allocate the PGDIR with
      kzalloc() instead of __get_free_pages().
      
      One PTE table covers rather a large memory area when using 16k or 64k
      pages (32MB or 512MB respectively), so we can easily put FIXMAP and
      PKMAP in the area covered by one PTE table.
      Signed-off-by: NYuri Tikhonov <yur@emcraft.com>
      Signed-off-by: NVladimir Panfilov <pvr@emcraft.com>
      Signed-off-by: NIlya Yanok <yanok@emcraft.com>
      Acked-by: NJosh Boyer <jwboyer@linux.vnet.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      ca9153a3
    • H
      powerpc: Force memory size to be a multiple of PAGE_SIZE · 6ca4f749
      Hollis Blanchard 提交于
      Ensure that total memory size is page-aligned, because otherwise
      mark_bootmem() gets upset.
      
      This error case was triggered by using 64 KiB pages in the kernel
      while arch/powerpc/boot/4xx.c arbitrarily reduced the amount of memory
      by 4096 (to work around a chip bug that affects the last 256 bytes of
      physical memory).
      Signed-off-by: NHollis Blanchard <hollisb@us.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6ca4f749
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 541ef5cb
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: use the new byteorder headers
        fbcon: Protect free_irq() by MACH_IS_ATARI check
        fbcon: remove broken mac vbl handler
        m68k: fix trigraph ignored warning in setox.S
        macfb annotations and compiler warning fix
        m68k: mac baboon interrupt enable/disable
        m68k: machw.h cleanup
        m68k: Mac via cleanup and commentry
        m68k: Reinstate mac rtc
      541ef5cb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 0191b625
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
        net: Allow dependancies of FDDI & Tokenring to be modular.
        igb: Fix build warning when DCA is disabled.
        net: Fix warning fallout from recent NAPI interface changes.
        gro: Fix potential use after free
        sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
        sfc: When disabling the NIC, close the device rather than unregistering it
        sfc: SFT9001: Add cable diagnostics
        sfc: Add support for multiple PHY self-tests
        sfc: Merge top-level functions for self-tests
        sfc: Clean up PHY mode management in loopback self-test
        sfc: Fix unreliable link detection in some loopback modes
        sfc: Generate unique names for per-NIC workqueues
        802.3ad: use standard ethhdr instead of ad_header
        802.3ad: generalize out mac address initializer
        802.3ad: initialize ports LACPDU from const initializer
        802.3ad: remove typedef around ad_system
        802.3ad: turn ports is_individual into a bool
        802.3ad: turn ports is_enabled into a bool
        802.3ad: make ntt bool
        ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
        ...
      
      Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
      to the conversion to %pI (in this networking merge) and the addition of
      doing IPv6 addresses (from the earlier merge of CIFS).
      0191b625
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 54a696bd
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (31 commits)
        [CIFS] Remove redundant test
        [CIFS] make sure that DFS pathnames are properly formed
        Remove an already-checked error condition in SendReceiveBlockingLock
        Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
        Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
        [CIFS] Streamline SendReceive[2] by using "goto out:" in an error condition
        Slightly streamline SendReceive[2]
        Check the return value of cifs_sign_smb[2]
        [CIFS] Cleanup: Move the check for too large R/W requests
        [CIFS] Slightly simplify wait_for_free_request(), remove an unnecessary "else" branch
        Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
        [CIFS] In SendReceive, move consistency check out of the mutexed region
        cifs: store password in tcon
        cifs: have calc_lanman_hash take more granular args
        cifs: zero out session password before freeing it
        cifs: fix wait_for_response to time out sleeping processes correctly
        [CIFS] Can not mount with prefixpath if root directory of share is inaccessible
        [CIFS] various minor cleanups pointed out by checkpatch script
        [CIFS] fix typo
        [CIFS] remove sparse warning
        ...
      
      Fix trivial conflict in fs/cifs/cifs_fs_sb.h due to comment changes for
      the CIFS_MOUNT_xyz bit definitions between cifs updates and security
      updates.
      54a696bd
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 1d248b25
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
        IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize
        RDMA/nes: Remove tx_free_list
        RDMA/cma: Add IPv6 support
        RDMA/addr: Add support for translating IPv6 addresses
        mlx4_core: Delete incorrect comment
        mlx4_core: Add support for multiple completion event vectors
        IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
        IB/ehca: Remove redundant test of vpage
        IB/ehca: Replace modulus operations in flush error completion path
        IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
        IB/ipath: Fix spi_pioindex value
        IB/ipath: Only do 1X workaround on rev1 chips
        IB/ipath: Don't count IB symbol and link errors unless link is UP
        IB/ipath: Check return value of dma_map_single()
        IB/ipath: Fix PSN of send WQEs after an RDMA read resend
        RDMA/nes: Cleanup warnings
        RDMA/nes: Add loopback check to make_cm_node()
        RDMA/nes: Check cqp_avail_reqs is empty after locking the list
        RDMA/nes: Fix TCP compliance test failures
        RDMA/nes: Forward packets for a new connection with stale APBVT entry
        ...
      1d248b25
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 1db2a5c1
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (85 commits)
        [S390] provide documentation for hvc_iucv kernel parameter.
        [S390] convert ctcm printks to dev_xxx and pr_xxx macros.
        [S390] convert zfcp printks to pr_xxx macros.
        [S390] convert vmlogrdr printks to pr_xxx macros.
        [S390] convert zfcp dumper printks to pr_xxx macros.
        [S390] convert cpu related printks to pr_xxx macros.
        [S390] convert qeth printks to dev_xxx and pr_xxx macros.
        [S390] convert sclp printks to pr_xxx macros.
        [S390] convert iucv printks to dev_xxx and pr_xxx macros.
        [S390] convert ap_bus printks to pr_xxx macros.
        [S390] convert dcssblk and extmem printks messages to pr_xxx macros.
        [S390] convert monwriter printks to pr_xxx macros.
        [S390] convert s390 debug feature printks to pr_xxx macros.
        [S390] convert monreader printks to pr_xxx macros.
        [S390] convert appldata printks to pr_xxx macros.
        [S390] convert setup printks to pr_xxx macros.
        [S390] convert hypfs printks to pr_xxx macros.
        [S390] convert time printks to pr_xxx macros.
        [S390] convert cpacf printks to pr_xxx macros.
        [S390] convert cio printks to pr_xxx macros.
        ...
      1db2a5c1
    • L
      Merge branch 'sched-core-for-linus' of... · a39b8633
      Linus Torvalds 提交于
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
        sched: fix warning in fs/proc/base.c
        schedstat: consolidate per-task cpu runtime stats
        sched: use RCU variant of list traversal in for_each_leaf_rt_rq()
        sched, cpuacct: export percpu cpuacct cgroup stats
        sched, cpuacct: refactoring cpuusage_read / cpuusage_write
        sched: optimize update_curr()
        sched: fix wakeup preemption clock
        sched: add missing arch_update_cpu_topology() call
        sched: let arch_update_cpu_topology indicate if topology changed
        sched: idle_balance() does not call load_balance_newidle()
        sched: fix sd_parent_degenerate on non-numa smp machine
        sched: add uid information to sched_debug for CONFIG_USER_SCHED
        sched: move double_unlock_balance() higher
        sched: update comment for move_task_off_dead_cpu
        sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares
        sched/rt: removed unneeded defintion
        sched: add hierarchical accounting to cpu accounting controller
        sched: include group statistics in /proc/sched_debug
        sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER
        sched: clean up SCHED_CPUMASK_ALLOC
        ...
      a39b8633
    • L
      Merge branch 'tracing-core-for-linus' of... · b0f4b285
      Linus Torvalds 提交于
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (241 commits)
        sched, trace: update trace_sched_wakeup()
        tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
        Revert "x86: disable X86_PTRACE_BTS"
        ring-buffer: prevent false positive warning
        ring-buffer: fix dangling commit race
        ftrace: enable format arguments checking
        x86, bts: memory accounting
        x86, bts: add fork and exit handling
        ftrace: introduce tracing_reset_online_cpus() helper
        tracing: fix warnings in kernel/trace/trace_sched_switch.c
        tracing: fix warning in kernel/trace/trace.c
        tracing/ring-buffer: remove unused ring_buffer size
        trace: fix task state printout
        ftrace: add not to regex on filtering functions
        trace: better use of stack_trace_enabled for boot up code
        trace: add a way to enable or disable the stack tracer
        x86: entry_64 - introduce FTRACE_ frame macro v2
        tracing/ftrace: add the printk-msg-only option
        tracing/ftrace: use preempt_enable_no_resched_notrace in ring_buffer_time_stamp()
        x86, bts: correctly report invalid bts records
        ...
      
      Fixed up trivial conflict in scripts/recordmcount.pl due to SH bits
      being already partly merged by the SH merge.
      b0f4b285
    • L
      Merge branch 'x86-core-for-linus' of... · be9c5ae4
      Linus Torvalds 提交于
      Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (246 commits)
        x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
        x86: PAT: fix address types in track_pfn_vma_new()
        x86: prioritize the FPU traps for the error code
        x86: PAT: pfnmap documentation update changes
        x86: PAT: move track untrack pfnmap stubs to asm-generic
        x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
        x86: PAT: modify follow_phys to return phys_addr prot and return value
        x86: PAT: clarify is_linear_pfn_mapping() interface
        x86: ia32_signal: remove unnecessary declaration
        x86: common.c boot_cpu_stack and boot_exception_stacks should be static
        x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
        x86: fix warning in arch/x86/kernel/microcode_amd.c
        x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
        x86: asm-offset_64: use rt_sigframe_ia32
        x86: sigframe.h: include headers for dependency
        x86: traps.c declare functions before they get used
        x86: PAT: update documentation to cover pgprot and remap_pfn related changes - v3
        x86: PAT: add pgprot_writecombine() interface for drivers - v3
        x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
        x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
        ...
      be9c5ae4
    • L
      Merge branch 'for-linus' of... · bb26c6c2
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (105 commits)
        SELinux: don't check permissions for kernel mounts
        security: pass mount flags to security_sb_kern_mount()
        SELinux: correctly detect proc filesystems of the form "proc/foo"
        Audit: Log TIOCSTI
        user namespaces: document CFS behavior
        user namespaces: require cap_set{ug}id for CLONE_NEWUSER
        user namespaces: let user_ns be cloned with fairsched
        CRED: fix sparse warnings
        User namespaces: use the current_user_ns() macro
        User namespaces: set of cleanups (v2)
        nfsctl: add headers for credentials
        coda: fix creds reference
        capabilities: define get_vfs_caps_from_disk when file caps are not enabled
        CRED: Allow kernel services to override LSM settings for task actions
        CRED: Add a kernel_service object class to SELinux
        CRED: Differentiate objective and effective subjective credentials on a task
        CRED: Documentation
        CRED: Use creds in file structs
        CRED: Prettify commoncap.c
        CRED: Make execve() take advantage of copy-on-write credentials
        ...
      bb26c6c2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · e14e61e9
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (57 commits)
        crypto: aes - Precompute tables
        crypto: talitos - Ack done interrupt in isr instead of tasklet
        crypto: testmgr - Correct comment about deflate parameters
        crypto: salsa20 - Remove private wrappers around various operations
        crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
        crypto: sha512 - Switch to shash 
        crypto: sha512 - Move message schedule W[80] to static percpu area
        crypto: michael_mic - Switch to shash
        crypto: wp512 - Switch to shash
        crypto: tgr192 - Switch to shash
        crypto: sha256 - Switch to shash
        crypto: md5 - Switch to shash
        crypto: md4 - Switch to shash
        crypto: sha1 - Switch to shash
        crypto: rmd320 - Switch to shash
        crypto: rmd256 - Switch to shash
        crypto: rmd160 - Switch to shash
        crypto: rmd128 - Switch to shash
        crypto: null - Switch to shash
        crypto: hash - Make setkey optional
        ...
      e14e61e9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · cb10ea54
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (367 commits)
        ALSA: ASoC: fix a typo in omp-pcm.c
        ASoC: Fix DSP formats in SSM2602 audio codec
        ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
        ALSA: hda: fix incorrect mixer index values for 92hd83xx
        ALSA: hda: dinput_mux check
        ALSA: hda - Add quirk for another HP dv7
        ALSA: ASoC - Add missing __devexit annotation to wm8350.c
        ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
        ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
        ALSA: ASoC: tlv320aic3x add dsp_a
        ALSA: ASoC: DaVinci: document I2S limitations
        ALSA: ASoC: DaVinci: davinci-i2s clean up
        ALSA: ASoC: DaVinci: davinci-i2s clean up
        ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
        ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
        ALSA: ca0106 - disable 44.1kHz capture
        ALSA: ca0106 - Add missing card->private_data initialization
        ALSA: ca0106 - Check ac97 availability at PM
        ALSA: hda - Power up always when no jack detection is available
        ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
        ...
      cb10ea54
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 81d6e59d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (132 commits)
        sh: oprofile: Fix up the module build.
        sh: add UIO support for JPU on SH7722.
        serial: sh-sci: Fix up port pinmux for SH7366.
        sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
        sh: mach-sh03: Fix up pata_platform build breakage.
        sh: enable deferred io LCDC on Migo-R
        video: sh_mobile_lcdcfb deferred io support
        video: deferred io with physically contiguous memory
        video: deferred io cleanup
        video: fix deferred io fsync()
        sh: add LCDC interrupt configuration to AP325 and Migo-R
        sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
        sh: split coherent pages
        sh: dma: Kill off ISA DMA wrapper.
        sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
        sh: Kill off the unused SH_ALPHANUMERIC debug option.
        sh: Enable skipping of bss on debug platforms for sh32 also.
        doc: Update sh cpufreq documentation.
        sh: mrshpc_setup_windows() needs to be inline.
        serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL.
        ...
      81d6e59d