Merge "mm/page_alloc.c: use '__paginginit' instead of '__init'" (ef4a5283) · Commits · e / devices / android_kernel_sony_msm8994

mm/page_alloc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4638,7 +4638,7 @@ static inline void setup_usemap(struct pglist_data pgdat, struct zone zone,
		#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE

		/* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */
		void __init set_pageblock_order(void)
		void __paginginit set_pageblock_order(void)
		{
		unsigned int order;

		@@ -4666,7 +4666,7 @@ void __init set_pageblock_order(void)
		* include/linux/pageblock-flags.h for the values of pageblock_order based on
		* the kernel config
		*/
		void __init set_pageblock_order(void)
		void __paginginit set_pageblock_order(void)
		{
		}