Merge branch 'master' of postpeta.pccluster.org:mckernel

kernel/Makefile

@@ -1,40 +0,0 @@
-#BUILD_TARGET = builtin-mic attached-mic
-BUILD_TARGET ?= attached-mic
-SRC = $(CURDIR)
-
-IHKBASE ?= $(SRC)/../../ihk/cokernel
-O ?= $(KBUILD_OUTPUT)
-V ?= $(VERBOSE)
-
-KERNEL = kernel.img
-KERNELS = $(addsuffix /$(KERNEL),$(addprefix $(O)/,$(BUILD_TARGET)))
-
-SUBCMD_OPTS = V='$(V)'
-
-$(if $(O),,$(error Specify the compilation target directory))
-#$(if $(shell ls $(IHKBASE)/Makefile),,\
-#	$(error IHK is not found in $(IHKBASE)))
-
-.PHONY: all clean depend
-
-all: $(KERNELS)
-
-%/kernel.img: %/Makefile
-	@echo 'Building for' $(dir $@)
-	@make --no-print-directory -C $(dir $@) $(SUBCMD_OPTS)
-
-%/Makefile: Makefile.build FORCE
-	@mkdir -p $(dir $@)
-	@echo 'SRC = $(SRC)' > $@
-	@echo 'IHKBASE = $(IHKBASE)' >> $@
-	@echo 'TARGET = $(notdir $(patsubst %/,%,$(dir $@)))' >> $@
-	@echo 'TARGETDIR = $$(shell echo $$(TARGET) | sed "s/-/\//")' >> $@
-	@cat Makefile.build >> $@
-	@rm -f $(dir $@)/Makefile.dep
-
-clean: $(addsuffix .clean,$(BUILD_TARGET))
-
-%.clean: $(O)/%/Makefile
-	@make --no-print-directory -C $(O)/$(basename $@) $(SUBCMD_OPTS) clean
-
-FORCE:

kernel/debug.c

@@ -20,9 +20,12 @@ void kputs(char *buf)
 
 	if (len + kmsg_buf.tail > kmsg_buf.len) {
 		kmsg_buf.tail = 0;
+		if(len > kmsg_buf.len) {
+			len = kmsg_buf.len;
+		}
 	}
 	
-	strncpy(kmsg_buf.str + kmsg_buf.tail, buf, len);
+	memcpy(kmsg_buf.str + kmsg_buf.tail, buf, len);
 	kmsg_buf.tail += len;
 
 	ihk_mc_spinlock_unlock(&kmsg_lock, flags);

kernel/host.c

@@ -49,7 +49,7 @@ static void process_msg_prepare_process(unsigned long rphys)
 
 	sz = sizeof(struct program_load_desc)
 		+ sizeof(struct program_image_section) * 16;
-	npages = (sz + PAGE_SIZE - 1) >> PAGE_SHIFT;
+	npages = ((rphys + sz - 1) >> PAGE_SHIFT) - (rphys >> PAGE_SHIFT) + 1;
 
 	phys = ihk_mc_map_memory(NULL, rphys, sz);
 	p = ihk_mc_map_virtual(phys, npages, PTATTR_WRITABLE);

kernel/syscall.c

@@ -1055,7 +1055,7 @@ SYSCALL_DECLARE(sched_getaffinity)
 
 	CPU_ZERO_S(min_len, mask);
 	for (cpu_id = 0; cpu_id < min_ncpus; ++cpu_id)
-		CPU_SET_S(min_len, cpu_id, mask);
+		CPU_SET_S(cpu_info->hw_ids[cpu_id], min_len, mask);
 
     //	dkprintf("sched_getaffinity returns full mask\n");