gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coredump: Change type of coretable.len to loff_t from int

Browse Source 
Fujitsu: POSTK_DEBUG_TEMP_FIX_61
Change-Id: I6a27a8d477c3b3dcc12be772a15dfcff370bd2a8
This commit is contained in:
Ken Sato
2018-08-18 10:23:55 +09:00
committed by Masamichi Takagi
parent 38c08a6663
commit 29c5c68761
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
executer/kernel/mcctrl/mcctrl.h
View File

@ -110,17 +110,10 @@
#define __NR_coredump 999 #define __NR_coredump 999
#ifdef POSTK_DEBUG_TEMP_FIX_61 /* Core table size and lseek return value to loff_t */
struct coretable { struct coretable {
loff_t len; loff_t len;
unsigned long addr; 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 { enum mcctrl_os_cpu_operation {
MCCTRL_OS_CPU_READ_REGISTER, MCCTRL_OS_CPU_READ_REGISTER,

12
executer/kernel/mcctrl/syscall.c
View File

@ -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) { static int writecore(ihk_os_t os, unsigned long rcoretable, int chunks) {
struct file *file; struct file *file;
struct coretable *coretable; struct coretable *coretable;
#ifdef POSTK_DEBUG_TEMP_FIX_61 /* Core table size and lseek return value to loff_t */
int i, tablesize, error = 0; int i, tablesize, error = 0;
loff_t size; loff_t size;
ssize_t ret; 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; unsigned long phys, tablephys, rphys;
ihk_device_t dev = ihk_os_to_dev(os); ihk_device_t dev = ihk_os_to_dev(os);
char *pt; 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_virtual(dev, pt, size);
ihk_device_unmap_memory(dev, phys, size); ihk_device_unmap_memory(dev, phys, size);
if (ret != 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); 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); error = PTR_ERR(file);
break; 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); ret = file->f_op->llseek(file, size, SEEK_CUR);
if (ret < 0) { 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); 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); error = PTR_ERR(file);
break; break;
} }

7
kernel/include/syscall.h
View File

@ -365,17 +365,10 @@ enum {
#undef SYSCALL_DELEGATED #undef SYSCALL_DELEGATED
#define __NR_coredump 999 /* pseudo syscall for coredump */ #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 */ struct coretable { /* table entry for a core chunk */
off_t len; /* length of the chunk */ off_t len; /* length of the chunk */
unsigned long addr; /* physical addr 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 #ifdef POSTK_DEBUG_TEMP_FIX_1
void create_proc_procfs_files(int pid, int tid, int cpuid); void create_proc_procfs_files(int pid, int tid, int cpuid);