aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-06-23 18:55:56 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-23 18:55:56 -0700
commita5b5323bfe43d8a284119248d54008fc7b483608 (patch)
tree2ecc9df2380c9722f69d0820ac6711fc033d37d3 /mm
parent6a948bc8ac0d7b3c4bf1a46838fb3786ecffbd93 (diff)
downloadhistory-a5b5323bfe43d8a284119248d54008fc7b483608.tar.gz
[PATCH] Make nr_swap_pages a long
From: Anton Blanchard <anton@samba.org> ../include/linux/swap.h:extern int nr_swap_pages; /* XXX: shouldn't this be ulong? --hch */ Sounds like it should be too me. Some of the code checks for nr_swap_pages < 0 so I made it a long instead. I had to fix up the ppc64 show_mem() (Im guessing there will be other trivial changes required in other 64bit archs, I can find and fix those if you want). I also noticed that the ppc64 show_mem() used ints to store page counts. We can overflow that, so make them unsigned long. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f8dbd8be97b524..fe55c14bd4dc98 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -38,7 +38,7 @@ DECLARE_BITMAP(node_online_map, MAX_NUMNODES);
struct pglist_data *pgdat_list;
unsigned long totalram_pages;
unsigned long totalhigh_pages;
-int nr_swap_pages;
+long nr_swap_pages;
int numnodes = 1;
int sysctl_lower_zone_protection = 0;