Changeset 26aafe8 in mainline for kernel/arch/ia64/include

Timestamp:

2011-05-19T16:47:49Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a6d8726

Parents:

bcaca55

Message:

cleanup the huge mess related to stacks, their sizes and locations
use two frames for kernel stacks by default on all platforms (to play it safe)

Location:

kernel/arch/ia64/include

Files:

• arch.h (modified) (1 diff)
• asm.h (modified) (2 diffs)
• mm/as.h (modified) (1 diff)
• mm/frame.h (modified) (1 diff)

kernel/arch/ia64/include/arch.h

@@ -36 +36 @@
 #define KERN_ia64_ARCH_H_
 
-#define LOADED_PROG_STACK_PAGES_NO 2
-
 #include <arch/drivers/ski.h>
 

kernel/arch/ia64/include/asm.h

@@ -131 +131 @@
 NO_TRACE static inline uintptr_t get_stack_base(void)
 {
-        uint64_t v;
+        uint64_t value;
         
         /*
@@ -152 +152 @@
         asm volatile (
                 "mov %[value] = r12"
-                : [value] "=r" (v)
-        );
-        
-        return (v & (~(STACK_SIZE - 1)));
+                : [value] "=r" (value)
+        );
+        
+        return (value & (~(STACK_SIZE - 1)));
 }
 

kernel/arch/ia64/include/mm/as.h

@@ -38 +38 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  ((unsigned long) 0xe000000000000000ULL)
-#define KERNEL_ADDRESS_SPACE_END_ARCH    ((unsigned long) 0xffffffffffffffffULL)
-#define USER_ADDRESS_SPACE_START_ARCH    ((unsigned long) 0x0000000000000000ULL)
-#define USER_ADDRESS_SPACE_END_ARCH      ((unsigned long) 0xdfffffffffffffffULL)
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT64_C(0xe000000000000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT64_C(0xffffffffffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT64_C(0x0000000000000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT64_C(0xdfffffffffffffff)
 
-#define USTACK_ADDRESS_ARCH  0x0000000ff0000000ULL
+#define USTACK_ADDRESS_ARCH  UINT64_C(0x0000000ff0000000)
 
 typedef struct {

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

@@ -49 +49 @@
 #define physmem_print()
 
-#define ARCH_STACK_FRAMES TWO_FRAMES
-
 #endif /* __ASM__ */
 #endif /* KERNEL */