1. 30 Jan, 2008 20 commits
  2. 29 Jan, 2008 20 commits
    • Linus Torvalds's avatar
      Mostly revert "e1000/e1000e: Move PCI-Express device IDs over to e1000e" · 5b10ca19
      Linus Torvalds authored
      The new e1000e driver is apparently not yet suitable for general use, so
      mark it experimental, and re-instate all the PCI-Express device IDs in
      the old and stable e1000 driver so that people (namely me) can continue
      to use a driver that actually works.
      
      Auke & co have been appraised of the situation.
      
      Cc: Auke Kok <auke-jan.h.kok@intel.com>
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5b10ca19
    • Jens Axboe's avatar
      splice: fix problem with atime not being updated · 9e97198d
      Jens Axboe authored
      A bug report on nfsd that states that since it was switched to use
      splice instead of sendfile, the atime was no longer being updated
      on the input file. do_generic_mapping_read() does this when accessing
      the file, make splice do it for the direct splice handler.
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      9e97198d
    • Jan Engelhardt's avatar
      12f32bb3
    • Jens Axboe's avatar
      cciss: fix bug in overriding ->data_len before completion · e7d9dc9c
      Jens Axboe authored
      For BLOCK_PC requests, we need that length for completing the request.
      Andrew Vasquez <andrew.vasquez@qlogic.com> reported the following
      oops
      
      Hitting a consistent BUG() with recent Linus' linux-2.6.git:
      
      	[   12.941428] ------------[ cut here ]------------
      	[   12.944874] kernel BUG at drivers/block/cciss.c:1260!
      	[   12.944874] invalid opcode: 0000 [1] SMP
      	[   12.944874] CPU 0
      	[   12.944874] Modules linked in:
      	[   12.944874] Pid: 0, comm: swapper Not tainted 2.6.24 #43
      	[   12.944874] RIP: 0010:[<ffffffff8039e43d>]  [<ffffffff8039e43d>] cciss_softirq_done+0xbc/0x1bf
      	[   12.944874] RSP: 0018:ffffffff8063aed0  EFLAGS: 00010202
      	[   12.944874] RAX: 0000000000000001 RBX: ffff8100cf800010 RCX: ffff81042f1253b0
      	[   12.944874] RDX: ffff81042de398f0 RSI: ffff81042de398f0 RDI: 0000000000000001
      	[   12.944874] RBP: ffff81042daa0000 R08: ffff81042f1253b0 R09: 0000000000000001
      	[   12.944874] R10: 00000000000000fe R11: 0000000000000000 R12: 0000000000000002
      	[   12.944874] R13: 0000000000000001 R14: ffff8100cf800000 R15: ffff81042de398f0
      	[   12.944874] FS:  0000000000000000(0000) GS:ffffffff805bb000(0000) knlGS:0000000000000000
      	[   12.944874] CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
      	[   12.944874] CR2: 00002afed7eea340 CR3: 000000042dbba000 CR4: 00000000000006e0
      	[   12.944874] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      	[   12.944874] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      	[   12.944874] Process swapper (pid: 0, threadinfo ffffffff805f4000, task ffffffff805624a0)
      	[   12.944874] Stack:  0000000000000000 ffffffff8063af10 0000000000000001 ffffffff80632d60
      	[   12.944874]  0000000000000000 000000000000000a ffffffff805bb900 ffffffff8032038f
      	[   12.944874]  ffffffff8063af10 ffffffff8063af10 ffffffff805bb940 ffffffff802346b4
      	[   12.944874] Call Trace:
      	[   12.944874]  <IRQ>  [<ffffffff8032038f>] blk_done_softirq+0x69/0x78
      	[   12.944874]  [<ffffffff802346b4>] __do_softirq+0x6f/0xd8
      	[   12.944874]  [<ffffffff8020c45c>] call_softirq+0x1c/0x30
      	[   12.944874]  [<ffffffff8020e347>] do_softirq+0x30/0x80
      	[   12.944874]  [<ffffffff8020e409>] do_IRQ+0x72/0xd9
      	[   12.944874]  [<ffffffff8020a50a>] mwait_idle+0x0/0x46
      	[   12.944874]  [<ffffffff8020a3da>] default_idle+0x0/0x3d
      	[   12.944874]  [<ffffffff8020b7e1>] ret_from_intr+0x0/0xa
      	[   12.944874]  <EOI>  [<ffffffff8020a54c>] mwait_idle+0x42/0x46
      	[   12.944874]  [<ffffffff8020a481>] cpu_idle+0x6a/0xae
      	[   12.944874]
      	[   12.944874]
      	[   12.944874] Code: 0f 0b eb fe 48 8d 85 d8 c0 00 00 48 89 04 24 48 89 c7 e8 e5
      	[   12.944874] RIP  [<ffffffff8039e43d>] cciss_softirq_done+0xbc/0x1bf
      	[   12.944874]  RSP <ffffffff8063aed0>
      	[   12.944903] ---[ end trace e9c631603f90d22f ]---
      
      which is caused by blk_end_request() returning 'not done' for a request,
      since it gets asked to complete zero bytes.
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      e7d9dc9c
    • Martin K. Petersen's avatar
      Expose hardware sector size · e68b903c
      Martin K. Petersen authored
      Expose hardware sector size in sysfs queue directory.
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      e68b903c
    • Martin K. Petersen's avatar
      Fix blktrace compile warning · 7da975a2
      Martin K. Petersen authored
      request_queue_t is deprecated
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      7da975a2
    • Jens Axboe's avatar
      block: fix warning on compile with CONFIG_BLOCK · 023ccde1
      Jens Axboe authored
      struct io_context was not defined, just add an empty forward decl.
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      023ccde1
    • Jens Axboe's avatar
      block: ll_rw_blk.c split, add blk-merge.c · d6d48196
      Jens Axboe authored
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      d6d48196
    • Jens Axboe's avatar
      db1d08c6
    • Jens Axboe's avatar
    • Jens Axboe's avatar
      block: continue ll_rw_blk.c splitup · 86db1e29
      Jens Axboe authored
      Adds files for barrier handling, rq execution, io context handling,
      mapping data to requests, and queue settings.
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      86db1e29
    • Jens Axboe's avatar
      block: split tag and sysfs handling from blk-core.c · 8324aa91
      Jens Axboe authored
      Seperates the tag and sysfs handling from ll_rw_blk.
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      8324aa91
    • Jens Axboe's avatar
      block: first step of splitting ll_rw_blk, rename it · a168ee84
      Jens Axboe authored
      Then we retain history in blk-core.c
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      a168ee84
    • Jens Axboe's avatar
      xsysace: end request handling fix · 9bf72259
      Jens Axboe authored
      In ace_fsm_dostate(), the variable 'i' was used only for passing
      sector size of the request to end_that_request_first().
      So I removed it and changed the code to pass the size in bytes
      directly to __blk_end_request()
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      9bf72259
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25 · 0ba6c33b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
        [IPV6] ADDRLABEL: Fix double free on label deletion.
        [PPP]: Sparse warning fixes.
        [IPV4] fib_trie: remove unneeded NULL check
        [IPV4] fib_trie: More whitespace cleanup.
        [NET_SCHED]: Use nla_policy for attribute validation in ematches
        [NET_SCHED]: Use nla_policy for attribute validation in actions
        [NET_SCHED]: Use nla_policy for attribute validation in classifiers
        [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
        [NET_SCHED]: sch_api: introduce constant for rate table size
        [NET_SCHED]: Use typeful attribute parsing helpers
        [NET_SCHED]: Use typeful attribute construction helpers
        [NET_SCHED]: Use NLA_PUT_STRING for string dumping
        [NET_SCHED]: Use nla_nest_start/nla_nest_end
        [NET_SCHED]: Propagate nla_parse return value
        [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
        [NET_SCHED]: act_api: use nlmsg_parse
        [NET_SCHED]: act_api: fix netlink API conversion bug
        [NET_SCHED]: sch_netem: use nla_parse_nested_compat
        [NET_SCHED]: sch_atm: fix format string warning
        [NETNS]: Add namespace for ICMP replying code.
        ...
      0ba6c33b
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 21af0297
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (68 commits)
        [MIPS] remove Documentation/mips/GT64120.README
        [MIPS] Malta: remaining bits of the board support code cleanup
        [MIPS] Malta: make the helper function static
        [MIPS] Malta: fix braces at single statement blocks
        [MIPS] Malta, Atlas: move an extern function declaration to the header file
        [MIPS] Malta: Use C89 style for comments
        [MIPS] Malta: else should follow close brace in malta_int.c
        [MIPS] Malta: remove a superfluous comment
        [MIPS] Malta: include <linux/cpu.h> instead of <asm/cpu.h>
        [MIPS] Malta, Atlas, Sead: remove an extern from .c files
        [MIPS] Malta: fix oversized lines in malta_int.c
        [MIPS] Malta: remove a dead function declaration
        [MIPS] Malta: use tabs not spaces
        [MIPS] Malta: set up the screen info in a separate function
        [MIPS] Malta: check the PCI clock frequency in a separate function
        [MIPS] Malta: use the KERN_ facility level in printk()
        [MIPS] Malta: use Linux kernel style for structure initialization
        [MIPS]: constify function pointer tables
        [MIPS] compat: handle argument endianess of sys32_(f)truncate64 with merge_64
        [MIPS] Cobalt 64-bits kernels can be safely unmarked experimental
        ...
      21af0297
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · 5ea293a9
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (79 commits)
        Remove references to "make dep"
        kconfig: document use of HAVE_*
        Introduce new section reference annotations tags: __ref, __refdata, __refconst
        kbuild: warn about ld added unique sections
        kbuild: add verbose option to Section mismatch reporting in modpost
        kconfig: tristate choices with mixed tristate and boolean values
        asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
        remove __attribute_used__
        kbuild: support ARCH=x86 in buildtar
        kconfig: remove "enable"
        kbuild: simplified warning report in modpost
        kbuild: introduce a few helpers in modpost
        kbuild: use simpler section mismatch warnings in modpost
        kbuild: link vmlinux.o before kallsyms passes
        kbuild: introduce new option to enhance section mismatch analysis
        Use separate sections for __dev/__cpu/__mem code/data
        compiler.h: introduce __section()
        all archs: consolidate init and exit sections in vmlinux.lds.h
        kbuild: check section names consistently in modpost
        kbuild: introduce blacklisting in modpost
        ...
      5ea293a9
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 03bc26cf
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        Module: check to see if we have a built in module with the same name
        module: add module taint on ndiswrapper
        module: fix the module name length in param_sysfs_builtin
        module: make module_address_lookup safe
        module: better OOPS and lockdep coverage for loading modules
        module: Fix gratuitous sprintf in module.c
        module: wait for dependent modules doing init.
        module: Don't report discarded init pages as kernel text.
      03bc26cf
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 8cd226ca
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (50 commits)
        jbd2: sparse pointer use of zero as null
        jbd2: Use round-jiffies() function for the "5 second" ext4/jbd2 wakeup
        jbd2: Mark jbd2 slabs as SLAB_TEMPORARY
        jbd2: add lockdep support
        ext4: Use the ext4_ext_actual_len() helper function
        ext4: fix uniniatilized extent splitting error
        ext4: Check for return value from sb_set_blocksize
        ext4: Add stripe= option to /proc/mounts
        ext4: Enable the multiblock allocator by default
        ext4: Add multi block allocator for ext4
        ext4: Add new functions for searching extent tree
        ext4: Add ext4_find_next_bit()
        ext4: fix up EXT4FS_DEBUG builds
        ext4: Fix ext4_show_options to show the correct mount options.
        ext4: Add EXT4_IOC_MIGRATE ioctl
        ext4: Add inode version support in ext4
        vfs: Add 64 bit i_version support
        ext4: Add the journal checksum feature
        jbd2: jbd2 stats through procfs
        ext4: Take read lock during overwrite case.
        ...
      8cd226ca
    • Dmitri Vorobiev's avatar
      [MIPS] remove Documentation/mips/GT64120.README · a9d2517c
      Dmitri Vorobiev authored
      Based upon the 2.4 kernel, the information presented in the
      Documentation/mips/GT64120.README file is outdated. Worse,
      the document contents are plain misleading nowadays because
      the text mentions files and directories, which have been
      deleted, moved or restructured for 2.6.
      
      This patch removes the documentation, which is no more valid.
      Signed-off-by: default avatarDmitri Vorobiev <dmitri.vorobiev@gmail.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      a9d2517c