)]}' { "log": [ { "commit": "3bbe84e9d385205d638035ee9dcc4db1b486ea08", "tree": "e7261e9a3ca13f6e2fd34333e4ccab33b265c32e", "parents": [ "a1301da0997bf73c44dbe584e9070a13adc89672" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 01 16:24:01 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 01 17:33:30 2009 +0100" }, "message": "trace_syscalls: Simplify syscall profile\n\nuse only one prof_sysenter_enable() instead of\nprof_sysenter_enable_##sname()\n\nuse only one prof_sysenter_disable() instead of\nprof_sysenter_disable_##sname()\n\nuse only one prof_sysexit_enable() instead of\nprof_sysexit_enable_##sname()\n\nuse only one prof_sysexit_disable() instead of\nprof_sysexit_disable_##sname()\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B14D2A1.8060304@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a1301da0997bf73c44dbe584e9070a13adc89672", "tree": "64c7e580f553291bcaaf065fc0dbceee8daf9cd6", "parents": [ "c252f65793874b56d50395ab604db465ce688665" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 01 16:23:55 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 01 17:33:30 2009 +0100" }, "message": "trace_syscalls: Remove duplicate init_enter_##sname()\n\nuse only one init_syscall_trace instead of\nmany init_enter_##sname()/init_exit_##sname()\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B14D29B.6090708@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c252f65793874b56d50395ab604db465ce688665", "tree": "30bc32361d2b368679910270ec4e99e841fa099b", "parents": [ "fcc19438dda38dacc8c144e2db3ebc6b9fd4f8b8" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 01 16:23:47 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 01 17:33:29 2009 +0100" }, "message": "trace_syscalls: Add syscall_nr field to struct syscall_metadata\n\nAdd syscall_nr field to struct syscall_metadata,\nit helps us to get syscall number easier.\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B14D293.6090800@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "fcc19438dda38dacc8c144e2db3ebc6b9fd4f8b8", "tree": "0f82cd0ce19bc113e2ba631c14f2e8c04884d608", "parents": [ "31c16b13349970b2684248c7d8608d2a96ae135d" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 01 16:23:36 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 01 17:33:29 2009 +0100" }, "message": "trace_syscalls: Remove enter_id exit_id\n\nuse -\u003eenter_event-\u003eid instead of -\u003eenter_id\nuse -\u003eexit_event-\u003eid instead of -\u003eexit_id\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B14D288.7030001@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "31c16b13349970b2684248c7d8608d2a96ae135d", "tree": "0f0a2bee35f604090b30d6724e13bb2faec8a6a5", "parents": [ "bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 01 16:23:30 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 01 17:33:28 2009 +0100" }, "message": "trace_syscalls: Set event_enter_##sname-\u003edata to its metadata\n\nSet event_enter_##sname-\u003edata to its metadata,\nit makes codes simpler.\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B14D282.7050709@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34", "tree": "c6f54058fb427ab9c4f776c9414f85a60b6344b0", "parents": [ "59d069eb5ae9b033ed1c124c92e1532c4a958991" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Tue Dec 01 16:23:20 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 01 17:33:28 2009 +0100" }, "message": "trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit\n\nfix event_enter_##sname-\u003eevent\nfix event_exit_##sname-\u003eevent\n\nremove unused event_syscall_enter and event_syscall_exit\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B14D278.4090209@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "dd1853c3f493f6d22d9e5390b192a07b73d2ac0a", "tree": "af87226bcdc254ce2ab656530263e61f6552322b", "parents": [ "5fa10b28e57f94a90535cfeafe89dcee9f47d540" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Nov 27 04:55:54 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 27 06:22:59 2009 +0100" }, "message": "hw-breakpoints: Use struct perf_event_attr to define kernel breakpoints\n\nKernel breakpoints are created using functions in which we pass\nbreakpoint parameters as individual variables: address, length\nand type.\n\nAlthough it fits well for x86, this just does not scale across\narchitectures that may support this api later as these may have\nmore or different needs. Pass in a perf_event_attr structure\ninstead because it is meant to evolve as much as possible into\na generic hardware breakpoint parameter structure.\n\nReported-by: K.Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c1259294154-5197-2-git-send-regression-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5fa10b28e57f94a90535cfeafe89dcee9f47d540", "tree": "951cf12a3b5b3a37546b4f6dd2994bebdac19dc0", "parents": [ "b2e74a265ded1a185f762ebaab967e9e0d008dd8" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Nov 27 04:55:53 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 27 06:22:58 2009 +0100" }, "message": "hw-breakpoints: Use struct perf_event_attr to define user breakpoints\n\nIn-kernel user breakpoints are created using functions in which\nwe pass breakpoint parameters as individual variables: address,\nlength and type.\n\nAlthough it fits well for x86, this just does not scale across\narchictectures that may support this api later as these may have\nmore or different needs. Pass in a perf_event_attr structure\ninstead because it is meant to evolve as much as possible into\na generic hardware breakpoint parameter structure.\n\nReported-by: K.Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c1259294154-5197-1-git-send-regression-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ba005e1f417295d28cd1563ab82bc33af07fb16a", "tree": "d771659edc46c1bd5467578a6616657c8cf26db5", "parents": [ "f9d4257e01d266e67420cc99d456b6d4c8464f54" ], "author": { "name": "Masami Hiramatsu", "email": "mhiramat@redhat.com", "time": "Tue Nov 24 16:56:58 2009 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 10:55:38 2009 +0100" }, "message": "tracepoint: Add signal loss events\n\nAdd signal_overflow_fail and signal_lose_info tracepoints\nfor signal-lost events.\n\nChanges in v3:\n - Add docbook style comments\n\nChanges in v2:\n - Use siginfo string macro\n\nSuggested-by: Roland McGrath \u003croland@redhat.com\u003e\nReviewed-by: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: systemtap \u003csystemtap@sources.redhat.com\u003e\nCc: DLE \u003cdle-develop@lists.sourceforge.net\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nLKML-Reference: \u003c20091124215658.30449.9934.stgit@dhcp-100-2-132.bos.redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f9d4257e01d266e67420cc99d456b6d4c8464f54", "tree": "6661efc95e3002b9b1bf8d9c94deb9ec736a04de", "parents": [ "d1eb650ff4130972fa21462fa49cd35a2865403b" ], "author": { "name": "Masami Hiramatsu", "email": "mhiramat@redhat.com", "time": "Tue Nov 24 16:56:51 2009 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 10:55:38 2009 +0100" }, "message": "tracepoint: Add signal deliver event\n\nAdd a tracepoint where a process gets a signal. This tracepoint\nshows signal-number, sa-handler and sa-flag.\n\nChanges in v3:\n - Add docbook style comments\n\nChanges in v2:\n - Add siginfo argument\n - Fix comment\n\nSigned-off-by: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nReviewed-by: Jason Baron \u003cjbaron@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: systemtap \u003csystemtap@sources.redhat.com\u003e\nCc: DLE \u003cdle-develop@lists.sourceforge.net\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nLKML-Reference: \u003c20091124215651.30449.20926.stgit@dhcp-100-2-132.bos.redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d1eb650ff4130972fa21462fa49cd35a2865403b", "tree": "e43cee89ccad8adfa06f2e5f746ad96d2e00d9b3", "parents": [ "80bbf6b641c8843b9d751a1f299aa7ee073ab9d4" ], "author": { "name": "Masami Hiramatsu", "email": "mhiramat@redhat.com", "time": "Tue Nov 24 16:56:45 2009 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 10:55:37 2009 +0100" }, "message": "tracepoint: Move signal sending tracepoint to events/signal.h\n\nMove signal sending event to events/signal.h. This patch also\nrenames sched_signal_send event to signal_generate.\n\nChanges in v4:\n - Fix a typo of task_struct pointer.\n\nChanges in v3:\n - Add docbook style comments\n\nChanges in v2:\n - Add siginfo argument\n - Add siginfo storing macro\n\nSigned-off-by: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nReviewed-by: Jason Baron \u003cjbaron@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: systemtap \u003csystemtap@sources.redhat.com\u003e\nCc: DLE \u003cdle-develop@lists.sourceforge.net\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nLKML-Reference: \u003c20091124215645.30449.60208.stgit@dhcp-100-2-132.bos.redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "470dda7417f284b9cfc96560b2acd98df63798a2", "tree": "c24bd04ea87975a56d34f3a86c2d32c9350bc6a0", "parents": [ "b5eb34c3592545c756e50d882c08417eb60740a7" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:08:01 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:05 2009 +0100" }, "message": "tracing: Restore original format of sched events\n\nThe original format for sched_stat_iowait and sched_stat_sleep:\n\n $ cat events/sched/sched_stat_iowait/format\n ...\n print fmt: \"comm\u003d%s pid\u003d%d delay\u003d%Lu [ns]\", ...\n $ cat events/sched/sched_stat_sleep/format\n ...\n print fmt: \"comm\u003d%s pid\u003d%d delay\u003d%Lu [ns]\", ...\n\nBut commit commit 75ec29ab848a7e92a41aaafaeb33d1afbc839be4\n(\"tracing: Convert some sched trace events to DEFINE_EVENT and\n_PRINT\") broke the format:\n\n $ cat events/sched/sched_stat_iowait/format\n print fmt: \"task: %s:%d iowait: %Lu [ns]\", ...\n $ cat events/sched/sched_stat_sleep/format\n print fmt: \"task: %s:%d sleep: %Lu [ns]\", ...\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E2951.9050800@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b5eb34c3592545c756e50d882c08417eb60740a7", "tree": "222b0a0fd4a834573484b3b40917f56b7a24e8eb", "parents": [ "071688f36e7eba3e37b2fc48e35bfdab99b80b4d" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:07:36 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:05 2009 +0100" }, "message": "tracing: Convert some ext4 events to DEFINE_TRACE\n\nUse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 294695 6104 340 301139 49853 fs/ext4/ext4.o.old\n 289983 6104 324 296411 485db fs/ext4/ext4.o\n\n5 events are convertd:\n\n ext4__write_begin: ext4_write_begin, ext4_da_write_begin\n ext4__write_end: ext4_{ordered, writeback, journalled}_write_end\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E2938.2040708@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "071688f36e7eba3e37b2fc48e35bfdab99b80b4d", "tree": "938eeb106c1adcdccfdf55200e1564b28a39240c", "parents": [ "77ca1e0294f25fc26053ba14353e703158acef26" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:06:55 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:04 2009 +0100" }, "message": "tracing: Convert some jbd2 events to DEFINE_EVENT\n\nUse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 34903 1693 448 37044 90b4 fs/jbd2/journal.o.old\n 31931 1693 416 34040 84f8 fs/jbd2/journal.o\n\nFour events are converted:\n\n jbd2_commit: jbd2_start_commit,\n jbd2_commit_{locking, flushing, logging}\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E290F.7030909@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "77ca1e0294f25fc26053ba14353e703158acef26", "tree": "9f227291d8da984b28708ec3bd2b5cc92cb787da", "parents": [ "7703466b4c0a21b88d701882bef0d45bcb0a0281" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:06:14 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:04 2009 +0100" }, "message": "tracing: Convert some block events to DEFINE_EVENT\n\nuse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 53570 3284 184 57038 dece block/blk-core.o.old\n 43702 3284 144 47130 b81a block/blk-core.o\n\n12 events are converted:\n\n block_rq: block_rq_insert, block_rq_issue\n block_rq_with_error: block_rq_{abort, requeue, complete}\n block_bio: block_bio_{backmerge, frontmerge, queue}\n block_get_rq: block_getrq, block_sleeprq\n block_unplug: block_unplug_timer, block_unplug_io\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E28E6.7060609@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7703466b4c0a21b88d701882bef0d45bcb0a0281", "tree": "b2d8b0ae1d0af754adf55fe5190104d3708ffdf5", "parents": [ "382ece710bf88b08440b598731361e5a47582b62" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:05:38 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:03 2009 +0100" }, "message": "tracing: Convert some power events to DEFINE_EVENT\n\nUse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 4312 524 12 4848 12f0 kernel/trace/power-traces.o.old\n 3455 524 8 3987 f93 kernel/trace/power-traces.o\n\nTwo events are converted:\n\n power: power_start, power_frequency\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Arjan van de Ven \u003carjan@infradead.org\u003e\nLKML-Reference: \u003c4B0E28C2.1090906@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "382ece710bf88b08440b598731361e5a47582b62", "tree": "c261ffb1229d1e1c329be362f97a89f03060c7ed", "parents": [ "c467307c1a812c3150b27a68c2b2d3397bb40a4f" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:05:03 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:03 2009 +0100" }, "message": "tracing: Convert some workqueue events to DEFINE_EVENT\n\nUse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 13171 800 72 14043 36db kernel/workqueue.o.old\n 12243 800 68 13111 3337 kernel/workqueue.o\n\nTwo events are converted:\n\n workqueue: workqueue_insertion, workqueue_execution\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E289F.5010104@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c467307c1a812c3150b27a68c2b2d3397bb40a4f", "tree": "c4cbb435998016afdaa9ee71497867ecbf9a5def", "parents": [ "53d0422c2d10808fddb2c30859193bfea164c7e3" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:04:31 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:03 2009 +0100" }, "message": "tracing: Convert softirq events to DEFINE_EVENT\n\nUse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 12781 952 36 13769 35c9 kernel/softirq.o.old\n 11981 952 32 12965 32a5 kernel/softirq.o\n\nTwo events are converted:\n\n softirq: softirq_entry, softirq_exit\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E287F.4030708@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "53d0422c2d10808fddb2c30859193bfea164c7e3", "tree": "c0131ec3cdff711873af7177fc29403091944aaa", "parents": [ "925684d6d589e40e41007edf47c69e729d911263" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:04:10 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:02 2009 +0100" }, "message": "tracing: Convert some kmem events to DEFINE_EVENT\n\nUse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 333987 69800 27228 431015 693a7 mm/built-in.o.old\n 330030 69800 27228 427058 68432 mm/built-in.o\n\n8 events are converted:\n\n kmem_alloc: kmalloc, kmem_cache_alloc\n kmem_alloc_node: kmalloc_node, kmem_cache_alloc_node\n kmem_free: kfree, kmem_cache_free\n mm_page: mm_page_alloc_zone_locked, mm_page_pcpu_drain\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nLKML-Reference: \u003c4B0E286A.2000405@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "925684d6d589e40e41007edf47c69e729d911263", "tree": "cb653b9a2fa673eabffdc2ed581731916b32bc0e", "parents": [ "091ad3658e3c76c5fb05f65bfb64a0246f8f31b5" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Nov 26 15:03:23 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:14:02 2009 +0100" }, "message": "tracing: Convert module refcnt events to DEFINE_EVENT\n\nUse DECLARE_EVENT_CLASS to remove duplicate code:\n\n text data bss dec hex filename\n 29854 1980 128 31962 7cda kernel/module.o.old\n 28750 1980 128 30858 788a kernel/module.o\n\nTwo events are converted:\n\n module_refcnt: module_get, module_put\n\nNo change in functionality.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E283B.3010508@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "091ad3658e3c76c5fb05f65bfb64a0246f8f31b5", "tree": "90f67be68a31e2001a4a73e0325a2a7798240a51", "parents": [ "28b4e0d86acf59ae3bc422921138a4958458326e" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:04:55 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Nov 26 09:04:55 2009 +0100" }, "message": "events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS()\n\nIt is not quite obvious at first sight what TRACE_EVENT_TEMPLATE\ndoes: does it define an event as well beyond defining a template?\n\nTo clarify this, rename it to DECLARE_EVENT_CLASS, which follows\nthe various \u0027DECLARE_*()\u0027 idioms we already have in the kernel:\n\n DECLARE_EVENT_CLASS(class)\n\n DEFINE_EVENT(class, event1)\n DEFINE_EVENT(class, event2)\n DEFINE_EVENT(class, event3)\n\nTo complete this logic we should also rename TRACE_EVENT() to:\n\n DEFINE_SINGLE_EVENT(single_event)\n\n... but in a more quiet moment of the kernel cycle.\n\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4B0E286A.2000405@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "75ec29ab848a7e92a41aaafaeb33d1afbc839be4", "tree": "d9bf6d12a60ddfe7cab9fb6ca370b0436ffe4649", "parents": [ "e5bc9721684e9412f3e0465222f317c362a8ab47" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Nov 18 20:48:08 2009 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Nov 24 18:24:00 2009 -0500" }, "message": "tracing: Convert some sched trace events to DEFINE_EVENT and _PRINT\n\nConverting some of the scheduler trace events to use the\nTRACE_EVENT_TEMPLATE, DEFINE_EVENT and DEFINE_EVENT_PRINT helped to\nsave some space:\n\n$ size kernel/sched.o-*\n text\t data\t bss\t dec\t hex\tfilename\n 79299\t 6776\t 2520\t 88595\t 15a13\tkernel/sched.o-notrace\n 101941\t 11896\t 2584\t 116421\t 1c6c5\tkernel/sched.o-templ\n 104779\t 11896\t 2584\t 119259\t 1d1db\tkernel/sched.o-trace\n\nsched.o-notrace is without any tracepoints compiled\nsched.o-templ is with this patch\nsched.o-trace is the tracepoints before this patch\n\nThe trace events converted to DEFINE_EVENT:\n\nsched_wakeup, sched_wakeup_new, sched_process_free, sched_process_exit,\nand sched_stat_wait.\n\nThe trace events converted to DEFINE_EVENT_PRINT:\n\nsched_stat_sleep and sched_stat_iowait.\n\nNote, since the TRACE_EVENT_TEMPLATE always uses a print, the\nsched_stat_wait print format is defined in the template and this\ntemplate is used by sched_stat_sleep and sched_stat_iowait. But the\nlater two override the print format.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "e5bc9721684e9412f3e0465222f317c362a8ab47", "tree": "380e76f64fd58e1f68715514e4b37734f3098fb3", "parents": [ "ff038f5c37c2070829004a0678372766c2b32180" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Nov 18 20:36:26 2009 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Nov 24 18:23:53 2009 -0500" }, "message": "tracing: Create new DEFINE_EVENT_PRINT\n\nAfter creating the TRACE_EVENT_TEMPLATE I started to look at other\ntrace points to see what duplication was made. I noticed that there\nare several trace points where they are almost identical except for\nthe name and the output format. Since TRACE_EVENT_TEMPLATE was successful\nin bringing down the size of trace events, I added a DEFINE_EVENT_PRINT.\n\nDEFINE_EVENT_PRINT is used just like DEFINE_EVENT is. That is, the\nDEFINE_EVENT_PRINT also uses a TRACE_EVENT_TEMPLATE, but it allows the\ndeveloper to overwrite the print format. If there are two or more\nTRACE_EVENTS that are identical except for the name and print, then\nthey can be converted to use a TRACE_EVENT_TEMPLATE. Since the\nTRACE_EVENT_TEMPLATE already does the print output, the first trace event\nwould have its print format held in the TRACE_EVENT_TEMPLATE and\nbe defined with a DEFINE_EVENT. The rest will use the DEFINE_EVENT_PRINT\nand override the print format.\n\nConverting the sched trace points to both DEFINE_EVENT and\nDEFINE_EVENT_PRINT. Five were converted to DEFINE_EVENT and two were\nconverted to DEFINE_EVENT_PRINT.\n\nI was able to get the following:\n\n$ size kernel/sched.o-*\n text\t data\t bss\t dec\t hex\tfilename\n 79299\t 6776\t 2520\t 88595\t 15a13\tkernel/sched.o-notrace\n 101941\t 11896\t 2584\t 116421\t 1c6c5\tkernel/sched.o-templ\n 104779\t 11896\t 2584\t 119259\t 1d1db\tkernel/sched.o-trace\n\nsched.o-notrace is the scheduler compiled with no trace points.\nsched.o-templ is with the use of DEFINE_EVENT and DEFINE_EVENT_PRINT\nsched.o-trace is the current trace events.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "ff038f5c37c2070829004a0678372766c2b32180", "tree": "69a48d73eb959ae3c9be3814c42e37a8ea188c41", "parents": [ "fa7c27ee9394fc0d52404b2a89882e95868a60b9" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Nov 18 20:27:27 2009 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Nov 24 17:52:11 2009 -0500" }, "message": "tracing: Create new TRACE_EVENT_TEMPLATE\n\nThere are some places in the kernel that define several tracepoints and\nthey are all identical besides the name. The code to enable, disable and\nrecord is created for every trace point even if most of the code is\nidentical.\n\nThis patch adds TRACE_EVENT_TEMPLATE that lets the developer create\na template TRACE_EVENT and create trace points with DEFINE_EVENT, which\nis based off of a given template. Each trace point used by this\nwill share most of the code, and bring down the size of the kernel\nwhen there are several duplicate events.\n\nUsage is:\n\nTRACE_EVENT_TEMPLATE(name, proto, args, tstruct, assign, print);\n\nWhich would be the same as defining a normal TRACE_EVENT.\n\nTo create the trace events that the trace points will use:\n\nDEFINE_EVENT(template, name, proto, args) is done. The template\nis the name of the TRACE_EVENT_TEMPLATE to use. The name is the\nname of the trace point. The parameters proto and args must be the same\nas the proto and args of the template. If they are not the same,\nthen a compile error will result. I tried hard removing this duplication\nbut the C preprocessor is not powerful enough (or my CPP magic\nexperience points is not at a high enough level) to not need them.\n\nA lot of trace events are coming in with new XFS development. Most of\nthe trace points are identical except for the name. The following shows\nthe advantage of having TRACE_EVENT_TEMPLATE:\n\n$ size fs/xfs/xfs.o.*\n text data bss dec hex filename\n 452114 2788 3520 458422 6feb6 fs/xfs/xfs.o.old\n 638482 38116 3744 680342 a6196 fs/xfs/xfs.o.template\n 996954 38116 4480 1039550 fdcbe fs/xfs/xfs.o.trace\n\nxfs.o.old is without any tracepoints.\nxfs.o.template uses the new TRACE_EVENT_TEMPLATE.\nxfs.o.trace uses the current TRACE_EVENT macros.\n\nRequested-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "fa7c27ee9394fc0d52404b2a89882e95868a60b9", "tree": "8f43c75075ebf05d20920d2d9877833473cdfffb", "parents": [ "1b145ae58035f30353d78d25bea665091df9b438" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Mon Nov 23 22:30:12 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Nov 24 00:09:53 2009 +0100" }, "message": "hw-breakpoints: Fix misordered ifdef\n\nFix a misplaced ifdef. We need the perf event headers also in\noff-case to avoid the following build error:\n\n include/linux/hw_breakpoint.h:94: error: expected declaration specifiers or \u0027...\u0027 before \u0027perf_callback_t\u0027\n include/linux/hw_breakpoint.h:102: error: expected declaration specifiers or \u0027...\u0027 before \u0027perf_callback_t\u0027\n include/linux/hw_breakpoint.h:109: error: expected declaration specifiers or \u0027...\u0027 before \u0027perf_callback_t\u0027\n include/linux/hw_breakpoint.h:116: error: expected declaration specifiers or \u0027...\u0027 before \u0027perf_callback_t\u0027\n\nReported-by: Kisskb-bot by Michael Ellerman \u003cmichael@ellerman.id.au\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nLKML-Reference: \u003c1259011812-8093-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e6db4876575f3fdd5b1df2cbff826df95ab9af6a", "tree": "440da08b2437502804102cbfb2ea412eff2113b7", "parents": [ "ba6909b719a5ccc0c8100d2895bb7ff557b2eeae" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Mon Nov 23 15:42:32 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 23 18:18:30 2009 +0100" }, "message": "hw-breakpoints: Include only linux/perf_event.h from kernel part of bp headers\n\nAs userspace only needs the breakpoints enum types from the\nbreakpoints headers.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nLKML-Reference: \u003c1258987355-8751-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4ed7c92d68a5387ba5f7030dc76eab03558e27f5", "tree": "38d758819c41261275c2dbd6f64976f824c5fd27", "parents": [ "f67218c3e93abaf0f480bb94b53d234853ffe4de" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Nov 23 11:37:29 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 23 11:49:57 2009 +0100" }, "message": "perf_events: Undo some recursion damage\n\nMake perf_swevent_get_recursion_context return a context number\nand disable preemption.\n\nThis could be used to remove the IRQ disable from the trace bit\nand index the per-cpu buffer with.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nLKML-Reference: \u003c20091123103819.993226816@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5093ebad5f2348076fdc3dac7d2358b1ad7f85f7", "tree": "e9904d9b799945c2dde0b5b4aa6b6ea408e688ff", "parents": [ "b3a75542d329ce4e1c66b293cefeb4429a2af043" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Nov 22 05:21:35 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 22 09:03:43 2009 +0100" }, "message": "hw-breakpoints: Separate the kernel part from breakpoint headers\n\nSo that we can include this header from userspace tools, like\nperf tools, to get the breakpoint types and len definitions.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nLKML-Reference: \u003c1258863695-10464-4-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ce71b9df8893ec954e56c5979df6da274f20f65e", "tree": "76e8a5e33393c2f4fca4083628fc142dcbb55250", "parents": [ "e25613683bd5c46d3e8c8ae6416dccc9f357dcdc" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Nov 22 05:26:55 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 22 09:03:42 2009 +0100" }, "message": "tracing: Use the perf recursion protection from trace event\n\nWhen we commit a trace to perf, we first check if we are\nrecursing in the same buffer so that we don\u0027t mess-up the buffer\nwith a recursing trace. But later on, we do the same check from\nperf to avoid commit recursion. The recursion check is desired\nearly before we touch the buffer but we want to do this check\nonly once.\n\nThen export the recursion protection from perf and use it from\nthe trace events before submitting a trace.\n\nv2: Put appropriate Reported-by tag\n\nReported-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nLKML-Reference: \u003c1258864015-10579-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "59ed446f792cc07d37b1536b9c4664d14e25e425", "tree": "707c009e252b082ffac5c5209f4bdc013b1b5c62", "parents": [ "2b8988c9f7defe319cffe0cd362a7cd356c86f62" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Nov 20 22:19:55 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 21 14:11:40 2009 +0100" }, "message": "perf: Fix event scaling for inherited counters\n\nProperly account the full hierarchy of counters for both the\ncount (we already did so) and the scale times (new).\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nLKML-Reference: \u003c20091120212509.153379276@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "453f19eea7dbad837425e9b07d84568d14898794", "tree": "3b1d757a72512b5ab566649b9eda59e032734993", "parents": [ "ef6ae724253429ac70d81e65d052f6a346d330bd" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Nov 20 22:19:43 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 21 14:11:35 2009 +0100" }, "message": "perf: Allow for custom overflow handlers\n\nin-kernel perf users might wish to have custom actions on the\nsample interrupt.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nLKML-Reference: \u003c20091120212508.222339539@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "96200591a34f8ecb98481c626125df43a2463b55", "tree": "314c376b01f254d04f9aaf449b1f9147ad177fa6", "parents": [ "7031281e02bf951a2259849217193fb9d75a9762", "68efa37df779b3e04280598e8b5b3a1919b65fee" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 21 14:07:23 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 21 14:07:23 2009 +0100" }, "message": "Merge branch \u0027tracing/hw-breakpoints\u0027 into perf/core\n\nConflicts:\n\tarch/x86/kernel/kprobes.c\n\tkernel/trace/Makefile\n\nMerge reason: hw-breakpoints perf integration is looking\n good in testing and in reviews, plus conflicts\n are mounting up - so merge \u0026 resolve.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a7b63425a41cd6a8d50f76fef0660c5110f97e91", "tree": "be17ee121f1c8814d8d39c9f3e0205d9397fab54", "parents": [ "35039eb6b199749943547c8572be6604edf00229", "3726cc75e581c157202da93bb2333cce25c15c98" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Nov 17 10:16:43 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Nov 17 10:17:47 2009 +0100" }, "message": "Merge branch \u0027perf/core\u0027 into perf/probes\n\nResolved merge conflict in tools/perf/Makefile\n\nMerge reason: we want to queue up a dependent patch.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "559fdc3c1b624edb1933a875022fe7e27934d11c", "tree": "b722805dbebd9584ffb981e2be84385ee0e22c67", "parents": [ "7255fe2a42c612f2b8fe4c347f0a5f0c97d85a46" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Nov 16 12:45:14 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 16 13:27:45 2009 +0100" }, "message": "perf_event: Optimize perf_output_lock()\n\nThe purpose of perf_output_{un,}lock() is to:\n\n 1) avoid publishing incomplete data\n [ possible when publishing a head that is ahead of an entry\n that is still being written ]\n\n 2) guarantee fwd progress\n [ a simple refcount on pending writers doesn\u0027t need to drop to\n 0, making it so would end up implementing something like forced\n quiecent states of RCU ]\n\nTo satisfy the above without undue complexity it serializes\nbetween CPUs, this means that a pending writer can only be the\nsame cpu in a nested context, and since (under normal operation)\na cpu always makes progress we\u0027re good -- if the head is only\npublished when the bottom most writer completes.\n\nNow we don\u0027t need to disable IRQs in order to serialize between\nCPUs, disabling preemption ought to be sufficient, esp since we\nalready deal with nesting due to NMIs.\n\nThis avoids potentially expensive (and needless) local IRQ\ndisable/enable ops.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c1258373161.26714.254.camel@laptop\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0ffa798d947f5f5e40690cc9d38e678080a34f87", "tree": "a9e25ba4431de513d4c83201429e9ff301cbaf50", "parents": [ "39dc78b6510323848e3356452f7dab9499736978", "c86e2eaded39843e1bf4f07d1adfab4494f20894", "c5659b74f052150791750234f92dcfb29d27efa5" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 15 09:51:19 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 15 09:51:24 2009 +0100" }, "message": "Merge branches \u0027perf/powerpc\u0027 and \u0027perf/bench\u0027 into perf/core\n\nMerge reason: Both \u0027perf bench\u0027 and the pending PowerPC changes\n are now ready for the next merge window.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "39dc78b6510323848e3356452f7dab9499736978", "tree": "cf8a8fede74e41b203fd00e3ccd21ead2e851442", "parents": [ "4c49b12853fbb5eff4849b7b6a1e895776f027a1", "156171c71a0dc4bce12b4408bb1591f8fe32dc1a" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 15 09:50:38 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 15 09:50:41 2009 +0100" }, "message": "Merge commit \u0027v2.6.32-rc7\u0027 into perf/core\n\nMerge reason: pick up perf fixlets\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4c49b12853fbb5eff4849b7b6a1e895776f027a1", "tree": "77af066a0e0798725818d546d758ea14d442e944", "parents": [ "67178767b936fb47a3a5e88097cff41ccbda7acb" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Fri Nov 13 21:47:33 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 14 10:23:52 2009 +0100" }, "message": "perf_event: Fix invalid type in ioctl definition\n\nu64 is invalid in userspace headers, including ioctl\ndefinitions; use __u64 instead\n\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: \u003cstable@kernel.org\u003e\nLKML-Reference: \u003c20091113214733.7cd76be9@infradead.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "688bcaff291cf2fe2734e43f2793d4d05b850518", "tree": "95078fb51e922800c568b1a33b65608f924eb154", "parents": [ "687b16fb617bd446439425a368ad7c7bbd202c73" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 14 01:12:47 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 14 01:29:17 2009 +0100" }, "message": "hw-breakpoints: Fix build on !perf architectures\n\nthe arch/alpha build fails with:\n\n In file included from tip/kernel/exit.c:52:\n tip/include/linux/hw_breakpoint.h: In function \u0027hw_breakpoint_addr\u0027:\n tip/include/linux/hw_breakpoint.h:21: error: \u0027struct perf_event\u0027 has no member named \u0027attr\u0027\n [...]\n\nMove these helper inlines inside the CONFIG_HAVE_HW_BREAKPOINT ifdef.\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nLKML-Reference: \u003c1258114575-32655-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "687b16fb617bd446439425a368ad7c7bbd202c73", "tree": "1c0eaf832ed47273daa435b4329bed104accea85", "parents": [ "59d8eb53ea9947db7cad8ebc31b0fb54f23a9851" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Nov 13 13:16:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 14 00:27:38 2009 +0100" }, "message": "hw-breakpoints: Provide an off-case for counter_arch_bp()\n\nIf an arch doesn\u0027t support the hw breakpoints, counter_arch_bp()\nhas no off case to cover the missing breakpoint info structure\nfrom the perf event. The result is a build error in non-x86\nconfigs.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nLKML-Reference: \u003c1258114575-32655-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\n" }, { "commit": "67178767b936fb47a3a5e88097cff41ccbda7acb", "tree": "f55675817e8d934bd2a627a729a010a58bbba464", "parents": [ "db48cccc7c709ccfa7cb4ac702bc27c216bffee7" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Nov 13 10:06:34 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Nov 13 10:48:27 2009 +0100" }, "message": "tracing: Rename \u0027lockdep\u0027 event subsystem into \u0027lock\u0027\n\nLockdep events subsystem gathers various locking related events\nsuch as a request, release, contention or acquisition of a lock.\n\nThe name of this event subsystem is a bit of a misnomer since\nthese events are not quite related to lockdep but more generally\nto locking, ie: these events are not reporting lock dependencies\nor possible deadlock scenario but pure locking events.\n\nHence this rename.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Hitoshi Mitake \u003cmitake@dcl.info.waseda.ac.jp\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nLKML-Reference: \u003c1258103194-843-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b87e5e2b8ed9336566100c8c796ab6dd52436881", "tree": "a55dc24691745c5a2029b8596352a62554864d28", "parents": [ "80647b959f97fa20a4714dde3e07b7f69d896556" ], "author": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Wed Nov 11 14:26:42 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 12 07:25:57 2009 -0800" }, "message": "serial: add support for the Lava Quattro PCI quad-port 16550A card\n\nThis seems to be a different model (with a different PCI ID) than the\n\"Quatro\" card that is also in the list.\n\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "71ccb83cfc487354d2647e315c8196e5872198ab", "tree": "412436ad5744718820e4907d9fb6dbc9497309bb", "parents": [ "e00e431612c3a6e437a01f2129fd3843da0c982a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Nov 11 14:26:27 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 12 07:25:56 2009 -0800" }, "message": "alpha: fix F_SETOWN_EX and F_GETLK64 conflict\n\nFix a bug in\n\n commit ba0a6c9f6fceed11c6a99e8326f0477fe383e6b5\n Author: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\n AuthorDate: Wed Sep 23 15:57:03 2009 -0700\n Commit: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n CommitDate: Thu Sep 24 07:21:01 2009 -0700\n\n fcntl: add F_[SG]ETOWN_EX\n\nIn asm-generic/fcntl.h, F_SETOWN_EX and F_GETLK64 both have value 12, and\nF_GETOWN_EX and F_SETLK64 both have value 13.\n\nReported-by: \"Joseph S. Myers\" \u003cjoseph@codesourcery.com\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Andreas Schwab \u003cschwab@redhat.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f5c15d0b37ab1cd3969b8ce7828ab41c79f36f77", "tree": "a12aaef93ef8cc75eb5488294c64c5bf9d01546c", "parents": [ "9d0ed60fe9cd1fbf57f755cd27a23ae9114d7210" ], "author": { "name": "Krzysztof Helt", "email": "krzysztof.h1@wp.pl", "time": "Wed Nov 11 14:26:22 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 12 07:25:56 2009 -0800" }, "message": "fb: remove fb_save_state() and fb_restore_state operations\n\nRemove fb_save_state() and fb_restore_state operations from frame buffer layer.\nThey are used only in two drivers:\n1. savagefb - and cause bug #11248\n2. uvesafb\n\nUsage of these operations is misunderstood in both drivers so kill these\noperations, fix the bug #11248 and avoid confusion in the future.\n\nTested on Savage 3D/MV card and the patch fixes the bug #11248.\n\nThe frame buffer layer uses these funtions during switch between graphics\nand text mode of the console, but these drivers saves state before\nswitching of the frame buffer (in the fb_open) and after releasing it (in\nthe fb_release). This defeats the purpose of these operations.\n\nAddresses http://bugzilla.kernel.org/show_bug.cgi?id\u003d11248\n\nSigned-off-by: Krzysztof Helt \u003ckrzysztof.h1@wp.pl\u003e\nReported-by: Jochen Hein \u003cjochen@jochen.org\u003e\nTested-by: Jochen Hein \u003cjochen@jochen.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Michal Januszewski \u003cspock@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fe8bc91c4c30122b357d197117705cfd4fabaf28", "tree": "33e2895847d812204209444db4093af9a2c3623d", "parents": [ "ea0174a7137c8ca9f130ca681f3a99c872da6778" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Oct 16 19:26:15 2009 +0200" }, "committer": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Nov 11 15:22:49 2009 +0100" }, "message": "ext3: Wait for proper transaction commit on fsync\n\nWe cannot rely on buffer dirty bits during fsync because pdflush can come\nbefore fsync is called and clear dirty bits without forcing a transaction\ncommit. What we do is that we track which transaction has last changed\nthe inode and which transaction last changed allocation and force it to\ndisk on fsync.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nReviewed-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\n" }, { "commit": "799dd75b1a8380a967c929a4551895788c374b31", "tree": "7132aafc4ade16fda136d63f1be6ea867edde79b", "parents": [ "6bee58259fce0baad7b02c7a48146d50fa7f6c3c", "afa08974fe80c198b8650f73ed8ab59135ca10d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 09 09:58:31 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 09 09:58:31 2009 -0800" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c: Add an interface to lock/unlock an I2C bus segment\n i2c-piix4: Modify code name SB900 to Hudson-2\n" }, { "commit": "1ce55238e2dd46b978b098a85cb3d3ea494e4a93", "tree": "523254dbb402b1850d693f0c1f1a1db6e865456d", "parents": [ "aa907639f1d9fe0e3274b4f6c1088542f750a539", "2606289779cb297320a185db5997729d29b6700b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 09 09:51:42 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 09 09:51:42 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)\n net/fsl_pq_mdio: add module license GPL\n can: fix WARN_ON dump in net/core/rtnetlink.c:rtmsg_ifinfo()\n can: should not use __dev_get_by_index() without locks\n hisax: remove bad udelay call to fix build error on ARM\n ipip: Fix handling of DF packets when pmtudisc is OFF\n qlge: Set PCIe reset type for EEH to fundamental.\n qlge: Fix early exit from mbox cmd complete wait.\n ixgbe: fix traffic hangs on Tx with ioatdma loaded\n ixgbe: Fix checking TFCS register for TXOFF status when DCB is enabled\n ixgbe: Fix gso_max_size for 82599 when DCB is enabled\n macsonic: fix crash on PowerBook 520\n NET: cassini, fix lock imbalance\n ems_usb: Fix byte order issues on big endian machines\n be2net: Bug fix to send config commands to hardware after netdev_register\n be2net: fix to set proper flow control on resume\n netfilter: xt_connlimit: fix regression caused by zero family value\n rt2x00: Don\u0027t queue ieee80211 work after USB removal\n Revert \"ipw2200: fix oops on missing firmware\"\n decnet: netdevice refcount leak\n netfilter: nf_nat: fix NAT issue in 2.6.30.4+\n ...\n" }, { "commit": "24f1e32c60c45c89a997c73395b69c8af6f0a84e", "tree": "4f30f16e18cb4abbcf96b3b331e6a3f01bfa26e6", "parents": [ "2da3e160cb3d226d87b907fab26850d838ed8d7c" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Sep 09 19:22:48 2009 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Nov 08 15:34:42 2009 +0100" }, "message": "hw-breakpoints: Rewrite the hw-breakpoints layer on top of perf events\n\nThis patch rebase the implementation of the breakpoints API on top of\nperf events instances.\n\nEach breakpoints are now perf events that handle the\nregister scheduling, thread/cpu attachment, etc..\n\nThe new layering is now made as follows:\n\n ptrace kgdb ftrace perf syscall\n \\ | / /\n \\ | / /\n /\n Core breakpoint API /\n /\n | /\n | /\n\n Breakpoints perf events\n\n |\n |\n\n Breakpoints PMU ---- Debug Register constraints handling\n (Part of core breakpoint API)\n |\n |\n\n Hardware debug registers\n\nReasons of this rewrite:\n\n- Use the centralized/optimized pmu registers scheduling,\n implying an easier arch integration\n- More powerful register handling: perf attributes (pinned/flexible\n events, exclusive/non-exclusive, tunable period, etc...)\n\nImpact:\n\n- New perf ABI: the hardware breakpoints counters\n- Ptrace breakpoints setting remains tricky and still needs some per\n thread breakpoints references.\n\nTodo (in the order):\n\n- Support breakpoints perf counter events for perf tools (ie: implement\n perf_bpcounter_event())\n- Support from perf tools\n\nChanges in v2:\n\n- Follow the perf \"event \" rename\n- The ptrace regression have been fixed (ptrace breakpoint perf events\n weren\u0027t released when a task ended)\n- Drop the struct hw_breakpoint and store generic fields in\n perf_event_attr.\n- Separate core and arch specific headers, drop\n asm-generic/hw_breakpoint.h and create linux/hw_breakpoint.h\n- Use new generic len/type for breakpoint\n- Handle off case: when breakpoints api is not supported by an arch\n\nChanges in v3:\n\n- Fix broken CONFIG_KVM, we need to propagate the breakpoint api\n changes to kvm when we exit the guest and restore the bp registers\n to the host.\n\nChanges in v4:\n\n- Drop the hw_breakpoint_restore() stub as it is only used by KVM\n- EXPORT_SYMBOL_GPL hw_breakpoint_restore() as KVM can be built as a\n module\n- Restore the breakpoints unconditionally on kvm guest exit:\n TIF_DEBUG_THREAD doesn\u0027t anymore cover every cases of running\n breakpoints and vcpu-\u003earch.switch_db_regs might not always be\n set when the guest used debug registers.\n (Waiting for a reliable optimization)\n\nChanges in v5:\n\n- Split-up the asm-generic/hw-breakpoint.h moving to\n linux/hw_breakpoint.h into a separate patch\n- Optimize the breakpoints restoring while switching from kvm guest\n to host. We only want to restore the state if we have active\n breakpoints to the host, otherwise we don\u0027t care about messed-up\n address registers.\n- Add asm/hw_breakpoint.h to Kbuild\n- Fix bad breakpoint type in trace_selftest.c\n\nChanges in v6:\n\n- Fix wrong header inclusion in trace.h (triggered a build\n error with CONFIG_FTRACE_SELFTEST\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Jan Kiszka \u003cjan.kiszka@web.de\u003e\nCc: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "444a2a3bcd6d5bed5c823136f68fcc93c0fe283f", "tree": "6a57308586b4e723238646074e79298845803520", "parents": [ "09879b99d44d701c603935ef2549004405d7f8f9" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Nov 06 04:13:05 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 08 10:31:42 2009 +0100" }, "message": "tracing, perf_events: Protect the buffer from recursion in perf\n\nWhile tracing using events with perf, if one enables the\nlockdep:lock_acquire event, it will infect every other perf\ntrace events.\n\nBasically, you can enable whatever set of trace events through\nperf but if this event is part of the set, the only result we\ncan get is a long list of lock_acquire events of rcu read lock,\nand only that.\n\nThis is because of a recursion inside perf.\n\n1) When a trace event is triggered, it will fill a per cpu\n buffer and submit it to perf.\n\n2) Perf will commit this event but will also protect some data\n using rcu_read_lock\n\n3) A recursion appears: rcu_read_lock triggers a lock_acquire\n event that will fill the per cpu event and then submit the\n buffer to perf.\n\n4) Perf detects a recursion and ignores it\n\n5) Perf continues its work on the previous event, but its buffer\n has been overwritten by the lock_acquire event, it has then\n been turned into a lock_acquire event of rcu read lock\n\nSuch scenario also happens with lock_release with\nrcu_read_unlock().\n\nWe could turn the rcu_read_lock() into __rcu_read_lock() to drop\nthe lock debugging from perf fast path, but that would make us\nlose the rcu debugging and that doesn\u0027t prevent from other\npossible kind of recursion from perf in the future.\n\nThis patch adds a recursion protection based on a counter on the\nperf trace per cpu buffers to solve the problem.\n\n-v2: Fixed lost whitespace, added reviewed-by tag\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReviewed-by: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nLKML-Reference: \u003c1257477185-7838-1-git-send-email-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "afa08974fe80c198b8650f73ed8ab59135ca10d0", "tree": "b649e06dc4cb9fa10b87f1914f05c6ca2ba0d910", "parents": [ "3806e94b0148350c72f9a3214274026b6ca03f49" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Nov 07 13:10:46 2009 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Nov 07 13:10:46 2009 +0100" }, "message": "i2c: Add an interface to lock/unlock an I2C bus segment\n\nSome drivers need to be able to prevent access to an I2C bus segment\nfor a specific period of time. Add an interface for them to do so\nwithout twiddling with i2c-core internals.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "3806e94b0148350c72f9a3214274026b6ca03f49", "tree": "a01e53ccbd4dd7a2871bd933d05a769351c64a3f", "parents": [ "7c9abfb884b8737f0afdc8a88bcea77526f0da87" ], "author": { "name": "Crane Cai", "email": "crane.cai@amd.com", "time": "Sat Nov 07 13:10:46 2009 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Nov 07 13:10:46 2009 +0100" }, "message": "i2c-piix4: Modify code name SB900 to Hudson-2\n\nChange SB900 to its formal code name Hudson-2.\n\nSigned-off-by: Crane Cai \u003ccrane.cai@amd.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "f9dd09c7f7199685601d75882447a6598be8a3e0", "tree": "98ab4a75ec6c74cdb4aa807c491002ba33de56c5", "parents": [ "f5209b4446d185cc95f46363f8043a743530c15a" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Fri Nov 06 00:43:42 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 06 00:43:42 2009 -0800" }, "message": "netfilter: nf_nat: fix NAT issue in 2.6.30.4+\n\nVitezslav Samel discovered that since 2.6.30.4+ active FTP can not work\nover NAT. The \"cause\" of the problem was a fix of unacknowledged data\ndetection with NAT (commit a3a9f79e361e864f0e9d75ebe2a0cb43d17c4272).\nHowever, actually, that fix uncovered a long standing bug in TCP conntrack:\nwhen NAT was enabled, we simply updated the max of the right edge of\nthe segments we have seen (td_end), by the offset NAT produced with\nchanging IP/port in the data. However, we did not update the other parameter\n(td_maxend) which is affected by the NAT offset. Thus that could drift\naway from the correct value and thus resulted breaking active FTP.\n\nThe patch below fixes the issue by *not* updating the conntrack parameters\nfrom NAT, but instead taking into account the NAT offsets in conntrack in a\nconsistent way. (Updating from NAT would be more harder and expensive because\nit\u0027d need to re-calculate parameters we already calculated in conntrack.)\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2da3e160cb3d226d87b907fab26850d838ed8d7c", "tree": "02ec5cbadf8d3236770d0f3a908e2a571716e382", "parents": [ "97eaf5300b9d0cd99c310bf8c4a0f2f3296d88a3" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Nov 05 23:06:50 2009 +0100" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Nov 05 23:48:01 2009 +0100" }, "message": "hw-breakpoint: Move asm-generic/hw_breakpoint.h to linux/hw_breakpoint.h\n\nWe plan to make the breakpoints parameters generic among architectures.\nFor that it\u0027s better to move the asm-generic header to a generic linux\nheader.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "a2e71271535fde493c32803b1f34789f97efcb5e", "tree": "90d7139bea2f49e947f27af92614fa6eca50b64d", "parents": [ "6d7aa9d721c8c640066142fd9534afcdf68d7f9d", "b419148e567728f6af0c3b01965c1cc141e3e13a" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Nov 04 11:54:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Nov 04 11:59:45 2009 +0100" }, "message": "Merge commit \u0027v2.6.32-rc6\u0027 into perf/core\n\nConflicts:\n\ttools/perf/Makefile\n\nMerge reason: Resolve the conflict, merge to upstream and merge in\n perf fixes so we can add a dependent patch.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "97eaf5300b9d0cd99c310bf8c4a0f2f3296d88a3", "tree": "aa047f4c078e2c9aeabcbcc9e33d93a50366b8e9", "parents": [ "41a48d14f6991020c9bb6b93e289ca5b411ed09a" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Oct 18 15:33:50 2009 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Nov 03 19:11:53 2009 +0100" }, "message": "perf/core: Add a callback to perf events\n\nA simple callback in a perf event can be used for multiple purposes.\nFor example it is useful for triggered based events like hardware\nbreakpoints that need a callback to dispatch a triggered breakpoint\nevent.\n\nv2: Simplify a bit the callback attribution as suggested by Paul\n Mackerras\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: \"K.Prasad\" \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "fb0459d75c1d0a4ba3cafdd2c754e7486968a676", "tree": "3e7a112cbf2feb144b3e1abbc5dfb186f77b8b50", "parents": [ "0f8f86c7bdd1c954fbe153af437a0d91a6c5721a" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Fri Sep 25 12:25:56 2009 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Nov 03 18:04:17 2009 +0100" }, "message": "perf/core: Provide a kernel-internal interface to get to performance counters\n\nThere are reasons for kernel code to ask for, and use, performance\ncounters.\nFor example, in CPU freq governors this tends to be a good idea, but\nthere are other examples possible as well of course.\n\nThis patch adds the needed bits to do enable this functionality; they\nhave been tested in an experimental cpufreq driver that I\u0027m working on,\nand the changes are all that I needed to access counters properly.\n\n[fweisbec@gmail.com: added pid to perf_event_create_kernel_counter so\nthat we can profile a particular task too\n\nTODO: Have a better error reporting, don\u0027t just return NULL in fail\ncase.]\n\nv2: Remove the wrong comment about the fact\n perf_event_create_kernel_counter must be called from a kernel\n thread.\n\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: \"K.Prasad\" \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Jan Kiszka \u003cjan.kiszka@siemens.com\u003e\nCc: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jan Kiszka \u003cjan.kiszka@web.de\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nLKML-Reference: \u003c20090925122556.2f8bd939@infradead.org\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "38dc63459f185795b24a39f3f4921a433ea9980b", "tree": "205a8abc9b20c4f5573e4d2fbc03e74388cef2bc", "parents": [ "1d510750941a53a1d3049c1d33c75d6dfcd78618", "2ddac2a6a8f13e95664fe7ad1b728ac84fb1bd07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 03 07:52:57 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 03 07:52:57 2009 -0800" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PM: Remove some debug messages producing too much noise\n PM: Fix warning on suspend errors\n PM / Hibernate: Add newline to load_image() fail path\n PM / Hibernate: Fix error handling in save_image()\n PM / Hibernate: Fix blkdev refleaks\n PM / yenta: Split resume into early and late parts (rev. 4)\n" }, { "commit": "a84216e671c724e0920dfad2fb70828d428ff60a", "tree": "a39f53715c73d267d854653dfe275da5fc60e842", "parents": [ "1836d95928a0f41ada0cbb2a6c4e46b027db9491", "bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 03 07:44:01 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 03 07:44:01 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)\n mac80211: check interface is down before type change\n cfg80211: fix NULL ptr deref\n libertas if_usb: Fix crash on 64-bit machines\n mac80211: fix reason code output endianness\n mac80211: fix addba timer\n ath9k: fix misplaced semicolon on rate control\n b43: Fix DMA TX bounce buffer copying\n mac80211: fix BSS leak\n rt73usb.c : more ids\n ipw2200: fix oops on missing firmware\n gre: Fix dev_addr clobbering for gretap\n sky2: set carrier off in probe\n net: fix sk_forward_alloc corruption\n pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card\n r8169: Fix card drop incoming VLAN tagged MTU byte large jumbo frames\n ibmtr: possible Read buffer overflow?\n net: Fix RPF to work with policy routing\n net: fix kmemcheck annotations\n e1000e: rework disable K1 at 1000Mbps for 82577/82578\n e1000e: config PHY via software after resets\n ...\n" }, { "commit": "9905d1b411946fb3fb228e8c6529fd94afda8a92", "tree": "8257b26f4b3d7c2b8be082233ac9c294b5387f8b", "parents": [ "1836d95928a0f41ada0cbb2a6c4e46b027db9491" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Nov 03 10:54:58 2009 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Nov 03 10:54:58 2009 +0100" }, "message": "PM / yenta: Split resume into early and late parts (rev. 4)\n\nCommit 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c\n(PM / yenta: Fix cardbus suspend/resume regression) caused resume to\nfail on systems with two CardBus bridges. While the exact nature\nof the failure is not known at the moment, it can be worked around by\nsplitting the yenta resume into an early part, executed during the\nearly phase of resume, that will only resume the socket and power it\nup if there was a card in it during suspend, and a late part,\nexecuted during \"regular\" resume, that will carry out all of the\nremaining yenta resume operations.\n\nFixes http://bugzilla.kernel.org/show_bug.cgi?id\u003d14334, which is a\nlisted regression from 2.6.31.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nReported-by: Stephen J. Gowdy \u003cgowdy@cern.ch\u003e\nTested-by: Jose Marino \u003cbraket@hotmail.com\u003e\n" }, { "commit": "1836d95928a0f41ada0cbb2a6c4e46b027db9491", "tree": "24ebf7cfd598dfef82247044fb3b65110fe22fc8", "parents": [ "333a07437c31ea8c16a2b82071629a540ae1e50f", "3e2796a90cf349527e50b3bc4d0b2f4019b1ce7a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 02 12:23:21 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 02 12:23:21 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n 9p: fix readdir corner cases\n 9p: fix readlink\n 9p: fix a small bug in readdir for long directories\n" }, { "commit": "bce8fc4cb796dc77ea71699ef88802879a177474", "tree": "683ff9f2def12d390af0ae2dc2326b4d9f85a1cd", "parents": [ "a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a", "ec29b8d2af01912bb79adda8aeab4293539f29ac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 02 09:46:06 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 02 09:46:06 2009 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf tools: Remove -Wcast-align\n perf tools: Fix compatibility with libelf 0.8 and autodetect\n perf events: Don\u0027t generate events for the idle task when exclude_idle is set\n perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers\n" }, { "commit": "a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a", "tree": "89dce7d51c11ea56150e4f5613a28369e238f90e", "parents": [ "efcd9e0b91bcb92a1dd530d1a1f26eb83a5d21e2", "6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 02 09:45:44 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 02 09:45:44 2009 -0800" }, "message": "Merge branch \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing: Remove cpu arg from the rb_time_stamp() function\n tracing: Fix comment typo and documentation example\n tracing: Fix trace_seq_printf() return value\n tracing: Update *ppos instead of filp-\u003ef_pos\n" }, { "commit": "3e2796a90cf349527e50b3bc4d0b2f4019b1ce7a", "tree": "80bddc0f5d36a589db5a77b9b60e4c94c75994ed", "parents": [ "2511cd0b3b9e9b1c3e9360cc565c3745ac3f3f3f" ], "author": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Nov 02 08:39:28 2009 -0600" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Nov 02 08:43:45 2009 -0600" }, "message": "9p: fix readdir corner cases\n\nThe patch below also addresses a couple of other corner cases in readdir\nseen with a large (e.g. 64k) msize. I\u0027m not sure what people think of\nmy co-opting of fid-\u003eaux here. I\u0027d be happy to rework if there\u0027s a better\nway.\n\nWhen the size of the user supplied buffer passed to readdir is smaller\nthan the data returned in one go by the 9P read request, v9fs_dir_readdir()\ncurrently discards extra data so that, on the next call, a 9P read\nrequest will be issued with offset \u003c previous offset + bytes returned,\nwhich voilates the constraint described in paragraph 3 of read(5) description.\nThis patch preseves the leftover data in fid-\u003eaux for use in the next call.\n\nSigned-off-by: Jim Garlick \u003cgarlick@llnl.gov\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n\n" }, { "commit": "1a6f2a7512021ceae3c4201c7aab07f032e9ce91", "tree": "03fdca9848003b3a6fda57113b3e750ec1e22a55", "parents": [ "39acbc12affcaa23ef1d887ba3d197baca8e6e47" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Oct 12 20:17:41 2009 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Oct 30 14:59:51 2009 -0700" }, "message": "Driver core: allow certain drivers prohibit bind/unbind via sysfs\n\nPlatform drivers registered via platform_driver_probe() can be bound\nto devices only once, upon registration, because discard their probe()\nroutines to save memory. Unbinding the driver through sysfs \u0027unbind\u0027\nleaves the device stranded and confuses users so let\u0027s not create\nbind and unbind attributes for such drivers.\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nCc: Éric Piel \u003ceric.piel@tremplin-utc.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9d410c796067686b1e032d54ce475b7055537138", "tree": "4442bdbe4a4be1cce024f2e83a12b7404ef935fa", "parents": [ "63ca2d74ea4f9c7a7ac082c915609a7b224908e7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Oct 30 05:03:53 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 30 12:25:12 2009 -0700" }, "message": "net: fix sk_forward_alloc corruption\n\nOn UDP sockets, we must call skb_free_datagram() with socket locked,\nor risk sk_forward_alloc corruption. This requirement is not respected\nin SUNRPC.\n\nAdd a convenient helper, skb_free_datagram_locked() and use it in SUNRPC\n\nReported-by: Francis Moreau \u003cfrancis.moro@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0c110ca8e89f2c9cd52ec7fb1b98c5b7aa78496", "tree": "613bb6966bce4b5dc63e5090aff04254f7dbb709", "parents": [ "14d18a81b5171d4433e41129619c75748b4f4d26" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Sun Oct 18 02:12:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 22:49:12 2009 -0700" }, "message": "net: Fix RPF to work with policy routing\n\nPolicy routing is not looked up by mark on reverse path filtering.\nThis fixes it.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14d18a81b5171d4433e41129619c75748b4f4d26", "tree": "715d5d99fc74e05d8530b6af2ea5059e5a00749b", "parents": [ "1d5846b9216665d0ae743bf351d0b8fa90c40523" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Oct 29 00:10:37 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 22:48:44 2009 -0700" }, "message": "net: fix kmemcheck annotations\n\nstruct sk_buff kmemcheck annotations enlarged this structure by 8/16 bytes\n\nFix this by moving \u0027protocol\u0027 inside flags1 bitfield,\nand queue_mapping inside flags2 bitfield.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9532faeb293f5a5f0ff06f567de14e557698dbde", "tree": "46319ff2506340b56b34801e3a722bbaf28d55bf", "parents": [ "add810a1c58ba9edb6076ababe5861f36c049217", "3c7d76e371ac1a3802ae1673f5c63554af59325c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 09:18:20 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 09:18:20 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-param-fixes\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-param-fixes:\n param: fix setting arrays of bool\n param: fix NULL comparison on oom\n param: fix lots of bugs with writing charp params from sysfs, by leaking mem.\n" }, { "commit": "3242f9804ba992c867360e2b57efc268b8e4e175", "tree": "96fbdbc1344aa67588ce26765f308c674b91a75f", "parents": [ "23756692147c5dfd3328afd42e16e9d943ff756c", "7456b0405d8fc063c49628f969cdb23be060fc80" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:20:00 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:20:00 2009 -0700" }, "message": "Merge branch \u0027hwpoison-2.6.32\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6\n\n* \u0027hwpoison-2.6.32\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:\n HWPOISON: fix invalid page count in printk output\n HWPOISON: Allow schedule_on_each_cpu() from keventd\n HWPOISON: fix/proc/meminfo alignment\n HWPOISON: fix oops on ksm pages\n HWPOISON: Fix page count leak in hwpoison late kill in do_swap_page\n HWPOISON: return early on non-LRU pages\n HWPOISON: Add brief hwpoison description to Documentation\n HWPOISON: Clean up PR_MCE_KILL interface\n" }, { "commit": "fefcfd431b5181615e7da628e34c5227c895b85a", "tree": "0da42ba9d66c6e9a12b6352b5be41f2fa023c91b", "parents": [ "37c2ca24119f7dd89cbbb43833df1e6c5fb3417b", "89061d3d58e1f0742139605dc6a7950aa1ecc019" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:12:20 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:12:20 2009 -0700" }, "message": "Merge branch \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n futex: Move drop_futex_key_refs out of spinlock\u0027ed region\n rcu: Fix TREE_PREEMPT_RCU CPU_HOTPLUG bad-luck hang\n rcu: Stopgap fix for synchronize_rcu_expedited() for TREE_PREEMPT_RCU\n rcu: Prevent RCU IPI storms in presence of high call_rcu() load\n futex: Check for NULL keys in match_futex\n futex: Handle spurious wake up\n" }, { "commit": "6e958d73c25eecaf02a1998cda9ec8ce8da11042", "tree": "94b8d48d268297925aa02f8ab358274f878bae9e", "parents": [ "7811a32407b971d9086c46403124f1453b95c430", "92f6a5e37a2e2d3342dafb2b39c2f8bc340bbf84" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:10:38 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:10:38 2009 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Do less agressive buddy clearing\n sched: Disable SD_PREFER_LOCAL for MC/CPU domains\n" }, { "commit": "c68d2b1594548cda7f6dbac6a4d9d30a9b01558c", "tree": "6b2011fcd806906a64b0a98eeb798effb879d168", "parents": [ "1b62cbf2140df510a56d38b9d49df2aae95cd0d2" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Oct 26 16:50:05 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:30 2009 -0700" }, "message": "8250_pci: add IBM Saturn serial card\n\nThe IBM Saturn serial card has only one port. Without that fixup,\nthe kernel thinks it has two, which confuses userland setup and\nadmin tools as well.\n\n[akpm@linux-foundation.org: fix pci-ids.h layout]\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Michael Reed \u003cmreed10@us.ibm.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1b62cbf2140df510a56d38b9d49df2aae95cd0d2", "tree": "c9e589807ba5eccb16dd0f2f4b1cb9a01fa0a4d8", "parents": [ "9d09daf8e891e6ed60f96fbaf765ba7bced8bad1" ], "author": { "name": "Krauth.Julien", "email": "Krauth.Julien@addi-data.com", "time": "Mon Oct 26 16:50:04 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:30 2009 -0700" }, "message": "serial: add ADDI-DATA GmbH PCI-Express communication cards in 8250_pci.c and pci_ids.h\n\nAdd support for ADDI-DATA GmbH PCI-Express communication cards:\n\nAPCIe-7300\nAPCIe-7420\nAPCIe-7500\nAPCIe-7800\n\nWarning: 8250_pci.c depends on pci_ids.h. 8250_pci.c\n\nSigned-off-by: Krauth Julien \u003cKrauth.Julien@addi-data.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0a1b71b4008d332e57b5605a8228ea7aa96687e8", "tree": "92016012d1fa61980b5fd1519172704364f51e2d", "parents": [ "478988d3b28e98a31e0cfe24e011e28ba0f3cf0d" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon Oct 26 16:49:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:25 2009 -0700" }, "message": "strstrip(): mark as as must_check\n\nstrstrip() can return a modified value of its input argument, when\nremoving elading whitesapce. So it is surely bug for this function\u0027s\nreturn value to be ignored. The caller is probably going to use the\nincorrect original pointer.\n\nSo mark it __must_check to prevent this frm happening (as it has before).\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2eca40a8ccd4160dbfaa5cbd61038d921d0e5f13", "tree": "e4136b7e9c87486f12643b9389f11de718cb2bb2", "parents": [ "964fe080d94db82a3268443e9b9ece4c60246414" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Oct 26 16:49:29 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:24 2009 -0700" }, "message": "cpufreq: add cpufreq_get() stub for CONFIG_CPU_FREQ\u003dn\n\nWhen CONFIG_CPU_FREQ is disabled, cpufreq_get() needs a stub. Used by kvm\n(although it looks like a bit of the kvm code could be omitted when\nCONFIG_CPU_FREQ is disabled).\n\narch/x86/built-in.o: In function `kvm_arch_init\u0027:\n(.text+0x10de7): undefined reference to `cpufreq_get\u0027\n\n(Needed in linux-next\u0027s KVM tree, but it\u0027s correct in 2.6.32).\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nTested-by: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Dave Jones \u003cdavej@codemonkey.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "65afac7d80ab3bc9f81e75eafb71eeb92a3ebdef", "tree": "544c1e9192d8e47f1d1b1d54e36365f393ec7be0", "parents": [ "964fe080d94db82a3268443e9b9ece4c60246414" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Oct 29 08:56:16 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Oct 29 08:56:17 2009 +1030" }, "message": "param: fix lots of bugs with writing charp params from sysfs, by leaking mem.\n\ne180a6b7759a \"param: fix charp parameters set via sysfs\" fixed the case\nwhere charp parameters written via sysfs were freed, leaving drivers\naccessing random memory.\n\nUnfortunately, storing a flag in the kparam struct was a bad idea: it\u0027s\nrodata so setting it causes an oops on some archs. But that\u0027s not all:\n\n1) module_param_array() on charp doesn\u0027t work reliably, since we use an\n uninitialized temporary struct kernel_param.\n2) there\u0027s a fundamental race if a module uses this parameter and then\n it\u0027s changed: they will still access the old, freed, memory.\n\nThe simplest fix (ie. for 2.6.32) is to never free the memory. This\nprevents all these problems, at cost of a memory leak. In practice, there\nare only 18 places where a charp is writable via sysfs, and all are\nroot-only writable.\n\nReported-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: Sitsofe Wheeler \u003csitsofe@yahoo.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Christof Schmitt \u003cchristof.schmitt@de.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: stable@kernel.org\n" }, { "commit": "f7d7986060b2890fc26db6ab5203efbd33aa2497", "tree": "0ed63257afd3fd02d83ab481af35855603ac4790", "parents": [ "81cd5ae303e88a1e9d3a3e0f1fe8abd100edde16" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Sun Oct 18 01:09:29 2009 +0000" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Wed Oct 28 16:13:03 2009 +1100" }, "message": "perf_event: Add alignment-faults and emulation-faults software events\n\nAdd two more software events that are common to many cpus.\n\nAlignment faults: When a load or store is not aligned properly.\n\nEmulation faults: When an instruction is emulated in software.\n\nBoth cause a very significant slowdown (100x or worse), so identifying and\nfixing them is very important.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\n" }, { "commit": "6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647", "tree": "0c08371aefcf53b976d61e6a74667bcb21db3251", "parents": [ "67b394f7f26d84edb7294cc6528ab7ca6daa2ad1" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Fri Oct 23 19:36:19 2009 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Oct 24 11:07:51 2009 +0200" }, "message": "tracing: Remove cpu arg from the rb_time_stamp() function\n\nThe cpu argument is not used inside the rb_time_stamp() function.\nPlus fix a typo.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c20091023233647.118547500@goodmis.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "721a669b7225edeeb0ca8e2bf71b83882326a71b", "tree": "51bc7438941db50224489091eed677ba67decf56", "parents": [ "2e600d01c131ee189f55ca1879cd364b9e056df8" ], "author": { "name": "Soeren Sandmann", "email": "sandmann@daimi.au.dk", "time": "Tue Sep 15 14:33:08 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Oct 23 09:35:02 2009 +0200" }, "message": "perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers\n\nMake the hrtimer based events work for sysprof.\n\nWhenever a swevent is scheduled out, the hrtimer is canceled.\nWhen it is scheduled back in, the timer is restarted. This\nhappens every scheduler tick, which means the timer never\nexpired because it was getting repeatedly restarted over and\nover with the same period.\n\nTo fix that, save the remaining time when disabling; when\nreenabling, use that saved time as the period instead of the\nuser-specified sampling period.\n\nAlso, move the starting and stopping of the hrtimers to helper\nfunctions instead of duplicating the code.\n\nSigned-off-by: Søren Sandmann Pedersen \u003csandmann@redhat.com\u003e\nLKML-Reference: \u003cye8vdi7mluz.fsf@camel16.daimi.au.dk\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "43315956509ca6913764861ac7dec128b91eb1ec", "tree": "60fd5647f150a46e63093a41417c2eef3e776b3d", "parents": [ "9bf4e7fba8006d19846fec877b6da0616b2772de", "6beba7adbe092e63dfe8d09fbd1e3ec140474a13" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Oct 23 08:23:20 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Oct 23 08:23:20 2009 +0200" }, "message": "Merge branch \u0027perf/core\u0027 into perf/probes\n\nConflicts:\n\ttools/perf/Makefile\n\nMerge reason:\n\n - fix the conflict\n - pick up the pr_*() infrastructure to queue up dependent patch\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "964fe080d94db82a3268443e9b9ece4c60246414", "tree": "d0095a9befb34f77bf32757e7465e5d2cbc40a93", "parents": [ "4848490c50c5d46d4e9749fddc374c303823bcc4", "ff07eb897a97640b7ac0262cd50311ad403038f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 23 07:35:16 2009 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 23 07:35:16 2009 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n move virtrng_remove to .devexit.text\n move virtballoon_remove to .devexit.text\n virtio_blk: Revert serial number support\n virtio: let header files include virtio_ids.h\n virtio_blk: revert QUEUE_FLAG_VIRT addition\n" }, { "commit": "4848490c50c5d46d4e9749fddc374c303823bcc4", "tree": "f8ef23f86241789521b637fd39f80ef6f5018518", "parents": [ "d995053d045d777e78ba7eba71a6a0733f3aa726", "845de8afa66550331dca164ab77fa49de930b699" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 23 07:34:23 2009 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 23 07:34:23 2009 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)\n niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case\n KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST\n KS8851: Fix MAC address write order\n KS8851: Add soft reset at probe time\n net: fix section mismatch in fec.c\n net: Fix struct inet_timewait_sock bitfield annotation\n tcp: Try to catch MSG_PEEK bug\n net: Fix IP_MULTICAST_IF\n bluetooth: static lock key fix\n bluetooth: scheduling while atomic bug fix\n tcp: fix TCP_DEFER_ACCEPT retrans calculation\n tcp: reduce SYN-ACK retrans for TCP_DEFER_ACCEPT\n tcp: accept socket after TCP_DEFER_ACCEPT period\n Revert \"tcp: fix tcp_defer_accept to consider the timeout\"\n AF_UNIX: Fix deadlock on connecting to shutdown socket\n ethoc: clear only pending irqs\n ethoc: inline regs access\n vmxnet3: use dev_dbg, fix build for CONFIG_BLOCK\u003dn\n virtio_net: use dev_kfree_skb_any() in free_old_xmit_skbs()\n be2net: fix support for PCI hot plug\n ...\n" }, { "commit": "3225beaba05d4f06087593f5e903ce867b6e118a", "tree": "e68653a5f31ef98cbc96e170680187311e881fa0", "parents": [ "e95646c3ec33c8ec0693992da4332a6b32eb7e31" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Oct 22 16:39:28 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Oct 22 16:39:30 2009 +1030" }, "message": "virtio_blk: Revert serial number support\n\nThis reverts \"Add serial number support for virtio_blk, V4a\".\n\nTurns out that virtio_pci, lguest and s/390 all have an 8 bit limit\non virtio config space, so noone could ever use this.\n\nThis is coming back later in a cleaner form.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: john cooper \u003cjohn.cooper@redhat.com\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "e95646c3ec33c8ec0693992da4332a6b32eb7e31", "tree": "7855767cc4dccdefc4ea64584cc01b64f92176f3", "parents": [ "f8b12e513b953aebf30f8ff7d2de9be7e024dbbe" ], "author": { "name": "Christian Borntraeger", "email": "borntraeger@de.ibm.com", "time": "Wed Sep 30 11:17:21 2009 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Oct 22 16:39:28 2009 +1030" }, "message": "virtio: let header files include virtio_ids.h\n\nRusty,\n\ncommit 3ca4f5ca73057a617f9444a91022d7127041970a\n virtio: add virtio IDs file\nmoved all device IDs into a single file. While the change itself is\na very good one, it can break userspace applications. For example\nif a userspace tool wanted to get the ID of virtio_net it used to\ninclude virtio_net.h. This does no longer work, since virtio_net.h\ndoes not include virtio_ids.h.\nThis patch moves all \"#include \u003clinux/virtio_ids.h\u003e\" from the C\nfiles into the header files, making the header files compatible with\nthe old ones.\n\nIn addition, this patch exports virtio_ids.h to userspace.\n\nCC: Fernando Luis Vazquez Cao \u003cfernando@oss.ntt.co.jp\u003e\nSigned-off-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "abf90cca9725bd05362fb3443ad55071a69a12d9", "tree": "4bf6b9ded03dd0a7489bd143f7f40cc445ea034b", "parents": [ "b6b39e8f3fbbb31001b836afec87bcaf4811a7bf" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Oct 18 22:48:51 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 20 01:13:26 2009 -0700" }, "message": "net: Fix struct inet_timewait_sock bitfield annotation\n\ncommit 9e337b0f (net: annotate inet_timewait_sock bitfields)\nadded 4/8 bytes in struct inet_timewait_sock.\n\nFix this by declaring tw_ipv6_offset in the \u0027flags\u0027 bitfield\nThe 14 bits hole is named tw_pad to make it cleary apparent.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f8f86c7bdd1c954fbe153af437a0d91a6c5721a", "tree": "94a8d419a470a4f9852ca397bb9bbe48db92ff5c", "parents": [ "dca2d6ac09d9ef59ff46820d4f0c94b08a671202", "f39cdf25bf77219676ec5360980ac40b1a7e144a" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Oct 18 01:09:09 2009 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Oct 18 01:12:33 2009 +0200" }, "message": "Merge commit \u0027perf/core\u0027 into perf/hw-breakpoint\n\nConflicts:\n\tkernel/Makefile\n\tkernel/trace/Makefile\n\tkernel/trace/trace.h\n\tsamples/Makefile\n\nMerge reason: We need to be uptodate with the perf events development\nbranch because we plan to rewrite the breakpoints API on top of\nperf events.\n" }, { "commit": "bb3c3e807140816b5f5fd4840473ee52a916ad4f", "tree": "9e8a69d266a7df86ca16177eefffab4b4e910753", "parents": [ "595c36490deb49381dc51231a3d5e6b66786ed27", "012abeea669ea49636cf952d13298bb68654146a" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Oct 17 09:58:25 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Oct 17 09:58:25 2009 +0200" }, "message": "Merge commit \u0027v2.6.32-rc5\u0027 into perf/probes\n\nConflicts:\n\tkernel/trace/trace_event_profile.c\n\nMerge reason: update to -rc5 and resolve conflict.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7c650a0a9dda405ba41df12cf106d1228e50e3ba", "tree": "192d743da2ffbe6305a28b4571b5cefc78d6755a", "parents": [ "012abeea669ea49636cf952d13298bb68654146a", "159a7ff7a13f9a02c75006f40c0561a3a81aefcd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 16 09:25:11 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 16 09:25:11 2009 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n sata_mv: Prevent PIO commands to be defered too long if traffic in progress.\n pata_sc1200: Fix crash on boot\n libata: fix internal command failure handling\n libata: fix PMP initialization\n sata_nv: make sure link is brough up online when skipping hardreset\n ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2\n ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets.\n pata_via: extend the rev_max for VT6330\n" }, { "commit": "5deab536654f95345ea11e8ec6ed5c778df348b5", "tree": "4f6557fccab0e5521498f834f984fa96ea4e5f48", "parents": [ "726206f84c67303cc004aacfd45d37f9277a29f6" ], "author": { "name": "Shane Huang", "email": "shane.huang@amd.com", "time": "Tue Oct 13 11:14:00 2009 +0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Fri Oct 16 06:21:20 2009 -0400" }, "message": "ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2\n\nThis patch renames the code name SB900 into Hudson-2\n\nSigned-off-by: Shane Huang \u003cshane.huang@amd.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "c3da31485f074a6f598b67045b08e2e15d908310", "tree": "64f9ad3d3752e80de2b22b47cbea8f8512dc5d59", "parents": [ "bd0704111e625ebe75418531550cf471215c3267", "8f7e524ce33ca81b663711404709396165da3cbd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 15 15:03:17 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 15 15:03:17 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)\n vmxnet: fix 2 build problems\n net: add support for STMicroelectronics Ethernet controllers.\n net: ks8851_mll uses mii interfaces\n net/fec_mpc52xx: Fix kernel panic on FEC error\n net: Fix OF platform drivers coldplug/hotplug when compiled as modules\n TI DaVinci EMAC: Clear statistics register properly.\n r8169: partial support and phy init for the 8168d\n irda/sa1100_ir: check return value of startup hook\n udp: Fix udp_poll() and ioctl()\n WAN: fix Cisco HDLC handshaking.\n tcp: fix tcp_defer_accept to consider the timeout\n 3c574_cs: spin_lock the set_multicast_list function\n net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs\n netxen: fix pci bar mapping\n ethoc: fix warning from 32bit build\n libertas: fix build\n net: VMware virtual Ethernet NIC driver: vmxnet3\n net: Fix IXP 2000 network driver building.\n libertas: fix build\n mac80211: document ieee80211_rx() context requirement\n ...\n" }, { "commit": "434a83c3fbb951908a3a52040f7f0e0b8ba00dd0", "tree": "2b0d75112d6f132e749024c2a61a806426a2ac06", "parents": [ "a66abe7fbf7805a1a02f241bd5283265ff6706ec" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 11:50:39 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 12:42:03 2009 +0200" }, "message": "events: Harmonize event field names and print output names\n\nNow that we can filter based on fields via perf record, people\nwill start using filter expressions and will expect them to\nbe obvious.\n\nThe primary way to see which fields are available is by looking\nat the trace output, such as:\n\n gcc-18676 [000] 343.011728: irq_handler_entry: irq\u003d0 handler\u003dtimer\n cc1-18677 [000] 343.012727: irq_handler_entry: irq\u003d0 handler\u003dtimer\n cc1-18677 [000] 343.032692: irq_handler_entry: irq\u003d0 handler\u003dtimer\n cc1-18677 [000] 343.033690: irq_handler_entry: irq\u003d0 handler\u003dtimer\n cc1-18677 [000] 343.034687: irq_handler_entry: irq\u003d0 handler\u003dtimer\n cc1-18677 [000] 343.035686: irq_handler_entry: irq\u003d0 handler\u003dtimer\n cc1-18677 [000] 343.036684: irq_handler_entry: irq\u003d0 handler\u003dtimer\n\nWhile \u0027irq\u003d\u003d0\u0027 filters work, the \u0027handler\u003d\u003d\u003cx\u003e\u0027 filter expression\ndoes not work:\n\n $ perf record -R -f -a -e irq:irq_handler_entry --filter handler\u003dtimer sleep 1\n Error: failed to set filter with 22 (Invalid argument)\n\nThe problem is that while an \u0027irq\u0027 field exists and is recognized\nas a filter field - \u0027handler\u0027 does not exist - its name is \u0027name\u0027\nin the output.\n\nTo solve this, we need to synchronize the printout and the field\nnames, wherever possible.\n\nIn cases where the printout prints a non-field, we enclose\nthat information in square brackets, such as:\n\n perf-1380 [013] 724.903505: softirq_exit: vec\u003d9 [action\u003dRCU]\n perf-1380 [013] 724.904482: softirq_exit: vec\u003d1 [action\u003dTIMER]\n\nThis way users can use filter expressions more intuitively: all\nfields that show up as \u0027primary\u0027 (non-bracketed) information is\nfilterable.\n\nThis patch harmonizes the field names for all irq, bkl, power,\nsched and timer events.\n\nWe might in fact think about dropping the print format bit of\ngeneric tracepoints altogether, and just print the fields that\nare being recorded.\n\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Tom Zanussi \u003ctzanussi@gmail.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6fb2915df7f0747d9044da9dbff5b46dc2e20830", "tree": "b4c5d7d913362ae6161c2859a7a385263330e965", "parents": [ "b0f1a59a98d7ac2102e7e4f22904c26d564a5628" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Oct 15 11:21:42 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 11:35:23 2009 +0200" }, "message": "tracing/profile: Add filter support\n\n- Add an ioctl to allocate a filter for a perf event.\n\n- Free the filter when the associated perf event is to be freed.\n\n- Do the filtering in perf_swevent_match().\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Tom Zanussi \u003ctzanussi@gmail.com\u003e\nLKML-Reference: \u003c4AD69546.8050401@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "713490e02eed242b4c1c672b3c0c8b708f8b6f1d", "tree": "8485759cfc112366d2485f473ad348a1c714f421", "parents": [ "c4dc775f53136cd6af8f88bce67cce9b42751768", "1beee96bae0daf7f491356777c3080cc436950f5" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 11:33:56 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 11:34:00 2009 +0200" }, "message": "Merge branch \u0027tracing/core\u0027 into perf/core\n\nMerge reason: to add event filter support we need the following\ncommits from the tracing tree:\n\n 3f6fe06: tracing/filters: Unify the regex parsing helpers\n 1889d20: tracing/filters: Provide basic regex support\n 737f453: tracing/filters: Cleanup useless headers\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "019129d595caaa5bd0b41d128308da1be6a91869", "tree": "2db09ada99b0b8ca0a6423626fa85a9c1a7fc141", "parents": [ "37c72e56f6b234ea7387ba530434a80abf2658d8" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Wed Oct 14 10:15:56 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 11:17:17 2009 +0200" }, "message": "rcu: Stopgap fix for synchronize_rcu_expedited() for TREE_PREEMPT_RCU\n\nFor the short term, map synchronize_rcu_expedited() to\nsynchronize_rcu() for TREE_PREEMPT_RCU and to\nsynchronize_sched_expedited() for TREE_RCU.\n\nLonger term, there needs to be a real expedited grace period for\nTREE_PREEMPT_RCU, but candidate patches to date are considerably\nmore complex and intrusive.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: laijs@cn.fujitsu.com\nCc: dipankar@in.ibm.com\nCc: mathieu.desnoyers@polymtl.ca\nCc: josh@joshtriplett.org\nCc: dvhltc@us.ibm.com\nCc: niv@us.ibm.com\nCc: peterz@infradead.org\nCc: rostedt@goodmis.org\nCc: Valdis.Kletnieks@vt.edu\nCc: dhowells@redhat.com\nCc: npiggin@suse.de\nCc: jens.axboe@oracle.com\nLKML-Reference: \u003c12555405592331-git-send-email-\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b226f744d40b052ac126c4cb16c76f66e5185128", "tree": "e86f5c059dde241472689cbe2d55429cd15b2d56", "parents": [ "d5b889f2ecec7849e851ddd31c34bdfb3482b5de", "a3ccf63ee643ef243cbf8918da8b3f9238f10029" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 08:44:42 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 15 08:44:44 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perf/core\n\nMerge reason: pick up tools/perf/ changes from upstream.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "43046b606673c9c991919ff75b980b72541e9ede", "tree": "86e89561891ed7833bd8229c2d06734aede63fec", "parents": [ "45242006e19c6f99945554e4d7d5680caf6ed9ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 14 09:16:42 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 14 09:16:42 2009 -0700" }, "message": "workqueue: add \u0027flush_delayed_work()\u0027 to run and wait for delayed work\n\nIt basically turns a delayed work into an immediate work, and then waits\nfor it to finish.\n" }, { "commit": "799e2205ec65e174f752b558c62a92c4752df313", "tree": "dc2438771be941b485f0da12a1ff177f0797e57b", "parents": [ "e17b38bf9e70d74f3739a600db75240078ac1407" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Oct 09 12:16:40 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Oct 14 15:02:34 2009 +0200" }, "message": "sched: Disable SD_PREFER_LOCAL for MC/CPU domains\n\nYanmin reported that both tbench and hackbench were significantly\nhurt by trying to keep tasks local on these domains, esp on small\ncache machines.\n\nSo disable it in order to promote spreading outside of the cache\ndomains.\n\nReported-by: \"Zhang, Yanmin\" \u003cyanmin_zhang@linux.intel.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCC: Mike Galbraith \u003cefault@gmx.de\u003e\nLKML-Reference: \u003c1255083400.8802.15.camel@laptop\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c44fc770845163f8d9e573f37f92a7b7a7ade14e", "tree": "dac4327b1454b73cefe7ffb2ef28cc67ea878f2b", "parents": [ "4d8289494a37e19cd7f3beacea9c957ad3debad6" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat Sep 19 06:50:42 2009 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Oct 14 09:53:56 2009 +0200" }, "message": "tracing: Move syscalls metadata handling from arch to core\n\nMost of the syscalls metadata processing is done from arch.\nBut these operations are mostly generic accross archs. Especially now\nthat we have a common variable name that expresses the number of\nsyscalls supported by an arch: NR_syscalls, the only remaining bits\nthat need to reside in arch is the syscall nr to addr translation.\n\nv2: Compare syscalls symbols only after the \"sys\" prefix so that we\n avoid spurious mismatches with archs that have syscalls wrappers,\n in which case syscalls symbols have \"SyS\" prefixed aliases.\n (Reported by: Heiko Carstens)\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "417c5233dbe35ffd6fa9e53754773f73690e1ce3", "tree": "1cfcbeddd1f91d5811de67dcb86f060d194ad6f5", "parents": [ "91cd1756cbbe9ba8772e6a5908f20cee56019c0d", "c49de94a56f02768fa881cd7cbf58907910ceb8e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 13 11:41:34 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 13 11:41:34 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "80f506918fdaaca6b574ba931536a58ce015c7be", "tree": "938bddf32e8c5dca114cb1a5f3ca2a62960accc8", "parents": [ "a3bafbbbb5ac49355aa35e6a722eac6ef1dff19a", "2ec24ff1d1875defa742c76c9c7d74dca06b7e1f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 13 10:21:33 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 13 10:21:33 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n cciss: Add cciss_allow_hpsa module parameter\n cciss: Fix multiple calls to pci_release_regions\n blk-settings: fix function parameter kernel-doc notation\n writeback: kill space in debugfs item name\n writeback: account IO throttling wait as iowait\n elv_iosched_store(): fix strstrip() misuse\n cfq-iosched: avoid probable slice overrun when idling\n cfq-iosched: apply bool value where we return 0/1\n cfq-iosched: fix think time allowed for seekers\n cfq-iosched: fix the slice residual sign\n cfq-iosched: abstract out the \u0027may this cfqq dispatch\u0027 logic\n block: use proper BLK_RW_ASYNC in blk_queue_start_tag()\n block: Seperate read and write statistics of in_flight requests v2\n block: get rid of kblock_schedule_delayed_work()\n cfq-iosched: fix possible problem with jiffies wraparound\n cfq-iosched: fix issue with rq-rq merging and fifo list ordering\n" }, { "commit": "25d591587d3b0676fb89c29e7e55fe4a08597ec1", "tree": "90f1d5d3bab243e14138d47bd9b9c1bb5613fb17", "parents": [ "86ae13b006e48959981248493efd3ff4b2828b3d", "2331d1a6cd3d6e580bc88b9a160066d9e1177fe1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 13 10:20:53 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 13 10:20:53 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:\n kbuild: revert \"save ARCH \u0026 CROSS_COMPILE ...\"\n warn about use of uninstalled kernel headers\n kbuild: mkcompile_h: trivial cleanups\n kbuild: fix warning when domainname is not available\n kbuild: Fix size_append issue for bzip2/lzma kernel\n kbuild,scripts: use non-builtin echo for \u0027-e\u0027\n kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set\n" } ], "next": "9dbdd6c41c12fb42ee7188eafa7e1917b192af3a" }