Changeset 00aece0 in mainline for kernel/arch/ppc32/src/drivers/pic.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/ppc32/src/drivers/pic.c (modified) (2 diffs)

kernel/arch/ppc32/src/drivers/pic.c

@@ -34 +34 @@
 
 #include <arch/drivers/pic.h>
-#include <mm/page.h>
+#include <mm/km.h>
 #include <byteorder.h>
 #include <bitops.h>
@@ -42 +42 @@
 void pic_init(uintptr_t base, size_t size, cir_t *cir, void **cir_arg)
 {
-        pic = (uint32_t *) hw_map(base, size);
+        pic = (uint32_t *) km_map(base, size, PAGE_WRITE | PAGE_NOT_CACHEABLE);
         *cir = pic_ack_interrupt;
         *cir_arg = NULL;