2007-09-19 03:40:45

by Christoph Lameter

Subject: [14/17] Allow bit_waitqueue to wait on a bit in a vmalloc area

If bit waitqueue is passed a virtual address then it must use
vmalloc_to_page instead of virt_to_page to get to the page struct.

Signed-off-by: Christoph Lameter <[email protected]>

---
kernel/wait.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

Index: linux-2.6/kernel/wait.c
===================================================================
--- linux-2.6.orig/kernel/wait.c 2007-09-18 19:19:27.000000000 -0700
+++ linux-2.6/kernel/wait.c 2007-09-18 20:10:39.000000000 -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,9 +246,16 @@ 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));
unsigned long val = (unsigned long)word << shift | bit;
+ struct page *page;
+ struct zone *zone;

+ if (is_vmalloc_addr(word))
+ page = vmalloc_to_page(word)
+ else
+ page = virt_to_page(word);
+
+ zone = page_zone(page);
return &zone->wait_table[hash_long(val, zone->wait_table_bits)];
}
EXPORT_SYMBOL(bit_waitqueue);

--

2007-09-19 04:16:03

by Gabriel C

Subject: Re: [14/17] Allow bit_waitqueue to wait on a bit in a vmalloc area

Christoph Lameter wrote:

>
> + if (is_vmalloc_addr(word))
> + page = vmalloc_to_page(word)
^^^^^^
Missing ' ; '

> + else
> + page = virt_to_page(word);
> +
> + zone = page_zone(page);
> return &zone->wait_table[hash_long(val, zone->wait_table_bits)];
> }
> EXPORT_SYMBOL(bit_waitqueue);
>

Regards,

Gabriel

2007-09-19 17:41:59

by Christoph Lameter

Subject: Re: [14/17] Allow bit_waitqueue to wait on a bit in a vmalloc area

On Wed, 19 Sep 2007, Gabriel C wrote:

> Christoph Lameter wrote:
>
> >
> > + if (is_vmalloc_addr(word))
> > + page = vmalloc_to_page(word)
> ^^^^^^
> Missing ' ; '

Argh. Late beautification attempts are backfiring....