Changeset 8b655705 in mainline for kernel/generic/include/sysinfo/abi.h

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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:

Merge mainline changes.

File:

• kernel/generic/include/sysinfo/abi.h (modified) (1 diff)

kernel/generic/include/sysinfo/abi.h

@@ -104 +104 @@
         char name[TASK_NAME_BUFLEN];  /**< Task name (in kernel) */
         size_t virtmem;               /**< Size of VAS (bytes) */
+        size_t resmem;                /**< Size of resident (used) memory (bytes) */
         size_t threads;               /**< Number of threads */
         uint64_t ucycles;             /**< Number of CPU cycles in user space */