shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mm: Add min_free_order_shift tunable."

Browse Source 
This reverts commit c177d04116.
This commit is contained in:
黄涛
2011-07-30 23:09:46 +08:00
parent 4d7d3f3851
commit 3e094af87e
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/sysctl.c
View File

@@ -79,7 +79,6 @@ extern char core_pattern[];
extern unsigned int core_pipe_limit;
extern int pid_max;
extern int min_free_kbytes;
extern int min_free_order_shift;
extern int pid_max_min, pid_max_max;
extern int sysctl_drop_caches;
extern int percpu_pagelist_fraction;
@@ -1229,14 +1228,6 @@ static struct ctl_table vm_table[] = {
.strategy = &sysctl_intvec,
.extra1 = &zero,
},
{
.ctl_name = CTL_UNNUMBERED,
.procname = "min_free_order_shift",
.data = &min_free_order_shift,
.maxlen = sizeof(min_free_order_shift),
.mode = 0644,
.proc_handler = &proc_dointvec
},
{
.ctl_name = VM_PERCPU_PAGELIST_FRACTION,
.procname = "percpu_pagelist_fraction",

3
mm/page_alloc.c
View File

@@ -122,7 +122,6 @@ static char * const zone_names[MAX_NR_ZONES] = {
};
int min_free_kbytes = 1024;
int min_free_order_shift = 1;
static unsigned long __meminitdata nr_kernel_pages;
static unsigned long __meminitdata nr_all_pages;
@@ -1380,7 +1379,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
free_pages -= z->free_area[o].nr_free << o;
/* Require fewer higher order pages to be free */
min >>= min_free_order_shift;
min >>= 1;
if (free_pages <= min)
return 0;