Merge branch 'akpm' (aka "Andrew's patch-bomb")
Andrew elucidates: - First installmeant of MM. We have a HUGE number of MM patches this time. It's crazy. - MAINTAINERS updates - backlight updates - leds - checkpatch updates - misc ELF stuff - rtc updates - reiserfs - procfs - some misc other bits * akpm: (124 commits) user namespace: make signal.c respect user namespaces workqueue: make alloc_workqueue() take printf fmt and args for name procfs: add hidepid= and gid= mount options procfs: parse mount options procfs: introduce the /proc/<pid>/map_files/ directory procfs: make proc_get_link to use dentry instead of inode signal: add block_sigmask() for adding sigmask to current->blocked sparc: make SA_NOMASK a synonym of SA_NODEFER reiserfs: don't lock root inode searching reiserfs: don't lock journal_init() reiserfs: delay reiserfs lock until journal initialization reiserfs: delete comments referring to the BKL drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030 drivers/rtc/: remove redundant spi driver bus initialization drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static rtc: convert drivers/rtc/* to use module_platform_driver() drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc() drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler ...
This commit is contained in:
@@ -147,7 +147,7 @@ DEFINE_EVENT(kmem_free, kmem_cache_free,
|
||||
TP_ARGS(call_site, ptr)
|
||||
);
|
||||
|
||||
TRACE_EVENT(mm_page_free_direct,
|
||||
TRACE_EVENT(mm_page_free,
|
||||
|
||||
TP_PROTO(struct page *page, unsigned int order),
|
||||
|
||||
@@ -169,7 +169,7 @@ TRACE_EVENT(mm_page_free_direct,
|
||||
__entry->order)
|
||||
);
|
||||
|
||||
TRACE_EVENT(mm_pagevec_free,
|
||||
TRACE_EVENT(mm_page_free_batched,
|
||||
|
||||
TP_PROTO(struct page *page, int cold),
|
||||
|
||||
|
33
include/trace/events/oom.h
Normal file
33
include/trace/events/oom.h
Normal file
@@ -0,0 +1,33 @@
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM oom
|
||||
|
||||
#if !defined(_TRACE_OOM_H) || defined(TRACE_HEADER_MULTI_READ)
|
||||
#define _TRACE_OOM_H
|
||||
#include <linux/tracepoint.h>
|
||||
|
||||
TRACE_EVENT(oom_score_adj_update,
|
||||
|
||||
TP_PROTO(struct task_struct *task),
|
||||
|
||||
TP_ARGS(task),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field( pid_t, pid)
|
||||
__array( char, comm, TASK_COMM_LEN )
|
||||
__field( int, oom_score_adj)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->pid = task->pid;
|
||||
memcpy(__entry->comm, task->comm, TASK_COMM_LEN);
|
||||
__entry->oom_score_adj = task->signal->oom_score_adj;
|
||||
),
|
||||
|
||||
TP_printk("pid=%d comm=%s oom_score_adj=%d",
|
||||
__entry->pid, __entry->comm, __entry->oom_score_adj)
|
||||
);
|
||||
|
||||
#endif
|
||||
|
||||
/* This part must be outside protection */
|
||||
#include <trace/define_trace.h>
|
61
include/trace/events/task.h
Normal file
61
include/trace/events/task.h
Normal file
@@ -0,0 +1,61 @@
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM task
|
||||
|
||||
#if !defined(_TRACE_TASK_H) || defined(TRACE_HEADER_MULTI_READ)
|
||||
#define _TRACE_TASK_H
|
||||
#include <linux/tracepoint.h>
|
||||
|
||||
TRACE_EVENT(task_newtask,
|
||||
|
||||
TP_PROTO(struct task_struct *task, unsigned long clone_flags),
|
||||
|
||||
TP_ARGS(task, clone_flags),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field( pid_t, pid)
|
||||
__array( char, comm, TASK_COMM_LEN)
|
||||
__field( unsigned long, clone_flags)
|
||||
__field( int, oom_score_adj)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->pid = task->pid;
|
||||
memcpy(__entry->comm, task->comm, TASK_COMM_LEN);
|
||||
__entry->clone_flags = clone_flags;
|
||||
__entry->oom_score_adj = task->signal->oom_score_adj;
|
||||
),
|
||||
|
||||
TP_printk("pid=%d comm=%s clone_flags=%lx oom_score_adj=%d",
|
||||
__entry->pid, __entry->comm,
|
||||
__entry->clone_flags, __entry->oom_score_adj)
|
||||
);
|
||||
|
||||
TRACE_EVENT(task_rename,
|
||||
|
||||
TP_PROTO(struct task_struct *task, char *comm),
|
||||
|
||||
TP_ARGS(task, comm),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field( pid_t, pid)
|
||||
__array( char, oldcomm, TASK_COMM_LEN)
|
||||
__array( char, newcomm, TASK_COMM_LEN)
|
||||
__field( int, oom_score_adj)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->pid = task->pid;
|
||||
memcpy(entry->oldcomm, task->comm, TASK_COMM_LEN);
|
||||
memcpy(entry->newcomm, comm, TASK_COMM_LEN);
|
||||
__entry->oom_score_adj = task->signal->oom_score_adj;
|
||||
),
|
||||
|
||||
TP_printk("pid=%d oldcomm=%s newcomm=%s oom_score_adj=%d",
|
||||
__entry->pid, __entry->oldcomm,
|
||||
__entry->newcomm, __entry->oom_score_adj)
|
||||
);
|
||||
|
||||
#endif
|
||||
|
||||
/* This part must be outside protection */
|
||||
#include <trace/define_trace.h>
|
Reference in New Issue
Block a user