Changeset b5e68c8 in mainline for kernel/arch/ia32/src/ddi/ddi.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ia32/src/ddi/ddi.c (modified) (1 diff)

kernel/arch/ia32/src/ddi/ddi.c

@@ -127 +127 @@
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap,
                     TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                bitmap_copy(&iomap, &TASK->arch.iomap, bits);
                 
+                /*
+                 * Set the trailing bits in the last byte of the map to disable
+                 * I/O access.
+                 */
+                bitmap_set_range(&iomap, bits, ALIGN_UP(bits, 8) - bits);
                 /*
                  * It is safe to set the trailing eight bits because of the
                  * extra convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
+                bitmap_set_range(&iomap, ALIGN_UP(bits, 8), 8);
         }
         irq_spinlock_unlock(&TASK->lock, false);