2 files changed, 1 insertions, 4 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 71430d440822..73790188b0eb 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -982,9 +982,6 @@ static unsigned interleave_nodes(struct mempolicy *policy)
  */
 unsigned slab_node(struct mempolicy *policy)
 {
-        if (in_interrupt())
-                return numa_node_id();
-
         switch (policy->policy) {
         case MPOL_INTERLEAVE:
                 return interleave_nodes(policy);
diff --git a/mm/slab.c b/mm/slab.c
index 9025608696ec..6f8495e2185b 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2574,7 +2574,7 @@ static inline void *____cache_alloc(kmem_cache_t *cachep, gfp_t flags)
         struct array_cache *ac;
 
 #ifdef CONFIG_NUMA
-        if (current->mempolicy) {
+        if (unlikely(current->mempolicy && !in_interrupt())) {
                 int nid = slab_node(current->mempolicy);
 
                 if (nid != numa_node_id())