Skip to content

Commit

Permalink
Revert "mm: vmscan: fix CONFIG_KSWAPD_CPU"
Browse files Browse the repository at this point in the history
* Conflicts with what other sources and OSRC adds

This reverts commit 2f3b37c.
  • Loading branch information
ananjaser1211 committed Sep 10, 2024
1 parent 678504a commit df68b55
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mm/vmscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -3772,7 +3772,7 @@ static void kswapd_try_to_sleep(pg_data_t *pgdat, int alloc_order, int reclaim_o
finish_wait(&pgdat->kswapd_wait, &wait);
}

#ifdef CONFIG_KSWAPD_CPU
#if CONFIG_KSWAPD_CPU
static struct cpumask kswapd_cpumask;
static void init_kswapd_cpumask(void)
{
Expand Down Expand Up @@ -3808,7 +3808,7 @@ static int kswapd(void *p)
struct reclaim_state reclaim_state = {
.reclaimed_slab = 0,
};
#ifdef CONFIG_KSWAPD_CPU
#if CONFIG_KSWAPD_CPU
const struct cpumask *cpumask = &kswapd_cpumask;
#else
const struct cpumask *cpumask = cpumask_of_node(pgdat->node_id);
Expand Down Expand Up @@ -3986,7 +3986,7 @@ static int kswapd_cpu_online(unsigned int cpu)
pg_data_t *pgdat = NODE_DATA(nid);
const struct cpumask *mask;

#ifdef CONFIG_KSWAPD_CPU
#if CONFIG_KSWAPD_CPU
mask = &kswapd_cpumask;
#else
mask = cpumask_of_node(pgdat->node_id);
Expand Down Expand Up @@ -4040,7 +4040,7 @@ static int __init kswapd_init(void)
{
int nid, ret;

#ifdef CONFIG_KSWAPD_CPU
#if CONFIG_KSWAPD_CPU
init_kswapd_cpumask();
#endif
swap_setup();
Expand Down

0 comments on commit df68b55

Please sign in to comment.