Patch: numa.c broke in 2.4.6-pre8

From: Russell King (rmk@arm.linux.org.uk)
Date: Sat Jun 30 2001 - 07:44:13 EST

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.

--- orig/mm/numa.c Sat Jun 30 11:09:05 2001
+++ linux/mm/numa.c Sat Jun 30 13:40:37 2001
@@ -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 (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Sat Jun 30 2001 - 21:00:24 EST