From: Yasunori Goto This is just to rename from wait_table_size() to wait_table_hash_nr_entries(). Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton --- include/linux/mmzone.h | 4 ++-- mm/page_alloc.c | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff -puN include/linux/mmzone.h~wait_table-and-zonelist-initializing-for-memory-hotadd-change-name-of-wait_table_size include/linux/mmzone.h --- devel/include/linux/mmzone.h~wait_table-and-zonelist-initializing-for-memory-hotadd-change-name-of-wait_table_size 2006-05-19 16:00:24.000000000 -0700 +++ devel-akpm/include/linux/mmzone.h 2006-05-19 16:00:24.000000000 -0700 @@ -195,7 +195,7 @@ struct zone { /* * wait_table -- the array holding the hash table - * wait_table_size -- the size of the hash table array + * wait_table_hash_nr_entries -- the size of the hash table array * wait_table_bits -- wait_table_size == (1 << wait_table_bits) * * The purpose of all these is to keep track of the people @@ -218,7 +218,7 @@ struct zone { * free_area_init_core() performs the initialization of them. */ wait_queue_head_t * wait_table; - unsigned long wait_table_size; + unsigned long wait_table_hash_nr_entries; unsigned long wait_table_bits; /* diff -puN mm/page_alloc.c~wait_table-and-zonelist-initializing-for-memory-hotadd-change-name-of-wait_table_size mm/page_alloc.c --- devel/mm/page_alloc.c~wait_table-and-zonelist-initializing-for-memory-hotadd-change-name-of-wait_table_size 2006-05-19 16:00:24.000000000 -0700 +++ devel-akpm/mm/page_alloc.c 2006-05-19 16:00:24.000000000 -0700 @@ -1727,7 +1727,7 @@ void __init build_all_zonelists(void) */ #define PAGES_PER_WAITQUEUE 256 -static inline unsigned long wait_table_size(unsigned long pages) +static inline unsigned long wait_table_hash_nr_entries(unsigned long pages) { unsigned long size = 1; @@ -2019,13 +2019,15 @@ void zone_wait_table_init(struct zone *z * The per-page waitqueue mechanism uses hashed waitqueues * per zone. */ - zone->wait_table_size = wait_table_size(zone_size_pages); - zone->wait_table_bits = wait_table_bits(zone->wait_table_size); + zone->wait_table_hash_nr_entries = + wait_table_hash_nr_entries(zone_size_pages); + zone->wait_table_bits = + wait_table_bits(zone->wait_table_hash_nr_entries); zone->wait_table = (wait_queue_head_t *) - alloc_bootmem_node(pgdat, zone->wait_table_size + alloc_bootmem_node(pgdat, zone->wait_table_hash_nr_entries * sizeof(wait_queue_head_t)); - for(i = 0; i < zone->wait_table_size; ++i) + for(i = 0; i < zone->wait_table_hash_nr_entries; ++i) init_waitqueue_head(zone->wait_table + i); } _