xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ee01c4d72a ("Merge branch 'akpm' (patches from Andrew)") into android-mainline

Browse Source 
Steps along the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6cca4fa48322228c8182201d68dc05f9b72cfc50
This commit is contained in:
Greg Kroah-Hartman
2020-06-22 15:13:41 +02:00
parent 8a8d41512f ee01c4d72a
commit 1ec3464acb
147 changed files with 3486 additions and 2689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/sysctl.c
View File

@@ -121,6 +121,7 @@ static unsigned long zero_ul;
static unsigned long one_ul = 1;
static unsigned long long_max = LONG_MAX;
static int one_hundred = 100;
static int two_hundred = 200;
static int one_thousand = 1000;
#ifdef CONFIG_PRINTK
static int ten_thousand = 10000;
@@ -2735,7 +2736,7 @@ static struct ctl_table vm_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
.extra2 = &one_hundred,
.extra2 = &two_hundred,
},
#ifdef CONFIG_HUGETLB_PAGE
{