[PATCH 15/17] gfp-atomic-cpuhp

[Chris Wilson]

---
 arch/x86/events/intel/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 707b2a96e516..fecfbb45fbce 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3248,7 +3248,7 @@ struct intel_shared_regs *allocate_shared_regs(int cpu)
 	int i;
 
 	regs = kzalloc_node(sizeof(struct intel_shared_regs),
-			    GFP_KERNEL, cpu_to_node(cpu));
+			    GFP_ATOMIC, cpu_to_node(cpu));
 	if (regs) {
 		/*
 		 * initialize the locks to keep lockdep happy
@@ -3266,7 +3266,7 @@ static struct intel_excl_cntrs *allocate_excl_cntrs(int cpu)
 	struct intel_excl_cntrs *c;
 
 	c = kzalloc_node(sizeof(struct intel_excl_cntrs),
-			 GFP_KERNEL, cpu_to_node(cpu));
+			 GFP_ATOMIC, cpu_to_node(cpu));
 	if (c) {
 		raw_spin_lock_init(&c->lock);
 		c->core_id = -1;
@@ -3287,7 +3287,7 @@ static int intel_pmu_cpu_prepare(int cpu)
 	if (x86_pmu.flags & PMU_FL_EXCL_CNTRS) {
 		size_t sz = X86_PMC_IDX_MAX * sizeof(struct event_constraint);
 
-		cpuc->constraint_list = kzalloc(sz, GFP_KERNEL);
+		cpuc->constraint_list = kzalloc(sz, GFP_ATOMIC);
 		if (!cpuc->constraint_list)
 			goto err_shared_regs;
 
-- 
2.18.0