diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:43 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:43 +0800 |
commit | 2af79bd1142d88667c40bb5cc65a3cd91db5a6c0 (patch) | |
tree | 73f57f5a9c57b0ab22fa456bc6926467c94e9099 /include/linux/mmzone.h | |
parent | d5aff662273133ff050acb8cac683d5f73c5fbf3 (diff) | |
parent | 133e6ccf46f1704a4a680ef45565e970ac9a7f9c (diff) |
Merge tag 'v4.9.65' into linux-linaro-lsk-v4.9lsk-v4.9-17.11
This is the 4.9.65 stable release
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r-- | include/linux/mmzone.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 6744eb40c4ea..fff21a82780c 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -672,7 +672,8 @@ typedef struct pglist_data { * is the first PFN that needs to be initialised. */ unsigned long first_deferred_pfn; - unsigned long static_init_size; + /* Number of non-deferred pages */ + unsigned long static_init_pgcnt; #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ #ifdef CONFIG_TRANSPARENT_HUGEPAGE |