From: Lei Xia Date: Fri, 26 Aug 2011 01:57:44 +0000 (-0500) Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=5c16780e3eb5e4ef59de8e929e2528bb07fce5ec;p=palacios.releases.git Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel Conflicts: linux_usr/Makefile --- 5c16780e3eb5e4ef59de8e929e2528bb07fce5ec diff --cc linux_usr/Makefile index 5392207,a1e9bb4..2a09f45 --- a/linux_usr/Makefile +++ b/linux_usr/Makefile @@@ -34,9 -34,8 +34,11 @@@ v3_user_keyed_stream_example: v3_user_k v3_user_keyed_stream_file: v3_user_keyed_stream_file.c v3_user_keyed_stream.h v3_user_keyed_stream.c gcc -static -I../linux_module v3_user_keyed_stream_file.c v3_user_keyed_stream.c -o v3_user_keyed_stream_file +v3_core_move : v3_core_move.c v3_ctrl.h + gcc -static v3_core_move.c -o v3_core_move + + v3_inject_ecc_scrubber_mce: v3_inject_ecc_scrubber_mce.c + gcc -static -I../linux_module v3_inject_ecc_scrubber_mce.c -o v3_inject_ecc_scrubber_mce clean: - rm -f v3_ctrl v3_cons v3_mem v3_monitor v3_stream v3_user_host_dev_example v3_os_debug v3_user_keyed_stream_example v3_user_keyed_stream_file + rm -f v3_ctrl v3_cons v3_mem v3_monitor v3_stream v3_user_host_dev_example v3_os_debug v3_user_keyed_stream_example v3_user_keyed_stream_file v3_core_migrate