From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 19 Nov 2021 08:31:55 +0000 (+0100)
Subject: Merge branch 'x86/urgent' into x86/sgx, to resolve conflict
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5c16f7ee03c011b0c6cd4c6deccaf0b269d054b2;p=linux.git

Merge branch 'x86/urgent' into x86/sgx, to resolve conflict

Conflicts:
	arch/x86/kernel/cpu/sgx/main.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

5c16f7ee03c011b0c6cd4c6deccaf0b269d054b2
diff --cc arch/x86/kernel/cpu/sgx/main.c
index 231c494dfd407,8471a8b9b48e8..6036328de255a
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@@ -490,10 -471,9 +490,10 @@@ static struct sgx_epc_page *__sgx_alloc
  
  	page = list_first_entry(&node->free_page_list, struct sgx_epc_page, list);
  	list_del_init(&page->list);
- 	sgx_nr_free_pages--;
 +	page->flags = 0;
  
  	spin_unlock(&node->lock);
+ 	atomic_long_dec(&sgx_nr_free_pages);
  
  	return page;
  }
@@@ -644,15 -624,10 +644,15 @@@ void sgx_free_epc_page(struct sgx_epc_p
  
  	spin_lock(&node->lock);
  
 -	list_add_tail(&page->list, &node->free_page_list);
 +	page->owner = NULL;
 +	if (page->poison)
 +		list_add(&page->list, &node->sgx_poison_page_list);
 +	else
 +		list_add_tail(&page->list, &node->free_page_list);
- 	sgx_nr_free_pages++;
 +	page->flags = SGX_EPC_PAGE_IS_FREE;
  
  	spin_unlock(&node->lock);
+ 	atomic_long_inc(&sgx_nr_free_pages);
  }
  
  static bool __init sgx_setup_epc_section(u64 phys_addr, u64 size,