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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

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 */