diff --git a/executer/kernel/mcctrl/mcctrl.h b/executer/kernel/mcctrl/mcctrl.h index 2ead9c23..c3b47662 100644 --- a/executer/kernel/mcctrl/mcctrl.h +++ b/executer/kernel/mcctrl/mcctrl.h @@ -110,17 +110,10 @@ #define __NR_coredump 999 -#ifdef POSTK_DEBUG_TEMP_FIX_61 /* Core table size and lseek return value to loff_t */ struct coretable { loff_t len; unsigned long addr; }; -#else /* POSTK_DEBUG_TEMP_FIX_61 */ -struct coretable { - int len; - unsigned long addr; -}; -#endif /* POSTK_DEBUG_TEMP_FIX_61 */ enum mcctrl_os_cpu_operation { MCCTRL_OS_CPU_READ_REGISTER, diff --git a/executer/kernel/mcctrl/syscall.c b/executer/kernel/mcctrl/syscall.c index fe077c67..dfe30f16 100644 --- a/executer/kernel/mcctrl/syscall.c +++ b/executer/kernel/mcctrl/syscall.c @@ -2149,13 +2149,9 @@ int release_user_space(uintptr_t start, uintptr_t len) static int writecore(ihk_os_t os, unsigned long rcoretable, int chunks) { struct file *file; struct coretable *coretable; -#ifdef POSTK_DEBUG_TEMP_FIX_61 /* Core table size and lseek return value to loff_t */ int i, tablesize, error = 0; loff_t size; ssize_t ret; -#else /* POSTK_DEBUG_TEMP_FIX_61 */ - int ret, i, tablesize, size, error = 0; -#endif /* POSTK_DEBUG_TEMP_FIX_61 */ unsigned long phys, tablephys, rphys; ihk_device_t dev = ihk_os_to_dev(os); char *pt; @@ -2216,11 +2212,7 @@ static int writecore(ihk_os_t os, unsigned long rcoretable, int chunks) { ihk_device_unmap_virtual(dev, pt, size); ihk_device_unmap_memory(dev, phys, size); if (ret != size) { -#ifdef POSTK_DEBUG_TEMP_FIX_61 /* Core table size and lseek return value to loff_t */ dprintk("core file write failed(%ld).\n", ret); -#else /* POSTK_DEBUG_TEMP_FIX_61 */ - dprintk("core file write failed(%d).\n", ret); -#endif /* POSTK_DEBUG_TEMP_FIX_61 */ error = PTR_ERR(file); break; } @@ -2233,11 +2225,7 @@ static int writecore(ihk_os_t os, unsigned long rcoretable, int chunks) { } ret = file->f_op->llseek(file, size, SEEK_CUR); if (ret < 0) { -#ifdef POSTK_DEBUG_TEMP_FIX_61 /* Core table size and lseek return value to loff_t */ dprintk("core file seek failed(%ld).\n", ret); -#else /* POSTK_DEBUG_TEMP_FIX_61 */ - dprintk("core file seek failed(%d).\n", ret); -#endif /* POSTK_DEBUG_TEMP_FIX_61 */ error = PTR_ERR(file); break; } diff --git a/kernel/include/syscall.h b/kernel/include/syscall.h index adaeb65f..2a3323ac 100644 --- a/kernel/include/syscall.h +++ b/kernel/include/syscall.h @@ -365,17 +365,10 @@ enum { #undef SYSCALL_DELEGATED #define __NR_coredump 999 /* pseudo syscall for coredump */ -#ifdef POSTK_DEBUG_TEMP_FIX_61 /* Core table size and lseek return value to loff_t */ struct coretable { /* table entry for a core chunk */ off_t len; /* length of the chunk */ unsigned long addr; /* physical addr of the chunk */ }; -#else /* POSTK_DEBUG_TEMP_FIX_61 */ -struct coretable { /* table entry for a core chunk */ - int len; /* length of the chunk */ - unsigned long addr; /* physical addr of the chunk */ -}; -#endif /* POSTK_DEBUG_TEMP_FIX_61 */ #ifdef POSTK_DEBUG_TEMP_FIX_1 void create_proc_procfs_files(int pid, int tid, int cpuid);