diff options
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 840303769c11..0e266fe1b4c4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -456,7 +456,7 @@ static inline int page_zone_id(struct page *page) | |||
| 456 | return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK; | 456 | return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK; |
| 457 | } | 457 | } |
| 458 | 458 | ||
| 459 | static inline unsigned long zone_to_nid(struct zone *zone) | 459 | static inline int zone_to_nid(struct zone *zone) |
| 460 | { | 460 | { |
| 461 | #ifdef CONFIG_NUMA | 461 | #ifdef CONFIG_NUMA |
| 462 | return zone->node; | 462 | return zone->node; |
| @@ -466,9 +466,9 @@ static inline unsigned long zone_to_nid(struct zone *zone) | |||
| 466 | } | 466 | } |
| 467 | 467 | ||
| 468 | #ifdef NODE_NOT_IN_PAGE_FLAGS | 468 | #ifdef NODE_NOT_IN_PAGE_FLAGS |
| 469 | extern unsigned long page_to_nid(struct page *page); | 469 | extern int page_to_nid(struct page *page); |
| 470 | #else | 470 | #else |
| 471 | static inline unsigned long page_to_nid(struct page *page) | 471 | static inline int page_to_nid(struct page *page) |
| 472 | { | 472 | { |
| 473 | return (page->flags >> NODES_PGSHIFT) & NODES_MASK; | 473 | return (page->flags >> NODES_PGSHIFT) & NODES_MASK; |
| 474 | } | 474 | } |
