From: Florian Krohm <florian@eich-krohm.de>
Date: Tue, 27 Jan 2015 20:46:19 +0000 (+0000)
Subject: Remove unused field from NSegment structure.
X-Git-Tag: svn/VALGRIND_3_11_0~701
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb3b3b58b1cb8ca5fe71f7b8a00b10529ffaf7a1;p=thirdparty%2Fvalgrind.git

Remove unused field from NSegment structure.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14891
---

diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index 224cb33b9a..9359362042 100644
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -523,7 +523,7 @@ static void __attribute__ ((unused))
    VG_(debugLog)(
       logLevel, "aspacem",
       "%3d: %s %010llx-%010llx %s %c%c%c%c%c %s "
-      "d=0x%03llx i=%-7lld o=%-7lld (%d) m=%d %s\n",
+      "d=0x%03llx i=%-7lld o=%-7lld (%d) %s\n",
       segNo, show_SegKind(seg->kind),
       (ULong)seg->start, (ULong)seg->end, len_buf,
       seg->hasR ? 'r' : '-', seg->hasW ? 'w' : '-', 
@@ -531,7 +531,7 @@ static void __attribute__ ((unused))
       seg->isCH ? 'H' : '-',
       show_ShrinkMode(seg->smode),
       seg->dev, seg->ino, seg->offset, seg->fnIdx,
-      (Int)seg->mark, name
+      name
    );
 }
 
@@ -703,9 +703,6 @@ static Bool sane_NSegment ( const NSegment* s )
    /* No zero sized segments and no wraparounds. */
    if (s->start >= s->end) return False;
 
-   /* .mark is used for admin purposes only. */
-   if (s->mark) return False;
-
    /* require page alignment */
    if (!VG_IS_PAGE_ALIGNED(s->start)) return False;
    if (!VG_IS_PAGE_ALIGNED(s->end+1)) return False;
@@ -1542,7 +1539,6 @@ static void init_nsegment ( /*OUT*/NSegment* seg )
    seg->offset   = 0;
    seg->fnIdx    = -1;
    seg->hasR = seg->hasW = seg->hasX = seg->hasT = seg->isCH = False;
-   seg->mark = False;
 }
 
 /* Make an NSegment which holds a reservation. */
diff --git a/include/pub_tool_aspacemgr.h b/include/pub_tool_aspacemgr.h
index a10e21fb4c..333158a8dc 100644
--- a/include/pub_tool_aspacemgr.h
+++ b/include/pub_tool_aspacemgr.h
@@ -112,8 +112,6 @@ typedef
       Bool    hasT;     // True --> translations have (or MAY have)
                         // been taken from this segment
       Bool    isCH;     // True --> is client heap (SkAnonC ONLY)
-      /* Admin */
-      Bool    mark;
    }
    NSegment;