rediff patch

le9pf.diff

@@ -1,7 +1,8 @@
 diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst
+index f4804ce37..60c0cc996 100644
 --- a/Documentation/admin-guide/sysctl/vm.rst
 +++ b/Documentation/admin-guide/sysctl/vm.rst
-@@ -68,6 +68,8 @@
+@@ -68,6 +68,8 @@ Currently, these files are in /proc/sys/vm:
  - stat_refresh
  - numa_stat
  - swappiness
@@ -10,7 +11,7 @@ diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide
  - unprivileged_userfaultfd
  - user_reserve_kbytes
  - vfs_cache_pressure
-@@ -881,6 +883,31 @@
+@@ -881,6 +883,31 @@ calls without any restrictions.
  The default value is 0.
  
  
@@ -43,12 +44,12 @@ diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide
  ===================
  
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index afad085960b8..8bb82cf5d74e 100644
+index 23c08bf3d..1edb1b367 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -113,6 +113,22 @@
- static int sixty = 60;
- #endif
+@@ -108,6 +108,22 @@
+ 
+ #if defined(CONFIG_SYSCTL)
  
 +#if defined(CONFIG_UNEVICTABLE_ACTIVEFILE)
 +#if CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_LOW < 0
@@ -66,13 +67,14 @@ index afad085960b8..8bb82cf5d74e 100644
 +	CONFIG_UNEVICTABLE_ACTIVEFILE_KBYTES_MIN;
 +#endif
 +
- static int __maybe_unused neg_one = -1;
- static int __maybe_unused two = 2;
- static int __maybe_unused four = 4;
-@@ -3131,6 +3147,25 @@
+ /* Constants used for minimum and  maximum */
+ #ifdef CONFIG_LOCKUP_DETECTOR
+ static int sixty = 60;
+@@ -3136,6 +3152,25 @@ static struct ctl_table vm_table[] = {
+ 		.extra1		= SYSCTL_ZERO,
  		.extra2		= SYSCTL_ONE,
  	},
- #endif
++#endif
 +#if defined(CONFIG_UNEVICTABLE_ACTIVEFILE)
 +	{
 +		.procname	= "unevictable_activefile_kbytes_low",
@@ -91,14 +93,14 @@ index afad085960b8..8bb82cf5d74e 100644
 +		.extra1		= &zero_ul,
 +		.extra2		= &sysctl_unevictable_activefile_kbytes_low,
 +	},
-+#endif
+ #endif
  	{
  		.procname	= "user_reserve_kbytes",
- 		.data		= &sysctl_user_reserve_kbytes,
 diff --git a/mm/Kconfig b/mm/Kconfig
+index c048dea7e..7f3c5904d 100644
 --- a/mm/Kconfig
 +++ b/mm/Kconfig
-@@ -47,6 +47,41 @@
+@@ -47,6 +47,41 @@ config SPARSEMEM_MANUAL
  
  endchoice
  
@@ -141,10 +143,10 @@ diff --git a/mm/Kconfig b/mm/Kconfig
  	def_bool y
  	depends on (!SELECT_MEMORY_MODEL && ARCH_SPARSEMEM_ENABLE) || SPARSEMEM_MANUAL
 diff --git a/mm/vmscan.c b/mm/vmscan.c
-index 7b4e31eac2cf..93760769d676 100644
+index 74296c2d1..bf28b2fa6 100644
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
-@@ -171,6 +171,11 @@
+@@ -171,6 +171,11 @@ struct scan_control {
  #define prefetchw_prev_lru_page(_page, _base, _field) do { } while (0)
  #endif
  
@@ -156,7 +158,7 @@ index 7b4e31eac2cf..93760769d676 100644
  /*
   * From 0 .. 200.  Higher means more swappy.
   */
-@@ -2562,6 +2567,10 @@
+@@ -2562,6 +2567,10 @@ enum scan_balance {
  	SCAN_FILE,
  };
  
@@ -167,7 +169,7 @@ index 7b4e31eac2cf..93760769d676 100644
  /*
   * Determine how aggressively the anon and file LRU lists should be
   * scanned.  The relative value of each set of LRU lists is determined
-@@ -2764,6 +2773,19 @@
+@@ -2764,6 +2773,19 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
  			BUG();
  		}