From 553ddf715bda5b85c4ad3d0dd829ba9e63e03136 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Jan 2008 13:30:23 +0100 Subject: [PATCH] --- yaml --- r: 79766 b: refs/heads/master c: f2f58178f497ca56501d44d79982621e19c5007f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/ioport_32.c | 32 ++++++------------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index 1ebe0b1c76e0..311428be2895 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ebc51d7c95425c3b4667fa042576fb1c6e2ea16 +refs/heads/master: f2f58178f497ca56501d44d79982621e19c5007f diff --git a/trunk/arch/x86/kernel/ioport_32.c b/trunk/arch/x86/kernel/ioport_32.c index 4ed48dc8df1e..c5a64011764f 100644 --- a/trunk/arch/x86/kernel/ioport_32.c +++ b/trunk/arch/x86/kernel/ioport_32.c @@ -16,36 +16,16 @@ #include /* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */ -static void set_bitmap(unsigned long *bitmap, unsigned int base, unsigned int extent, int new_value) +static void set_bitmap(unsigned long *bitmap, unsigned int base, + unsigned int extent, int new_value) { - unsigned long mask; - unsigned long *bitmap_base = bitmap + (base / BITS_PER_LONG); - unsigned int low_index = base & (BITS_PER_LONG-1); - int length = low_index + extent; - - if (low_index != 0) { - mask = (~0UL << low_index); - if (length < BITS_PER_LONG) - mask &= ~(~0UL << length); - if (new_value) - *bitmap_base++ |= mask; - else - *bitmap_base++ &= ~mask; - length -= BITS_PER_LONG; - } - - mask = (new_value ? ~0UL : 0UL); - while (length >= BITS_PER_LONG) { - *bitmap_base++ = mask; - length -= BITS_PER_LONG; - } + unsigned int i; - if (length > 0) { - mask = ~(~0UL << length); + for (i = base; i < base + extent; i++) { if (new_value) - *bitmap_base++ |= mask; + __set_bit(i, bitmap); else - *bitmap_base++ &= ~mask; + __clear_bit(i, bitmap); } }