Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] __cpuinit functions wrongly marked __meminit

__meminit has overzelously been modified and crept its way into marking
cpuup callbacks as __meminit.

Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Ashok Raj and committed by
Linus Torvalds
6292d9aa 88356e90

+3 -3
+3 -3
mm/page_alloc.c
··· 1799 1799 memmap_init_zone((size), (nid), (zone), (start_pfn)) 1800 1800 #endif 1801 1801 1802 - static int __meminit zone_batchsize(struct zone *zone) 1802 + static int __cpuinit zone_batchsize(struct zone *zone) 1803 1803 { 1804 1804 int batch; 1805 1805 ··· 1893 1893 * Dynamically allocate memory for the 1894 1894 * per cpu pageset array in struct zone. 1895 1895 */ 1896 - static int __meminit process_zones(int cpu) 1896 + static int __cpuinit process_zones(int cpu) 1897 1897 { 1898 1898 struct zone *zone, *dzone; 1899 1899 ··· 1934 1934 } 1935 1935 } 1936 1936 1937 - static int __meminit pageset_cpuup_callback(struct notifier_block *nfb, 1937 + static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb, 1938 1938 unsigned long action, 1939 1939 void *hcpu) 1940 1940 {