<commit_before>From e8cdacbb45260ab115ba45c89f6f7af5fd68041a Mon Sep 17 00:00:00 2001
From: <NAME> <<EMAIL>>
Date: Fri, 26 Jan 2018 14:03:50 +0000
Subject: [PATCH] Revert "cgroup: Add kernel param to enable memory group"

This reverts commit ba742b52e5099b3ed964e78f227dc96460b5cdc0.

---
 kernel/cgroup.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index c3f5abf..2c785f9 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -5638,8 +5638,6 @@ int __init cgroup_init_early(void)
 }

 static u16 cgroup_disable_mask __initdata;
-static bool cgroup_enable_memory;
-static int __init cgroup_disable(char *str);

 /**
  * cgroup_init - cgroup initialization
@@ -5678,9 +5676,6 @@ int __init cgroup_init(void)

 	mutex_unlock(&cgroup_mutex);

-	if (!cgroup_enable_memory)
-		cgroup_disable("memory");
-
 	for_each_subsys(ss, ssid) {
 		if (ss->early_init) {
 			struct cgroup_subsys_state *css =
@@ -6156,13 +6151,6 @@ static int __init cgroup_disable(char *str)
 }
 __setup("cgroup_disable=", cgroup_disable);

-static int __init cgroup_memory(char *str)
-{
-	kstrtobool(str, &cgroup_enable_memory);
-	return 1;
-}
-__setup("cgroup_memory=", cgroup_memory);
-
 static int __init cgroup_no_v1(char *str)
 {
 	struct cgroup_subsys *ss;
--
2.7.4
<commit_msg>linux-raspberrypi: Rebase memory cgroup revert patch on 4.9.80<commit_after>From f7817cc0a55aa5d453cec09d652639d2bebac4eb Mon Sep 17 00:00:00 2001
From: <NAME> <<EMAIL>>
Date: Mon, 14 May 2018 15:55:13 +0100
Subject: [PATCH] Revert "cgroup: Add kernel param to enable memory group"

This reverts commit ba742b52e5099b3ed964e78f227dc96460b5cdc0.

Rebased on 4.9.80.

Signed-off-by: <NAME> <<EMAIL>>
---
 kernel/cgroup.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 29f27f7..1bbc4a4 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -5639,8 +5639,6 @@ int __init cgroup_init_early(void)

 static u16 cgroup_disable_mask __initdata;
 static u16 cgroup_enable_mask __initdata;
-static bool cgroup_enable_memory;
-static int __init cgroup_disable(char *str);

 /**
  * cgroup_init - cgroup initialization
@@ -5679,10 +5677,6 @@ int __init cgroup_init(void)

 	mutex_unlock(&cgroup_mutex);

-	/* Apply an implicit disable... */
-	if (!cgroup_enable_memory)
-		cgroup_disable("memory");
-
 	/* ...knowing that an explicit enable will override it. */
 	cgroup_disable_mask &= ~cgroup_enable_mask;

@@ -6210,12 +6204,6 @@ static int __init cgroup_enable(char *str)
 }
 __setup("cgroup_enable=", cgroup_enable);

-static int __init cgroup_memory(char *str)
-{
-	return !kstrtobool(str, &cgroup_enable_memory);
-}
-__setup("cgroup_memory=", cgroup_memory);
-
 /**
  * css_tryget_online_from_dir - get corresponding css from a cgroup dentry
  * @dentry: directory dentry of interest
--
2.7.4

{'fraction_non_alphanumeric': 0.13674614305750352, 'fraction_numerical': 0.09467040673211781, 'mean_word_length': 4.476007677543186, 'pattern_counts': {'":': 0, '<': 12, '<?xml version=': 0, '>': 13, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '3757561', 'n_tokens_mistral': 1291, 'n_tokens_neox': 1119, 'n_words': 254}