[12/18] Wait: Allow bit_waitqueue to wait on a bit in a virtual compound page

Christoph Lameter
2007-10-04T04:05:46Z

[-- Attachment #1: vcompound_wait_on_virtually_mapped_object --]
[-- Type: text/plain, Size: 887 bytes --]

If bit waitqueue is passed a virtual address then it must use
virt_to_head_page instead of virt_to_page.

Signed-off-by: Christoph Lameter <clameter@sgi.com>

---
kernel/wait.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/kernel/wait.c
===================================================================
--- linux-2.6.orig/kernel/wait.c 2007-10-03 17:44:21.000000000 -0700
+++ linux-2.6/kernel/wait.c 2007-10-03 17:53:07.000000000 -0700
@@ -245,7 +245,7 @@ EXPORT_SYMBOL(wake_up_bit);
fastcall wait_queue_head_t *bit_waitqueue(void *word, int bit)
{
const int shift = BITS_PER_LONG == 32 ? 5 : 6;
- const struct zone *zone = page_zone(virt_to_page(word));
+ const struct zone *zone = page_zone(virt_to_head_page(word));
unsigned long val = (unsigned long)word << shift | bit;

return &zone->wait_table[hash_long(val, zone->wait_table_bits)];

--