28 Jun, 2006

22 commits


26 Jun, 2006

18 commits

  • Trond had apparently merged the same patch twice, causing a duplicate
    include of the "internal.h" file, with resulting obvious confusion.

    Tssk. I'm the only one allowed to send out trees that don't even
    compile! Who does this Trond guy think he is?

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Copy the softirq bits in preempt_count from the current context into the
    hardirq context when using 4K stacks to make the softirq_count macro work
    correctly and thereby fix softirq cpu time accounting.

    Signed-off-by: Björn Steinbrink
    Acked-by: Arjan van de Ven
    Signed-off-by: Linus Torvalds

    Björn Steinbrink
     
  • * git://git.linux-nfs.org/pub/linux/nfs-2.6: (51 commits)
    nfs: remove nfs_put_link()
    nfs-build-fix-99
    git-nfs-build-fixes
    Merge branch 'odirect'
    NFS: alloc nfs_read/write_data as direct I/O is scheduled
    NFS: Eliminate nfs_get_user_pages()
    NFS: refactor nfs_direct_free_user_pages
    NFS: remove user_addr, user_count, and pos from nfs_direct_req
    NFS: "open code" the NFS direct write rescheduler
    NFS: Separate functions for counting outstanding NFS direct I/Os
    NLM: Fix reclaim races
    NLM: sem to mutex conversion
    locks.c: add the fl_owner to nlm_compare_locks
    NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts
    NFS: Split fs/nfs/inode.c
    NFS: Fix typo in nfs_do_clone_mount()
    NFS: Fix compile errors introduced by referrals patches
    NFSv4: Ensure that referral mounts bind to a reserved port
    NFSv4: A root pathname is sent as a zero component4
    NFSv4: Follow a referral
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
    V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
    V4L/DVB (4210a): git-dvb versus matroxfb
    V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
    Fixes some sync issues between V4L/DVB development and GIT
    V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
    V4L/DVB (4205): Merge tda9887 module into tuner.
    V4L/DVB (4203): Explicitly set the enum values.
    V4L/DVB (4202): allow selecting CX2341x port mode
    V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
    V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
    V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
    V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
    V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
    V4L/DVB (4193): Update cx2341x fw encoding API doc.
    V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
    V4L/DVB (4191): Add CX2341X MPEG encoder module.
    V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
    V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
    V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
    V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
    ...

    Linus Torvalds
     
  • Not that x86-64 and other architecture support should be difficult to
    add (trivial fixups to the data format and add the proper linker script
    entry).

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • I ran into a bug where the kernel died in the idr code:

    cpu 0x1d: Vector: 300 (Data Access) at [c000000b7096f710]
    pc: c0000000001f8984: .idr_get_new_above_int+0x140/0x330
    lr: c0000000001f89b4: .idr_get_new_above_int+0x170/0x330
    sp: c000000b7096f990
    msr: 800000000000b032
    dar: 0
    dsisr: 40010000
    current = 0xc000000b70d43830
    paca = 0xc000000000556900
    pid = 2022, comm = hwup
    1d:mon> t
    [c000000b7096f990] c0000000000d2ad8 .expand_files+0x2e8/0x364 (unreliable)
    [c000000b7096faa0] c0000000001f8bf8 .idr_get_new_above+0x18/0x68
    [c000000b7096fb20] c00000000002a054 .init_new_context+0x5c/0xf0
    [c000000b7096fbc0] c000000000049dc8 .copy_process+0x91c/0x1404
    [c000000b7096fcd0] c00000000004a988 .do_fork+0xd8/0x224
    [c000000b7096fdc0] c00000000000ebdc .sys_clone+0x5c/0x74
    [c000000b7096fe30] c000000000008950 .ppc_clone+0x8/0xc

    Sonny Rao
     
  • Update Documentation/devices.txt with a new version from the LANANA site
    http://www.lanana.org/docs/device-list/devices-2.6+.txt

    Signed-off-by: Jan Engelhardt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Engelhardt
     
  • likely profiling shows that the following is a miss.

    After boot:
    [+- ] Type | # True | # False | Function:Filename@Line
    +unlikely | 1074| 0 prune_dcache()@:fs/dcache.c@409

    After a bonnie++ run:
    +unlikely | 66716| 19584 prune_dcache()@:fs/dcache.c@409

    So remove it.

    Signed-off-by: Hua Zhong
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hua Zhong
     
  • Stringify does what it was told to do.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     
  • This patch will fix a boot memory reservation bug that trashes memory on
    the ES7000 when loading the kdump crash kernel.

    The code in arch/x86_64/kernel/setup.c to reserve boot memory for the crash
    kernel uses the non-numa aware "reserve_bootmem" function instead of the
    NUMA aware "reserve_bootmem_generic". I checked to make sure that no other
    function was using "reserve_bootmem" and found none, except the ones that
    had NUMA ifdef'ed out.

    I have tested this patch only on an ES7000 with NUMA on and off (numa=off)
    in a single (non-NUMA) and multi-cell (NUMA) configurations.

    Signed-off-by: Amul Shah
    Looks-good-to: Vivek Goyal
    Cc: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Amul Shah
     
  • Cleanup & fix 31 bit compilation:

    CC arch/s390/kernel/setup.o
    arch/s390/kernel/setup.c:83: error: initializer element is not computable at
    load time
    arch/s390/kernel/setup.c:83: error: (near initialization for
    'code_resource.start')
    Not sure which patch in the -mm tree breaks this, but since this can be
    considered a cleanup it can be merged anyway.

    Cc: Martin Schwidefsky
    Signed-off-by: Heiko Carstens
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Heiko Carstens
     
  • au1550 ac97 driver works fine on au1200 too.

    Comments at the top of file state this code is GPL, so lets
    mark it as GPL too.

    Signed-off-by: Domen Puncer
    Signed-off-by: Ralf Baechle
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Domen Puncer
     
  • Add parport interfaces to kernel-doc template. Small doc. cleanups in 2
    parport source files.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Error paths didn't spin_unlock.

    Signed-off-by: Domen Puncer
    Signed-off-by: Ralf Baechle
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Domen Puncer
     
  • Things which force me think a little: why so?

    Signed-off-by: Evgeniy Dushistov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Evgeniy Dushistov
     
  • In current 2.6.17 implementation, signal_struct refered from task_struct is
    used for per-process data structure. The pacct facility also uses it as a
    per-process data structure to store stime, utime, minflt, majflt. But those
    members are saved in __exit_signal(). It's too late.

    For example, if some threads exits at same time, pacct facility has a
    possibility to drop accountings for a part of those threads. (see, the
    following 'The results of original 2.6.17 kernel') I think accounting
    information should be completely collected into the per-process data structure
    before writing out an accounting record.

    This patch fixes this matter. Accumulation of stime, utime, minflt and majflt
    are done before generating accounting record.

    [mingo@elte.hu: fix acct_collect() siglock bug found by lockdep]
    Signed-off-by: KaiGai Kohei
    Signed-off-by: Ingo Molnar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KaiGai Kohei
     
  • When pacct facility generate an 'ac_flag' field in accounting record, it
    refers a task_struct of the thread which died last in the process. But any
    other task_structs are ignored.

    Therefore, pacct facility drops ASU flag even if root-privilege operations are
    used by any other threads except the last one. In addition, AFORK flag is
    always set when the thread of group-leader didn't die last, although this
    process has called execve() after fork().

    We have a same matter in ac_exitcode. The recorded ac_exitcode is an exit
    code of the last thread in the process. There is a possibility this exitcode
    is not the group leader's one.

    KaiGai Kohei
     
  • The pacct facility need an i/o operation when an accounting record is
    generated. There is a possibility to wake OOM killer up. If OOM killer is
    activated, it kills some processes to make them release process memory
    regions.

    But acct_process() is called in the killed processes context before calling
    exit_mm(), so those processes cannot release own memory. In the results, any
    processes stop in this point and it finally cause a system stall.

    KaiGai Kohei