2008-03-21 06:22:13

by Christoph Lameter

[permalink] [raw]
Subject: [07/14] vcompound: bit waitqueue support

If bit_waitqueue is passed a vmalloc address then it must use
vmalloc_head_page() instead of virt_to_page().

Signed-off-by: Christoph Lameter <[email protected]>
---
kernel/wait.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.25-rc5-mm1/kernel/wait.c
===================================================================
--- linux-2.6.25-rc5-mm1.orig/kernel/wait.c 2008-03-20 20:03:51.141901370 -0700
+++ linux-2.6.25-rc5-mm1/kernel/wait.c 2008-03-20 20:07:57.266856571 -0700
@@ -9,6 +9,7 @@
#include <linux/mm.h>
#include <linux/wait.h>
#include <linux/hash.h>
+#include <linux/vmalloc.h>

void init_waitqueue_head(wait_queue_head_t *q)
{
@@ -245,7 +246,7 @@ EXPORT_SYMBOL(wake_up_bit);
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(vcompound_head_page(word));
unsigned long val = (unsigned long)word << shift | bit;

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

--