Changeset a35b458 in mainline for kernel/arch/arm32/include

Timestamp:

2018-03-02T20:10:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

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;