summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>2020-05-21 13:31:08 -0700
committerSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>2020-05-26 15:38:59 -0700
commit7c43f1d0486aeaa238eed84527eaf2c979b56ffb (patch)
tree3c11d8d8b684736f38f3029fd2a2a4dd9468c854
parentd6c991beeff2b0cedd188dac8d04da3900c5c1ea (diff)
downloaddata-kernel-7c43f1d0486aeaa238eed84527eaf2c979b56ffb.tar.gz
rmnet_shs: Remove local_bh_disable in oom handler
Low memory handler in shs is in atomic context so prevent the disabling of bottom halves. Change-Id: I0eae18f8876edddd964346fee5b6b39af952d6fa Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
-rwxr-xr-xdrivers/rmnet/shs/rmnet_shs_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rmnet/shs/rmnet_shs_main.c b/drivers/rmnet/shs/rmnet_shs_main.c
index dec38c4..796858e 100755
--- a/drivers/rmnet/shs/rmnet_shs_main.c
+++ b/drivers/rmnet/shs/rmnet_shs_main.c
@@ -1511,7 +1511,7 @@ int rmnet_shs_drop_backlog(struct sk_buff_head *list, int cpu)
return 0;
}
-
+/* This will run in process context, avoid disabling bh */
static int rmnet_shs_oom_notify(struct notifier_block *self,
unsigned long emtpy, void *free)
{
@@ -1520,7 +1520,6 @@ static int rmnet_shs_oom_notify(struct notifier_block *self,
struct sk_buff_head *process_q;
struct sk_buff_head *input_q;
- local_bh_disable();
for_each_possible_cpu(cpu) {
process_q = &GET_PQUEUE(cpu);
@@ -1541,7 +1540,6 @@ static int rmnet_shs_oom_notify(struct notifier_block *self,
(*nfree)++;
}
}
- local_bh_enable();
return 0;
}