VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / ia64 / kernel / unwind.c

diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c
index e8be972..769d880 100644 (file)
--- a/arch/ia64/kernel/unwind.c
+++ b/arch/ia64/kernel/unwind.c
@@ -385,9 +385,10 @@ unw_access_gr (struct unw_frame_info *info, int regnum, unsigned long *val, char
        }
 
        if (write) {
-               if (read_only(addr))
-                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n");
-               else {
+               if (read_only(addr)) {
+                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n",
+                               __FUNCTION__);
+               } else {
                        *addr = *val;
                        if (*nat)
                                *nat_addr |= nat_mask;
@@ -432,9 +433,10 @@ unw_access_br (struct unw_frame_info *info, int regnum, unsigned long *val, int
                return -1;
        }
        if (write)
-               if (read_only(addr))
-                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n");
-               else
+               if (read_only(addr)) {
+                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n",
+                               __FUNCTION__);
+               } else
                        *addr = *val;
        else
                *val = *addr;
@@ -480,9 +482,10 @@ unw_access_fr (struct unw_frame_info *info, int regnum, struct ia64_fpreg *val,
        }
 
        if (write)
-               if (read_only(addr))
-                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n");
-               else
+               if (read_only(addr)) {
+                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n",
+                               __FUNCTION__);
+               } else
                        *addr = *val;
        else
                *val = *addr;
@@ -576,9 +579,10 @@ unw_access_ar (struct unw_frame_info *info, int regnum, unsigned long *val, int
        }
 
        if (write) {
-               if (read_only(addr))
-                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n");
-               else
+               if (read_only(addr)) {
+                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n",
+                               __FUNCTION__);
+               } else
                        *addr = *val;
        } else
                *val = *addr;
@@ -596,9 +600,10 @@ unw_access_pr (struct unw_frame_info *info, unsigned long *val, int write)
                addr = &info->sw->pr;
 
        if (write) {
-               if (read_only(addr))
-                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n");
-               else
+               if (read_only(addr)) {
+                       UNW_DPRINT(0, "unwind.%s: ignoring attempt to write read-only location\n",
+                               __FUNCTION__);
+               } else
                        *addr = *val;
        } else
                *val = *addr;