diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8fd42aa7c4bd..6de9440e3ae2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -92,7 +92,7 @@ int _node_numa_mem_[MAX_NUMNODES]; | |||
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY | 94 | #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY |
95 | volatile u64 latent_entropy __latent_entropy; | 95 | volatile unsigned long latent_entropy __latent_entropy; |
96 | EXPORT_SYMBOL(latent_entropy); | 96 | EXPORT_SYMBOL(latent_entropy); |
97 | #endif | 97 | #endif |
98 | 98 | ||
@@ -3658,7 +3658,7 @@ retry: | |||
3658 | /* Make sure we know about allocations which stall for too long */ | 3658 | /* Make sure we know about allocations which stall for too long */ |
3659 | if (time_after(jiffies, alloc_start + stall_timeout)) { | 3659 | if (time_after(jiffies, alloc_start + stall_timeout)) { |
3660 | warn_alloc(gfp_mask, | 3660 | warn_alloc(gfp_mask, |
3661 | "page alloction stalls for %ums, order:%u\n", | 3661 | "page allocation stalls for %ums, order:%u", |
3662 | jiffies_to_msecs(jiffies-alloc_start), order); | 3662 | jiffies_to_msecs(jiffies-alloc_start), order); |
3663 | stall_timeout += 10 * HZ; | 3663 | stall_timeout += 10 * HZ; |
3664 | } | 3664 | } |