Changeset fe56c08a in mainline for kernel/arch/arm32/src/mach/gta02/gta02.c

Timestamp:

2012-01-28T09:17:24Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ca3d77a

Parents:

8da2c60 (diff), 9970a5a (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 with mainline

File:

• kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (2 diffs)

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -38 +38 @@
 #include <arch/mm/page.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <genarch/fb/fb.h>
 #include <abi/fb/visuals.h>
@@ -101 +102 @@
         s3c24xx_irqc_regs_t *irqc_regs;
 
-        gta02_timer = (void *) hw_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE);
-        irqc_regs = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE);
+        gta02_timer = (void *) km_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
+        irqc_regs = (void *) km_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
 
         /* Initialize interrupt controller. */