Changeset 8565a42 in mainline for kernel/arch/arm32/include

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

kernel/arch/arm32/include/arch

Files:

• asm.h (modified) (2 diffs)
• atomic.h (modified) (1 diff)
• mm/page_armv4.h (modified) (4 diffs)
• mm/page_armv6.h (modified) (5 diffs)

kernel/arch/arm32/include/arch/asm.h

@@ -105 +105 @@
 {
         uintptr_t v;
-        
+
         asm volatile (
                 "and %[v], sp, %[size]\n"
@@ -111 +111 @@
                 : [size] "r" (~(STACK_SIZE - 1))
         );
-        
+
         return v;
 }

kernel/arch/arm32/include/arch/atomic.h

@@ -59 +59 @@
         atomic_count_t ret = val->count;
         interrupts_restore(ipl);
-        
+
         return ret;
 }

kernel/arch/arm32/include/arch/mm/page_armv4.h

@@ -137 +137 @@
         pte_level0_t *p = &pt[i].l0;
         int np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT);
-        
+
         return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) |
             (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) |
@@ -152 +152 @@
 {
         pte_level1_t *p = &pt[i].l1;
-        
+
         int dt = p->descriptor_type;
         int ap = p->access_permission_0;
-        
+
         return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) |
             ((ap == PTE_AP_USER_RO_KERNEL_RW) << PAGE_READ_SHIFT) |
@@ -177 +177 @@
 {
         pte_level0_t *p = &pt[i].l0;
-        
+
         if (flags & PAGE_NOT_PRESENT) {
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
@@ -206 +206 @@
 {
         pte_level1_t *p = &pt[i].l1;
-        
+
         if (flags & PAGE_NOT_PRESENT)
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
         else
                 p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
-        
+
         p->cacheable = p->bufferable = (flags & PAGE_CACHEABLE) != 0;
-        
+
         /* default access permission */
         p->access_permission_0 = p->access_permission_1 =
             p->access_permission_2 = p->access_permission_3 =
             PTE_AP_USER_NO_KERNEL_RW;
-        
+
         if (flags & PAGE_USER)  {
                 if (flags & PAGE_READ) {

kernel/arch/arm32/include/arch/mm/page_armv6.h

@@ -170 +170 @@
         const pte_level0_t *p = &pt[i].l0;
         const unsigned np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT);
-        
+
         return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) |
             (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) |
@@ -185 +185 @@
 {
         const pte_level1_t *p = &pt[i].l1;
-        
+
         const unsigned dt = p->descriptor_type;
         const unsigned ap0 = p->access_permission_0;
         const unsigned ap1 = p->access_permission_1;
-        
+
         return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) |
             ((dt != PTE_DESCRIPTOR_SMALL_PAGE_NX) << PAGE_EXEC_SHIFT) |
@@ -211 +211 @@
 {
         pte_level0_t *p = &pt[i].l0;
-        
+
         if (flags & PAGE_NOT_PRESENT) {
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
@@ -245 +245 @@
 {
         pte_level1_t *p = &pt[i].l1;
-        
+
         if (flags & PAGE_NOT_PRESENT) {
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
@@ -278 +278 @@
                 p->bufferable = 1;
         }
-        
+
         /* Shareable is ignored for devices (non-cacheable),
          * turn it off for normal memory. */
         p->shareable = 0;
-        
+
         p->non_global = !(flags & PAGE_GLOBAL);
-        
+
         /* default access permission: kernel only*/
         p->access_permission_0 = PTE_AP0_USER_NO_KERNEL_FULL;
-        
+
         if (flags & PAGE_USER) {
                 p->access_permission_0 = PTE_AP0_USER_FULL_KERNEL_FULL;