diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /include/linux/mmzone.h | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'include/linux/mmzone.h')
| -rw-r--r-- | include/linux/mmzone.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 61f672a3c..4a8280d7d 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -28,13 +28,14 @@ typedef struct zone_struct { spinlock_t lock; unsigned long offset; unsigned long free_pages; - char low_on_memory; - char zone_wake_kswapd; + unsigned long inactive_clean_pages; + unsigned long inactive_dirty_pages; unsigned long pages_min, pages_low, pages_high; /* * free areas of different sizes */ + struct list_head inactive_clean_list; free_area_t free_area[MAX_ORDER]; /* @@ -99,9 +100,11 @@ extern pg_data_t *pgdat_list; * The following two are not meant for general usage. They are here as * prototypes for the discontig memory code. */ +struct page; extern void show_free_areas_core(int); extern void free_area_init_core(int nid, pg_data_t *pgdat, struct page **gmap, - unsigned long *zones_size, unsigned long paddr, unsigned long *zholes_size); + unsigned long *zones_size, unsigned long paddr, unsigned long *zholes_size, + struct page *pmap); #ifndef CONFIG_DISCONTIGMEM |