Changeset b1c57a8 in mainline for kernel/Makefile

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• kernel/Makefile (modified) (6 diffs)

kernel/Makefile

@@ -198 +198 @@
         generic/src/adt/bitmap.c \
         generic/src/adt/btree.c \
+        generic/src/adt/cht.c \
         generic/src/adt/hash_table.c \
         generic/src/adt/list.c \
@@ -204 +205 @@
         generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
+        generic/src/cpu/cpu_mask.c \
         generic/src/ddi/ddi.c \
         generic/src/ddi/irq.c \
@@ -257 +259 @@
         generic/src/synch/semaphore.c \
         generic/src/synch/smc.c \
+        generic/src/synch/smp_memory_barrier.c \
         generic/src/synch/waitq.c \
         generic/src/synch/futex.c \
+        generic/src/synch/workqueue.c \
+        generic/src/synch/rcu.c \
         generic/src/smp/ipi.c \
         generic/src/smp/smp.c \
+        generic/src/smp/smp_call.c \
         generic/src/ipc/ipc.c \
         generic/src/ipc/sysipc.c \
@@ -310 +316 @@
                 test/atomic/atomic1.c \
                 test/btree/btree1.c \
+                test/cht/cht1.c \
                 test/avltree/avltree1.c \
                 test/fault/fault1.c \
@@ -319 +326 @@
                 test/synch/semaphore1.c \
                 test/synch/semaphore2.c \
+                test/synch/workqueue2.c \
+                test/synch/workqueue3.c \
+                test/synch/rcu1.c \
                 test/print/print1.c \
                 test/print/print2.c \
@@ -324 +334 @@
                 test/print/print4.c \
                 test/print/print5.c \
-                test/thread/thread1.c
+                test/thread/thread1.c \
+                test/smpcall/smpcall1.c
         
         ifeq ($(KARCH),mips32)