Changeset 0cf1dcf in mainline

Timestamp:

2006-11-28T23:03:04Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

058b021

Parents:

d4b5542

Message:

Indentation and comment fixes.

Location:

kernel

Files:

• arch/sparc64/src/mm/tsb.c (modified) (2 diffs)
• arch/sparc64/src/start.S (modified) (1 diff)
• doc/arch/sparc64 (modified) (1 diff)
• generic/include/macros.h (modified) (1 diff)
• generic/include/mm/frame.h (modified) (1 diff)

kernel/arch/sparc64/src/mm/tsb.c

@@ -99 +99 @@
         tsb->data.value = 0;
         tsb->data.size = PAGESIZE_8K;
-        tsb->data.pfn = t->frame >> PAGE_WIDTH;
+        tsb->data.pfn = t->frame >> FRAME_WIDTH;
         tsb->data.cp = t->c;
 #ifdef CONFIG_VIRT_IDX_CACHE
@@ -141 +141 @@
         tsb->data.value = 0;
         tsb->data.size = PAGESIZE_8K;
-        tsb->data.pfn = t->frame >> PAGE_WIDTH;
+        tsb->data.pfn = t->frame >> FRAME_WIDTH;
         tsb->data.cp = t->c;
 #ifdef CONFIG_VIRT_IDX_CACHE

kernel/arch/sparc64/src/start.S

@@ -65 +65 @@
 kernel_image_start:
         mov BSP_FLAG, %l0
-        and %o0, %l0, %l7                               ! l7 <= bootstrap processor?
-        andn %o0, %l0, %l6                              ! l6 <= start of physical memory
+        and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
+        andn %o0, %l0, %l6                      ! l6 <= start of physical memory
 
         ! Get bits 40:13 of physmem_base.
         srlx %l6, 13, %l5
         sllx %l5, 13 + (63 - 40), %l5
-        srlx %l5, 63 - 40, %l5                          ! l5 <= physmem_base[40:13]
+        srlx %l5, 63 - 40, %l5                  ! l5 <= physmem_base[40:13]
         
         /*

kernel/doc/arch/sparc64

@@ -10 +10 @@
 MACHINES
         o Sun Ultra 5
+        o Sun Ultra 60
         o Sun Enterprise E6500 (simulated)
                 

kernel/generic/include/macros.h

@@ -43 +43 @@
 #define is_upper(c)             (((c) >= 'A') && ((c) <= 'Z'))
 #define is_alpha(c)             (is_lower(c) || is_upper(c))
-#define is_alphanum(c)  (is_alpha(c) || is_digit(c))
+#define is_alphanum(c)          (is_alpha(c) || is_digit(c))
 #define is_white(c)             (((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r'))
 

kernel/generic/include/mm/frame.h

@@ -58 +58 @@
 #define ZONE_JOIN       0x1     /**< If possible, merge with neighbouring zones */
 
-#define FRAME_KA                0x1     /* skip frames conflicting with user address space */
+#define FRAME_KA                0x1     /* convert the frame address to kernel va */
 #define FRAME_ATOMIC            0x2     /* do not panic and do not sleep on failure */
 #define FRAME_NO_RECLAIM        0x4     /* do not start reclaiming when no free memory */