Changeset f64fe6e in mainline

Timestamp:

2013-10-07T19:57:56Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

80d9d83

Parents:

8c34acf

Message:

Fix
1) kernel non-identity mapping size
2) newly added PTE permissions

Location:

kernel/arch/sparc32/include/arch/mm

Files:

• frame.h (modified) (1 diff)
• km.h (modified) (1 diff)
• page.h (modified) (1 diff)

kernel/arch/sparc32/include/arch/mm/frame.h

@@ -27 +27 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup sparc32mm
  * @{
  */

kernel/arch/sparc32/include/arch/mm/km.h

@@ -42 +42 @@
 
 #define KM_SPARC32_NON_IDENTITY_START   UINT32_C(0xf0000000)
-#define KM_SPARC32_NON_IDENTITY_SIZE    UINT32_C(0xff000000)
+#define KM_SPARC32_NON_IDENTITY_SIZE    UINT32_C(0xff00000)
 
 extern void km_identity_arch_init(void);

kernel/arch/sparc32/include/arch/mm/page.h

@@ -226 +226 @@
         
         if (flags & PAGE_USER) {
-                if (flags & PAGE_READ)
-                        p->acc = PTE_ACC_USER_RO_KERNEL_RW;
-                if (flags & PAGE_WRITE)
-                        p->acc = PTE_ACC_USER_RW_KERNEL_RW;
+                if (flags & PAGE_EXEC) {
+                        if (flags & PAGE_READ)
+                                p->acc = PTE_ACC_USER_RX_KERNEL_RX;
+                        if (flags & PAGE_WRITE)
+                                p->acc = PTE_ACC_USER_RWX_KERNEL_RWX;
+                } else {
+                        if (flags & PAGE_READ)
+                                p->acc = PTE_ACC_USER_RO_KERNEL_RW;
+                        if (flags & PAGE_WRITE)
+                                p->acc = PTE_ACC_USER_RW_KERNEL_RW;
+                }
         }