Changes in kernel/arch/ia64/include/asm.h [2f23341:7a0359b] in mainline

File:

• kernel/arch/ia64/include/asm.h (modified) (1 diff)

kernel/arch/ia64/include/asm.h

@@ -122 +122 @@
 }
 
-/** Return base address of current memory stack.
- *
- * The memory stack is assumed to be STACK_SIZE / 2 long. Note that there is
- * also the RSE stack, which takes up the upper half of STACK_SIZE.
- * The memory stack must start on page boundary.
+/** Return base address of current stack
+ *
+ * Return the base address of the current stack.
+ * The stack is assumed to be STACK_SIZE long.
+ * The stack must start on page boundary.
+ *
  */
 NO_TRACE static inline uintptr_t get_stack_base(void)
 {
-        uint64_t value;
+        uint64_t v;
+        
+        /*
+         * I'm not sure why but this code inlines badly
+         * in scheduler, resulting in THE shifting about
+         * 16B and causing kernel panic.
+         *
+         * asm volatile (
+         *     "and %[value] = %[mask], r12"
+         *     : [value] "=r" (v)
+         *     : [mask] "r" (~(STACK_SIZE - 1))
+         * );
+         * return v;
+         *
+         * The following code has the same semantics but
+         * inlines correctly.
+         *
+         */
         
         asm volatile (
                 "mov %[value] = r12"
-                : [value] "=r" (value)
-        );
-        
-        return (value & (~(STACK_SIZE / 2 - 1)));
+                : [value] "=r" (v)
+        );
+        
+        return (v & (~(STACK_SIZE - 1)));
 }