Changeset c739102 in mainline for kernel/arch

Timestamp:

2012-11-21T23:26:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f2c80a

Parents:

bebf97d (diff), 1f7753a (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.

Message:

Mainline changes.

Location:

kernel/arch

Files:

• amd64/Makefile.inc (modified) (1 diff)
• ia64/include/mm/as.h (modified) (1 diff)
• ia64/src/mm/tlb.c (modified) (4 diffs)
• ppc32/src/ppc32.c (modified) (2 diffs)

kernel/arch/amd64/Makefile.inc

@@ -33 +33 @@
 
 FPU_NO_CFLAGS = -mno-sse -mno-sse2
-
-#
-# FIXME:
-#
-# The -fno-optimize-sibling-calls should be removed as soon as a bug
-# in GCC concerning the "large" memory model and tail call optimization
-# is fixed.
-#
-# When GCC generates a code for tail call, instead of generating ..
-#
-#   jmp *fnc
-#
-# it generates an assembly code with an illegal immediate prefix:
-#
-#   jmp *$fnc
-#
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48385 for reference.
-#
-
-CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer -fno-optimize-sibling-calls
+CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)

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

@@ -43 +43 @@
 #define USER_ADDRESS_SPACE_END_ARCH      UINT64_C(0xdfffffffffffffff)
 
-#define USTACK_ADDRESS_ARCH  UINT64_C(0x0000000ff0000000)
-
 typedef struct {
 } as_arch_t;

kernel/arch/ia64/src/mm/tlb.c

@@ -113 +113 @@
         va = page;
         
-        rr.word = rr_read(VA2VRN(va));
-        if ((restore_rr = (rr.map.rid != ASID2RID(asid, VA2VRN(va))))) {
+        rr.word = rr_read(VA2VRN(page));
+        if ((restore_rr = (rr.map.rid != ASID2RID(asid, VA2VRN(page))))) {
                 /*
                  * The selected region register does not contain required RID.
@@ -122 +122 @@
                 
                 rr0 = rr;
-                rr0.map.rid = ASID2RID(asid, VA2VRN(va));
-                rr_write(VA2VRN(va), rr0.word);
+                rr0.map.rid = ASID2RID(asid, VA2VRN(page));
+                rr_write(VA2VRN(page), rr0.word);
                 srlz_d();
                 srlz_i();
@@ -139 +139 @@
         case 1: /* cnt 4 - 15 */
                 ps = PAGE_WIDTH + 2;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 2: /* cnt 16 - 63 */
                 ps = PAGE_WIDTH + 4;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 3: /* cnt 64 - 255 */
                 ps = PAGE_WIDTH + 6;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 4: /* cnt 256 - 1023 */
                 ps = PAGE_WIDTH + 8;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 5: /* cnt 1024 - 4095 */
                 ps = PAGE_WIDTH + 10;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 6: /* cnt 4096 - 16383 */
                 ps = PAGE_WIDTH + 12;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         case 7: /* cnt 16384 - 65535 */
         case 8: /* cnt 65536 - (256K - 1) */
                 ps = PAGE_WIDTH + 14;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         default:
                 ps = PAGE_WIDTH + 18;
-                va &= ~((1 << ps) - 1);
+                va &= ~((1UL << ps) - 1);
                 break;
         }
         
-        for (; va < (page + cnt * PAGE_SIZE); va += (1 << ps))
+        for (; va < (page + cnt * PAGE_SIZE); va += (1UL << ps))
                 asm volatile (
                         "ptc.l %[va], %[ps] ;;"
@@ -183 +183 @@
         
         if (restore_rr) {
-                rr_write(VA2VRN(va), rr.word);
+                rr_write(VA2VRN(page), rr.word);
                 srlz_d();
                 srlz_i();

kernel/arch/ppc32/src/ppc32.c

@@ -103 +103 @@
 }
 
+#ifdef CONFIG_FB
 static bool display_register(ofw_tree_node_t *node, void *arg)
 {
@@ -169 +170 @@
         return true;
 }
+#endif
 
 void arch_post_mm_init(void)