lkml.org 
[lkml]   [2004]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: 2.6.9-rc3-mm3: vm-thrashing-control-tuning
    Andrew Morton wrote:

    > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.9-rc3/2.6.9-rc3-mm3/
    [...]
    >
    > Changes since 2.6.9-rc3-mm2:
    >
    [...]
    >
    > +vm-thrashing-control-tuning.patch
    >
    > /proc/sys/vm/swap_token_timeout

    Hello, Andrew,

    Thank you for applying my patch.

    Since I made the patch for 2.6.9-rc3, the patch caused trouble
    to sysctl code in -mm tree.

    Attached patch fixes this issue.

    I am very sorry for the trouble.


    Best regards,

    Hideo AOKI

    Systems Development Laboratory, Hitachi, Ltd.
    Signed-off-by: Hideo Aoki <aoki@sdl.hitachi.co.jp>

    include/linux/sysctl.h | 2 +-
    kernel/sysctl.c | 18 +++++++++---------
    2 files changed, 10 insertions(+), 10 deletions(-)

    diff -uprN linux-2.6.9-rc3-mm3/include/linux/sysctl.h linux-2.6.9-rc3-mm3-fix/include/linux/sysctl.h
    --- linux-2.6.9-rc3-mm3/include/linux/sysctl.h 2004-10-08 14:42:27.000000000 +0900
    +++ linux-2.6.9-rc3-mm3-fix/include/linux/sysctl.h 2004-10-08 14:53:33.000000000 +0900
    @@ -168,7 +168,7 @@ enum
    VM_VFS_CACHE_PRESSURE=26, /* dcache/icache reclaim pressure */
    VM_LEGACY_VA_LAYOUT=27, /* legacy/compatibility virtual address space layout */
    VM_HEAP_STACK_GAP=28, /* int: page gap between heap and stack */
    - VM_SWAP_TOKEN_TIMEOUT=28, /* default time for token time out */
    + VM_SWAP_TOKEN_TIMEOUT=29, /* default time for token time out */
    };


    diff -uprN linux-2.6.9-rc3-mm3/kernel/sysctl.c linux-2.6.9-rc3-mm3-fix/kernel/sysctl.c
    --- linux-2.6.9-rc3-mm3/kernel/sysctl.c 2004-10-08 14:42:28.000000000 +0900
    +++ linux-2.6.9-rc3-mm3-fix/kernel/sysctl.c 2004-10-08 18:16:25.000000000 +0900
    @@ -624,15 +624,6 @@ static ctl_table kern_table[] = {
    .proc_handler = &proc_unknown_nmi_panic,
    },
    #endif
    - {
    - .ctl_name = VM_SWAP_TOKEN_TIMEOUT,
    - .procname = "swap_token_timeout",
    - .data = &swap_token_default_timeout,
    - .maxlen = sizeof(swap_token_default_timeout),
    - .mode = 0644,
    - .proc_handler = &proc_dointvec_jiffies,
    - .strategy = &sysctl_jiffies,
    - },
    { .ctl_name = 0 }
    };

    @@ -822,6 +813,15 @@ static ctl_table vm_table[] = {
    .mode = 0644,
    .proc_handler = &proc_dointvec,
    },
    + {
    + .ctl_name = VM_SWAP_TOKEN_TIMEOUT,
    + .procname = "swap_token_timeout",
    + .data = &swap_token_default_timeout,
    + .maxlen = sizeof(swap_token_default_timeout),
    + .mode = 0644,
    + .proc_handler = &proc_dointvec_jiffies,
    + .strategy = &sysctl_jiffies,
    + },
    { .ctl_name = 0 }
    };
    \
     
     \ /
      Last update: 2005-03-22 14:06    [W:0.026 / U:59.720 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site