xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5b8b9d0c6d ("Merge branch 'akpm' (patches from Andrew)") into android-mainline

Browse Source 
Steps along the way to the 5.7-rc1 merge.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iaf237a174205979344cfa76274198e87e2ba7799
This commit is contained in:
Greg Kroah-Hartman
2020-04-11 12:04:04 +02:00
parent 3d496e90bf 5b8b9d0c6d
commit 5631819eaf
352 changed files with 4359 additions and 3079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mm/page_alloc.c
View File

@@ -103,8 +103,8 @@ struct pcpu_drain {
struct zone *zone;
struct work_struct work;
};
DEFINE_MUTEX(pcpu_drain_mutex);
DEFINE_PER_CPU(struct pcpu_drain, pcpu_drain);
static DEFINE_MUTEX(pcpu_drain_mutex);
static DEFINE_PER_CPU(struct pcpu_drain, pcpu_drain);
#ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
volatile unsigned long latent_entropy __latent_entropy;
@@ -3236,6 +3236,7 @@ int __isolate_free_page(struct page *page, unsigned int order)
* __putback_isolated_page - Return a now-isolated page back where we got it
* @page: Page that was isolated
* @order: Order of the isolated page
* @mt: The page's pageblock's migratetype
*
* This function is meant to return a page pulled from the free lists via
* __isolate_free_page back to the free lists they were pulled from.