Changeset 12573db in mainline for kernel/arch

Timestamp:

2011-01-31T20:32:33Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (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.

Location:

kernel/arch

Files:

• arm32/src/mach/gta02/gta02.c (modified) (1 diff)
• arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• sparc64/src/drivers/niagara.c (modified) (2 diffs)

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

@@ -174 +174 @@
                 fb_parea.pbase = GTA02_FB_BASE;
                 fb_parea.frames = 150;
+                fb_parea.unpriv = false;
                 ddi_parea_register(&fb_parea);
         }

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

@@ -300 +300 @@
                 fb_parea.pbase = ICP_FB;
                 fb_parea.frames = 300;
+                fb_parea.unpriv = false;
                 ddi_parea_register(&fb_parea);
         }

kernel/arch/sparc64/src/drivers/niagara.c

@@ -216 +216 @@
         outbuf_parea.pbase = (uintptr_t) (KA2PA(&output_buffer));
         outbuf_parea.frames = 1;
+        outbuf_parea.unpriv = false;
         ddi_parea_register(&outbuf_parea);
 
@@ -221 +222 @@
         inbuf_parea.pbase = (uintptr_t) (KA2PA(&input_buffer));
         inbuf_parea.frames = 1;
+        inbuf_parea.unpriv = false;
         ddi_parea_register(&inbuf_parea);