mm/page_alloc: integrate classzone_idx and high_zoneidx

[sfrench/cifs-2.6.git] / include / linux / mmzone.h

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 0c575c3d7feb835ab482bf4a5b40574211b199e9..cd8bd5f905527a0a7982f921025e1c895771ef7e 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -699,13 +699,13 @@ typedef struct pglist_data {
        struct task_struct *kswapd;     /* Protected by
                                           mem_hotplug_begin/end() */
        int kswapd_order;
-       enum zone_type kswapd_classzone_idx;
+       enum zone_type kswapd_highest_zoneidx;
 
        int kswapd_failures;            /* Number of 'reclaimed == 0' runs */
 
 #ifdef CONFIG_COMPACTION
        int kcompactd_max_order;
-       enum zone_type kcompactd_classzone_idx;
+       enum zone_type kcompactd_highest_zoneidx;
        wait_queue_head_t kcompactd_wait;
        struct task_struct *kcompactd;
 #endif
@@ -783,15 +783,15 @@ static inline bool pgdat_is_empty(pg_data_t *pgdat)
 
 void build_all_zonelists(pg_data_t *pgdat);
 void wakeup_kswapd(struct zone *zone, gfp_t gfp_mask, int order,
-                  enum zone_type classzone_idx);
+                  enum zone_type highest_zoneidx);
 bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark,
-                        int classzone_idx, unsigned int alloc_flags,
+                        int highest_zoneidx, unsigned int alloc_flags,
                         long free_pages);
 bool zone_watermark_ok(struct zone *z, unsigned int order,
-               unsigned long mark, int classzone_idx,
+               unsigned long mark, int highest_zoneidx,
                unsigned int alloc_flags);
 bool zone_watermark_ok_safe(struct zone *z, unsigned int order,
-               unsigned long mark, int classzone_idx);
+               unsigned long mark, int highest_zoneidx);
 enum memmap_context {
        MEMMAP_EARLY,
        MEMMAP_HOTPLUG,