Changeset 3ee8a075 in mainline for kernel/arch/ia64/src/mm/tlb.c

Timestamp:

2007-06-06T20:25:51Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6b781c0

Parents:

44bec47

Message:

Replace gcc-specific FUNCTION with C99 func.
suncc's xregs=no%float can be used only on sparc64.

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (7 diffs)

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

@@ -471 +471 @@
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate,"Page fault at %p",va);
-                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+                        panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
                 }
         }
@@ -518 +518 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate,"Page fault at %p",va);
-                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+                        panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
                 }
         }
@@ -532 +532 @@
 void data_nested_tlb_fault(uint64_t vector, istate_t *istate)
 {
-        panic("%s\n", __FUNCTION__);
+        panic("%s\n", __func__);
 }
 
@@ -564 +564 @@
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate,"Page fault at %p",va);
-                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+                        panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
                         t->d = true;
                         dtc_pte_copy(t);
@@ -601 +601 @@
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate,"Page fault at %p",va);
-                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+                        panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
                         t->a = true;
                         itc_pte_copy(t);
@@ -638 +638 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate,"Page fault at %p",va);
-                        panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
+                        panic("%s: va=%p, rid=%d, iip=%p\n", __func__, va, rid, istate->cr_iip);
                         t->a = true;
                         itc_pte_copy(t);
@@ -680 +680 @@
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
                         fault_if_from_uspace(istate,"Page fault at %p",va);
-                        panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rid);
+                        panic("%s: va=%p, rid=%d\n", __func__, va, rid);
                 }
         }