Skip to contentSkip to conversation

Patch: numa.c broke in 2.4.6-pre8

PATCH Russell King 1 participant 1 message Jun 30, 2001

Subsystems (2)
Memory management Memory management - NUMA memblocks and NUMA emulation
lore
Share & tools
lore

Russell King

author
#0 lore raw

Hi,

When building 2.4.6-pre8 with CONFIG_DISCONTIGMEM=y, I get the following error:

numa.c:96: conflicting types for _alloc_pages' /usr/src/v2.4/linux-assabet/include/linux/mm.h:383: previous declaration of _alloc_pages'

The following patch fixes this problem. Please apply.

mm/numa.c +1 -1
@@ -92,7 +92,7 @@
  * This can be refined. Currently, tries to do round robin, instead
  * should do concentratic circle search, starting from current node.
  */
-struct page * _alloc_pages(int gfp_mask, unsigned long order)
+struct page * _alloc_pages(unsigned int gfp_mask, unsigned long order)
 {
 	struct page *ret = 0;
 	pg_data_t *start, *temp;

--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html