Revert "add __ro_after_init to slab_nomerge and slab_state"
This reverts commit a96370e583
.
This commit is contained in:
parent
23e27a2a48
commit
3113e8c7d3
1 changed files with 2 additions and 2 deletions
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#include "slab.h"
|
#include "slab.h"
|
||||||
|
|
||||||
enum slab_state slab_state __ro_after_init;
|
enum slab_state slab_state;
|
||||||
LIST_HEAD(slab_caches);
|
LIST_HEAD(slab_caches);
|
||||||
DEFINE_MUTEX(slab_mutex);
|
DEFINE_MUTEX(slab_mutex);
|
||||||
struct kmem_cache *kmem_cache;
|
struct kmem_cache *kmem_cache;
|
||||||
|
@ -64,7 +64,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work,
|
||||||
/*
|
/*
|
||||||
* Merge control. If this is set then no merging of slab caches will occur.
|
* Merge control. If this is set then no merging of slab caches will occur.
|
||||||
*/
|
*/
|
||||||
static bool slab_nomerge __ro_after_init = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
|
static bool slab_nomerge = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
|
||||||
|
|
||||||
static int __init setup_slab_nomerge(char *str)
|
static int __init setup_slab_nomerge(char *str)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue