Changeset 2c2d54a in mainline for kernel/Makefile

Timestamp:

2016-09-02T17:58:05Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (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 from lp:~jakub/helenos/pager

File:

• kernel/Makefile (modified) (2 diffs)

kernel/Makefile

@@ -237 +237 @@
         generic/src/mm/backend_elf.c \
         generic/src/mm/backend_phys.c \
+        generic/src/mm/backend_user.c \
         generic/src/mm/slab.c \
         generic/src/lib/func.c \
@@ -278 +279 @@
         generic/src/ipc/ops/datawrite.c \
         generic/src/ipc/ops/debug.c \
+        generic/src/ipc/ops/pagein.c \
         generic/src/ipc/ops/sharein.c \
         generic/src/ipc/ops/shareout.c \