diff options
| -rw-r--r-- | arch/x86/kernel/syscall_64.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/traps.c | 4 | ||||
| -rw-r--r-- | drivers/input/input.c | 3 | ||||
| -rw-r--r-- | kernel/module.c | 2 | ||||
| -rw-r--r-- | kernel/softirq.c | 2 | ||||
| -rw-r--r-- | mm/swapfile.c | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c index bbbffe0c2c3..5e74f6aa3c0 100644 --- a/arch/x86/kernel/syscall_64.c +++ b/arch/x86/kernel/syscall_64.c @@ -38,7 +38,8 @@ void ltt_dump_sys_call_table(void *call_data) for (i = 0; i < __NR_syscall_max + 1; i++) { sprint_symbol(namebuf, (unsigned long)sys_call_table[i]); - __trace_mark(0, statedump_sys_call_table, call_data, + __trace_mark(0, syscall_state, sys_call_table, + call_data, "id %d address %p symbol %s", i, (void*)sys_call_table[i], namebuf); } diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 75545e51b1d..d45030679f9 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -635,7 +635,7 @@ void ltt_dump_sys_call_table(void *call_data) for (i = 0; i < NR_syscalls; i++) { sprint_symbol(namebuf, sys_call_table[i]); - __trace_mark(0, statedump_sys_call_table, call_data, + __trace_mark(0, syscall_state, sys_call_table, call_data, "id %d address %p symbol %s", i, (void*)sys_call_table[i], namebuf); } @@ -795,7 +795,7 @@ void ltt_dump_idt_table(void *call_data) for (i = 0; i < IDT_ENTRIES; i++) { unsigned long address = gate_offset(idt_table[i]); sprint_symbol(namebuf, address); - __trace_mark(0, statedump_idt_table, call_data, + __trace_mark(0, irq_state, idt_table, call_data, "irq %d address %p symbol %s", i, (void *)address, namebuf); } diff --git a/drivers/input/input.c b/drivers/input/input.c index 9f283a479bb..38930b01cb2 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -218,7 +218,8 @@ static void input_handle_event(struct input_dev *dev, { int disposition = INPUT_IGNORE_EVENT; - trace_mark(input_event, "type %u code %u value %d", type, code, value); + trace_mark(input, input_event, + "type %u code %u value %d", type, code, value); switch (type) { diff --git a/kernel/module.c b/kernel/module.c index 5c328a75482..e9533c50aa2 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3307,7 +3307,7 @@ void list_modules(void *call_data) #ifdef CONFIG_MODULE_UNLOAD refcount = module_refcount(mod); #endif - __trace_mark(0, list_module, call_data, + __trace_mark(0, module_state, list_module, call_data, "name %s state %d refcount %lu", mod->name, mod->state, refcount); } diff --git a/kernel/softirq.c b/kernel/softirq.c index 8350648bf0e..b1298af67c3 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -63,7 +63,7 @@ void ltt_dump_softirq_vec(void *call_data) for (i = 0; i < 32; i++) { sprint_symbol(namebuf, (unsigned long)softirq_vec[i].action); - __trace_mark(0, statedump_softirq_vec, call_data, + __trace_mark(0, softirq_state, softirq_vec, call_data, "id %d address %p symbol %s", i, softirq_vec[i].action, namebuf); } diff --git a/mm/swapfile.c b/mm/swapfile.c index 6a9e8645c36..41a00cead75 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2584,7 +2584,7 @@ void ltt_dump_swap_files(void *call_data) p = swap_info[type]; if (!(p->flags & SWP_WRITEOK)) continue; - __trace_mark(0, statedump_swap_files, call_data, + __trace_mark(0, swap_state, statedump_swap_files, call_data, "filp %p vfsmount %p dname %s", p->swap_file, p->swap_file->f_vfsmnt, p->swap_file->f_dentry->d_name.name); |