)]}' { "log": [ { "commit": "341c87bf346f57748230628c5ad6ee69219250e8", "tree": "93937b91c3680127e38a310d5679b9ca84067b04", "parents": [ "b1cfebc9231a69d46d66982a2c856ba41ef6d6b9" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Jun 30 11:41:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 30 18:55:59 2009 -0700" }, "message": "elf: limit max map count to safe value\n\nWith ELF, at generating coredump, some more headers other than used\nvmas are added.\n\nWhen max_map_count \u003d\u003d 65536, a core generated by following kinds of\ncode can be unreadable because the number of ELF\u0027s program header is\nwritten in 16bit in Ehdr (please see elf.h) and the number overflows.\n\n\u003d\u003d\n\t... \u003d mmap(); (munmap, mprotect, etc...)\n\tif (failed)\n\t\tabort();\n\u003d\u003d\n\nThis can happen in mmap/munmap/mprotect/etc...which calls split_vma().\n\nI think 65536 is not safe as _default_ and reduce it to 65530 is good\nfor avoiding unexpected corrupted core.\n\nAnyway, max_map_count can be enlarged by sysctl if a user is brave..\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Jakub Jelinek \u003cjakub@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@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": "17f98dcf6010a1cfd25d179fd0ce77d3dc2685c3", "tree": "520d88ba2282b4811f492be6cc4565a2a3eea128", "parents": [ "7338f29984114066b00da343a22876bb08259a84" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Jun 17 16:27:51 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:55 2009 -0700" }, "message": "pids: clean up find_task_by_pid variants\n\nfind_task_by_pid_type_ns is only used to implement find_task_by_vpid and\nfind_task_by_pid_ns, but both of them pass PIDTYPE_PID as first argument.\nSo just fold find_task_by_pid_type_ns into find_task_by_pid_ns and use\nfind_task_by_pid_ns to implement find_task_by_vpid.\n\nWhile we\u0027re at it also remove the exports for find_task_by_pid_ns and\nfind_task_by_vpid - we don\u0027t have any modular callers left as the only\nmodular caller of he old pre pid namespace find_task_by_pid (gfs2) was\nswitched to pid_task which operates on a struct pid pointer instead of a\npid_t. Given the confusion about pid_t values vs namespace that\u0027s\ngenerally the better option anyway and I think we\u0027re better of restricting\nmodules to do it that way.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Oleg Nesterov \u003coleg@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": "20ebcdda78a282d1d5266887ddf8a2d670182576", "tree": "99186bc3125ea5df5853ba58314b5944926ab8a0", "parents": [ "338c843108bf5030d6765f4405126e70f8b77845" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Wed Jun 17 16:27:16 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:47 2009 -0700" }, "message": "memcg: remove unneeded forward declaration from sched.h\n\nThis forward declaration seems pointless.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@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": "517d08699b250021303f9a7cf0d758b6dc0748ed", "tree": "5e5b0134c3fffb78fe9d8b1641a64ff28fdd7bbc", "parents": [ "8eeee4e2f04fc551f50c9d9847da2d73d7d33728", "a34601c5d84134055782ee031d58d82f5440e918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:50:13 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:50:13 2009 -0700" }, "message": "Merge branch \u0027akpm\u0027\n\n* akpm: (182 commits)\n fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset\n fbdev: *bfin*: fix __dev{init,exit} markings\n fbdev: *bfin*: drop unnecessary calls to memset\n fbdev: bfin-t350mcqb-fb: drop unused local variables\n fbdev: blackfin has __raw I/O accessors, so use them in fb.h\n fbdev: s1d13xxxfb: add accelerated bitblt functions\n tcx: use standard fields for framebuffer physical address and length\n fbdev: add support for handoff from firmware to hw framebuffers\n intelfb: fix a bug when changing video timing\n fbdev: use framebuffer_release() for freeing fb_info structures\n radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?\n s3c-fb: CPUFREQ frequency scaling support\n s3c-fb: fix resource releasing on error during probing\n carminefb: fix possible access beyond end of carmine_modedb[]\n acornfb: remove fb_mmap function\n mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF\n mb862xxfb: restrict compliation of platform driver to PPC\n Samsung SoC Framebuffer driver: add Alpha Channel support\n atmel-lcdc: fix pixclock upper bound detection\n offb: use framebuffer_alloc() to allocate fb_info struct\n ...\n\nManually fix up conflicts due to kmemcheck in mm/slab.c\n" }, { "commit": "2ff05b2b4eac2e63d345fc731ea151a060247f53", "tree": "1840bc2d3b381eca5d39869499339b0fcc6eabbf", "parents": [ "c9e444103b5e7a5a3519f9913f59767f92e33baf" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Tue Jun 16 15:32:56 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:43 2009 -0700" }, "message": "oom: move oom_adj value from task_struct to mm_struct\n\nThe per-task oom_adj value is a characteristic of its mm more than the\ntask itself since it\u0027s not possible to oom kill any thread that shares the\nmm. If a task were to be killed while attached to an mm that could not be\nfreed because another thread were set to OOM_DISABLE, it would have\nneedlessly been terminated since there is no potential for future memory\nfreeing.\n\nThis patch moves oomkilladj (now more appropriately named oom_adj) from\nstruct task_struct to struct mm_struct. This requires task_lock() on a\ntask to check its oom_adj value to protect against exec, but it\u0027s already\nnecessary to take the lock when dereferencing the mm to find the total VM\nsize for the badness heuristic.\n\nThis fixes a livelock if the oom killer chooses a task and another thread\nsharing the same memory has an oom_adj value of OOM_DISABLE. This occurs\nbecause oom_kill_task() repeatedly returns 1 and refuses to kill the\nchosen task while select_bad_process() will repeatedly choose the same\ntask during the next retry.\n\nTaking task_lock() in select_bad_process() to check for OOM_DISABLE and in\noom_kill_task() to check for threads sharing the same memory will be\nremoved in the next patch in this series where it will no longer be\nnecessary.\n\nWriting to /proc/pid/oom_adj for a kthread will now return -EINVAL since\nthese threads are immune from oom killing already. They simply report an\noom_adj value of OOM_DISABLE.\n\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "58568d2a8215cb6f55caf2332017d7bdff954e1c", "tree": "ffcdee457494ac78d6550b0aeac86536ca152e7b", "parents": [ "950592f7b991f267d707d372b90f508bbe72acbc" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Tue Jun 16 15:31:49 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:31 2009 -0700" }, "message": "cpuset,mm: update tasks\u0027 mems_allowed in time\n\nFix allocating page cache/slab object on the unallowed node when memory\nspread is set by updating tasks\u0027 mems_allowed after its cpuset\u0027s mems is\nchanged.\n\nIn order to update tasks\u0027 mems_allowed in time, we must modify the code of\nmemory policy. Because the memory policy is applied in the process\u0027s\ncontext originally. After applying this patch, one task directly\nmanipulates anothers mems_allowed, and we use alloc_lock in the\ntask_struct to protect mems_allowed and memory policy of the task.\n\nBut in the fast path, we didn\u0027t use lock to protect them, because adding a\nlock may lead to performance regression. But if we don\u0027t add a lock,the\ntask might see no nodes when changing cpuset\u0027s mems_allowed to some\nnon-overlapping set. In order to avoid it, we set all new allowed nodes,\nthen clear newly disallowed ones.\n\n[lee.schermerhorn@hp.com:\n The rework of mpol_new() to extract the adjusting of the node mask to\n apply cpuset and mpol flags \"context\" breaks set_mempolicy() and mbind()\n with MPOL_PREFERRED and a NULL nodemask--i.e., explicit local\n allocation. Fix this by adding the check for MPOL_PREFERRED and empty\n node mask to mpol_new_mpolicy().\n\n Remove the now unneeded \u0027nodes \u003d NULL\u0027 from mpol_new().\n\n Note that mpol_new_mempolicy() is always called with a non-NULL\n \u0027nodes\u0027 parameter now that it has been removed from mpol_new().\n Therefore, we don\u0027t need to test nodes for NULL before testing it for\n \u0027empty\u0027. However, just to be extra paranoid, add a VM_BUG_ON() to\n verify this assumption.]\n[lee.schermerhorn@hp.com:\n\n I don\u0027t think the function name \u0027mpol_new_mempolicy\u0027 is descriptive\n enough to differentiate it from mpol_new().\n\n This function applies cpuset set context, usually constraining nodes\n to those allowed by the cpuset. However, when the \u0027RELATIVE_NODES flag\n is set, it also translates the nodes. So I settled on\n \u0027mpol_set_nodemask()\u0027, because the comment block for mpol_new() mentions\n that we need to call this function to \"set nodes\".\n\n Some additional minor line length, whitespace and typo cleanup.]\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Yasunori Goto \u003cy-goto@jp.fujitsu.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3959214f971417f4162926ac52ad4cd042958caa", "tree": "1e73536b383a2a8337c09c5630871b2f94a8bcfa", "parents": [ "f6ee649f4b191d316a463ce7e514f9d12fa31c01" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Tue Mar 24 15:43:30 2009 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 15 21:30:23 2009 -0700" }, "message": "sched: delayed cleanup of user_struct\n\nDuring bootup performance tracing we see repeated occurrences of\n/sys/kernel/uid/* events for the same uid, leading to a,\nin this case, rather pointless userspace processing for the\nsame uid over and over.\n\nThis is usually caused by tools which change their uid to \"nobody\",\nto run without privileges to read data supplied by untrusted users.\n\nThis change delays the execution of the (already existing) scheduled\nwork, to cleanup the uid after one second, so the allocated and announced\nuid can possibly be re-used by another process.\n\nThis is the current behavior, where almost every invocation of a\nbinary, which changes the uid, creates two events:\n $ read START \u003c /sys/kernel/uevent_seqnum; \\\n for i in `seq 100`; do su --shell\u003d/bin/true bin; done; \\\n read END \u003c /sys/kernel/uevent_seqnum; \\\n echo $(($END - $START))\n 178\n\nWith the delayed cleanup, we get only two events, and userspace finishes\na bit faster too:\n $ read START \u003c /sys/kernel/uevent_seqnum; \\\n for i in `seq 100`; do su --shell\u003d/bin/true bin; done; \\\n read END \u003c /sys/kernel/uevent_seqnum; \\\n echo $(($END - $START))\n 1\n\nAcked-by: Dhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "19035e5b5d1e3127b4925d86f6a77964f91f2c3c", "tree": "c9e7e9073970176a5b0970da715cb6430c3c9069", "parents": [ "f9db6e095115f9411b9647bdb9d81fe11f3d8b54", "eea08f32adb3f97553d49a4f79a119833036000a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 15 10:06:19 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 15 10:06:19 2009 -0700" }, "message": "Merge branch \u0027timers-for-linus-migration\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus-migration\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n timers: Logic to move non pinned timers\n timers: /proc/sys sysctl hook to enable timer migration\n timers: Identifying the existing pinned timers\n timers: Framework for identifying pinned timers\n timers: allow deferrable timers for intervals tv2-tv5 to be deferred\n\nFix up conflicts in kernel/sched.c and kernel/timer.c manually\n" }, { "commit": "9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb", "tree": "8d104ec2a459346b99413b0b77421ca7b9936c1a", "parents": [ "ca44d6e60f9de26281fda203f58b570e1748c015", "45e3e1935e2857c54783291107d33323b3ef33c8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 15 03:02:23 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 15 03:02:23 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/scsi/fcoe/fcoe.c\n\tnet/core/drop_monitor.c\n\tnet/core/net-traces.c\n" }, { "commit": "8a1ca8cedd108c8e76a6ab34079d0bbb4f244799", "tree": "636c715524f1718599209cc289908ea44b6cb859", "parents": [ "b640f042faa2a2fad6464f259a8afec06e2f6386", "940010c5a314a7bd9b498593bc6ba1718ac5aec5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 14:01:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 14:01:07 2009 -0700" }, "message": "Merge branch \u0027perfcounters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perfcounters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (574 commits)\n perf_counter: Turn off by default\n perf_counter: Add counter-\u003eid to the throttle event\n perf_counter: Better align code\n perf_counter: Rename L2 to LL cache\n perf_counter: Standardize event names\n perf_counter: Rename enums\n perf_counter tools: Clean up u64 usage\n perf_counter: Rename perf_counter_limit sysctl\n perf_counter: More paranoia settings\n perf_counter: powerpc: Implement generalized cache events for POWER processors\n perf_counters: powerpc: Add support for POWER7 processors\n perf_counter: Accurate period data\n perf_counter: Introduce struct for sample data\n perf_counter tools: Normalize data using per sample period data\n perf_counter: Annotate exit ctx recursion\n perf_counter tools: Propagate signals properly\n perf_counter tools: Small frequency related fixes\n perf_counter: More aggressive frequency adjustment\n perf_counter/x86: Fix the model number of Intel Core2 processors\n perf_counter, x86: Correct some event and umask values for Intel processors\n ...\n" }, { "commit": "3296ca27f50ecbd71db1d808c7a72d311027f919", "tree": "833eaa58b2013bda86d4bd95faf6efad7a2d5ca4", "parents": [ "e893123c7378192c094747dadec326b7c000c190", "73fbad283cfbbcf02939bdbda31fc4a30e729cca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 10:01:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 10:01:41 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (44 commits)\n nommu: Provide mmap_min_addr definition.\n TOMOYO: Add description of lists and structures.\n TOMOYO: Remove unused field.\n integrity: ima audit dentry_open failure\n TOMOYO: Remove unused parameter.\n security: use mmap_min_addr indepedently of security models\n TOMOYO: Simplify policy reader.\n TOMOYO: Remove redundant markers.\n SELinux: define audit permissions for audit tree netlink messages\n TOMOYO: Remove unused mutex.\n tomoyo: avoid get+put of task_struct\n smack: Remove redundant initialization.\n integrity: nfsd imbalance bug fix\n rootplug: Remove redundant initialization.\n smack: do not beyond ARRAY_SIZE of data\n integrity: move ima_counts_get\n integrity: path_check update\n IMA: Add __init notation to ima functions\n IMA: Minimal IMA policy and boot param for TCB IMA policy\n selinux: remove obsolete read buffer limit from sel_read_bool\n ...\n" }, { "commit": "940010c5a314a7bd9b498593bc6ba1718ac5aec5", "tree": "d141e08ced08c40c6a8e3ab2cdecde5ff14e560f", "parents": [ "8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5", "991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/irqinit.c\n\tarch/x86/kernel/irqinit_64.c\n\tarch/x86/kernel/traps.c\n\tarch/x86/mm/fault.c\n\tinclude/linux/sched.h\n\tkernel/exit.c\n" }, { "commit": "862366118026a358882eefc70238dbcc3db37aac", "tree": "4eb62bc10327a5afac064a95a091ea05ecd2acc1", "parents": [ "57eee9ae7bbcfb692dc96c739a5184adb6349733", "511b01bdf64ad8a38414096eab283c7784aebfc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:53:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:53:40 2009 -0700" }, "message": "Merge branch \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (244 commits)\n Revert \"x86, bts: reenable ptrace branch trace support\"\n tracing: do not translate event helper macros in print format\n ftrace/documentation: fix typo in function grapher name\n tracing/events: convert block trace points to TRACE_EVENT(), fix !CONFIG_BLOCK\n tracing: add protection around module events unload\n tracing: add trace_seq_vprint interface\n tracing: fix the block trace points print size\n tracing/events: convert block trace points to TRACE_EVENT()\n ring-buffer: fix ret in rb_add_time_stamp\n ring-buffer: pass in lockdep class key for reader_lock\n tracing: add annotation to what type of stack trace is recorded\n tracing: fix multiple use of __print_flags and __print_symbolic\n tracing/events: fix output format of user stack\n tracing/events: fix output format of kernel stack\n tracing/trace_stack: fix the number of entries in the header\n ring-buffer: discard timestamps that are at the start of the buffer\n ring-buffer: try to discard unneeded timestamps\n ring-buffer: fix bug in ring_buffer_discard_commit\n ftrace: do not profile functions when disabled\n tracing: make trace pipe recognize latency format flag\n ...\n" }, { "commit": "20f3f3ca499d2c211771ba552685398b65d83859", "tree": "41b460196a0860e11d12e33e3172463973cb0078", "parents": [ "769f3e8c384795cc350e2aae27de2a12374d19d4", "41c51c98f588edcdf6141cff1895df738e03ddd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:50:03 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:50:03 2009 -0700" }, "message": "Merge branch \u0027rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rcu: rcu_sched_grace_period(): kill the bogus flush_signals()\n rculist: use list_entry_rcu in places where it\u0027s appropriate\n rculist.h: introduce list_entry_rcu() and list_first_entry_rcu()\n rcu: Update RCU tracing documentation for __rcu_pending\n rcu: Add __rcu_pending tracing to hierarchical RCU\n RCU: make treercu be default\n" }, { "commit": "73fbad283cfbbcf02939bdbda31fc4a30e729cca", "tree": "7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7", "parents": [ "769f3e8c384795cc350e2aae27de2a12374d19d4", "35f2c2f6f6ae13ef23c4f68e6d3073753077ca43" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 11 11:03:14 2009 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 11 11:03:14 2009 +1000" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "082ff5a2767a0679ee543f14883adbafb631ffbe", "tree": "5ddf792ed3f80b17bc427edea1dc1d4b4303b4f6", "parents": [ "aa9c67f53d1969cf1db4c9c2db3a78c4ceb96469" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Sat May 23 18:29:00 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 24 08:24:08 2009 +0200" }, "message": "perf_counter: Change pctrl() behaviour\n\nInstead of en/dis-abling all counters acting on a particular\ntask, en/dis- able all counters we created.\n\n[ v2: fix crash on first counter enable ]\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nLKML-Reference: \u003c20090523163012.916937244@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a63eaf34ae60bdb067a354cc8def2e8f4a01f5f4", "tree": "9e81e5e0299bd524b3d07c17a05760e33c7d58a0", "parents": [ "34adc8062227f41b04ade0ff3fbd1dbe3002669e" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Fri May 22 14:17:31 2009 +1000" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 22 12:18:19 2009 +0200" }, "message": "perf_counter: Dynamically allocate tasks\u0027 perf_counter_context struct\n\nThis replaces the struct perf_counter_context in the task_struct with\na pointer to a dynamically allocated perf_counter_context struct. The\nmain reason for doing is this is to allow us to transfer a\nperf_counter_context from one task to another when we do lazy PMU\nswitching in a later patch.\n\nThis has a few side-benefits: the task_struct becomes a little smaller,\nwe save some memory because only tasks that have perf_counters attached\nget a perf_counter_context allocated for them, and we can remove the\ninclusion of \u003clinux/perf_counter.h\u003e in sched.h, meaning that we don\u0027t\nend up recompiling nearly everything whenever perf_counter.h changes.\n\nThe perf_counter_context structures are reference-counted and freed\nwhen the last reference is dropped. A context can have references\nfrom its task and the counters on its task. Counters can outlive the\ntask so it is possible that a context will be freed well after its\ntask has exited.\n\nContexts are allocated on fork if the parent had a context, or\notherwise the first time that a per-task counter is created on a task.\nIn the latter case, we set the context pointer in the task struct\nlocklessly using an atomic compare-and-exchange operation in case we\nraced with some other task in creating a context for the subject task.\n\nThis also removes the task pointer from the perf_counter struct. The\ntask pointer was not used anywhere and would make it harder to move a\ncontext from one task to another. Anything that needed to know which\ntask a counter was attached to was already using counter-\u003ectx-\u003etask.\n\nThe __perf_counter_init_context function moves up in perf_counter.c\nso that it can be called from find_get_context, and now initializes\nthe refcount, but is otherwise unchanged.\n\nWe were potentially calling list_del_counter twice: once from\n__perf_counter_exit_task when the task exits and once from\n__perf_counter_remove_from_context when the counter\u0027s fd gets closed.\nThis adds a check in list_del_counter so it doesn\u0027t do anything if\nthe counter has already been removed from the lists.\n\nSince perf_counter_task_sched_in doesn\u0027t do anything if the task doesn\u0027t\nhave a context, and leaves cpuctx-\u003etask_ctx \u003d NULL, this adds code to\n__perf_install_in_context to set cpuctx-\u003etask_ctx if necessary, i.e. in\nthe case where the current task adds the first counter to itself and\nthus creates a context for itself.\n\nThis also adds similar code to __perf_counter_enable to handle a\nsimilar situation which can arise when the counters have been disabled\nusing prctl; that also leaves cpuctx-\u003etask_ctx \u003d NULL.\n\n[ Impact: refactor counter context management to prepare for new feature ]\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003c18966.10075.781053.231153@cargo.ozlabs.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4200efd9acda4accf24640f1e77d24fdcdb524df", "tree": "ffeda24ae6a9c1b8ca94615e261434d925d2ed2c", "parents": [ "2d02494f5a90f2e4b3c4c6acc85ec94674cdc431" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 19 09:22:19 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 19 09:22:19 2009 +0200" }, "message": "sched: properly define the sched_group::cpumask and sched_domain::span fields\n\nProperly document the variable-size structure tricks we are doing\nwrt. struct sched_group and sched_domain, and use the field[0] GCC\nextension instead of defining a vla array.\n\nDont use unions for this, as pointed out by Linus.\n\n[ Impact: cleanup, un-confuse Sparse and LLVM ]\n\nReported-by: Jeff Garzik \u003cjeff@garzik.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003calpine.LFD.2.01.0905180850110.3301@localhost.localdomain\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "690cc3ffe33ac4a2857583c22d4c6244ae11684d", "tree": "47da7801ef7539260a1a64b41f43ab8131e4f551", "parents": [ "69e3c75f4d541a6eb151b3ef91f34033cb3ad6e1" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed May 13 16:55:10 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 18 22:15:56 2009 -0700" }, "message": "syscall: Implement a convinience function restart_syscall\n\nCurrently when we have a signal pending we have the functionality\nto restart that the current system call. There are other cases\nsuch as nasty lock ordering issues where it makes sense to have\na simple fix that uses try lock and restarts the system call.\nBuying time to figure out how to rework the locking strategy.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@aristanetworks.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2d02494f5a90f2e4b3c4c6acc85ec94674cdc431", "tree": "8032438de5b55282976583b111d02d9379ff3966", "parents": [ "dce48a84adf1806676319f6f480e30a6daa012f9" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 02 20:08:52 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 15 15:32:45 2009 +0200" }, "message": "sched, timers: cleanup avenrun users\n\navenrun is an rough estimate so we don\u0027t have to worry about\nconsistency of the three avenrun values. Remove the xtime lock\ndependency and provide a function to scale the values. Cleanup the\nusers.\n\n[ Impact: cleanup ]\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\n" }, { "commit": "dce48a84adf1806676319f6f480e30a6daa012f9", "tree": "79151f5d31d9c3dcdc723ab8877cb943b944890e", "parents": [ "2ff799d3cff1ecb274049378b28120ee5c1c5e5f" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Apr 11 10:43:41 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 15 15:32:45 2009 +0200" }, "message": "sched, timers: move calc_load() to scheduler\n\nDimitri Sivanich noticed that xtime_lock is held write locked across\ncalc_load() which iterates over all online CPUs. That can cause long\nlatencies for xtime_lock readers on large SMP systems. \n\nThe load average calculation is an rough estimate anyway so there is\nno real need to protect the readers vs. the update. It\u0027s not a problem\nwhen the avenrun array is updated while a reader copies the values.\n\nInstead of iterating over all online CPUs let the scheduler_tick code\nupdate the number of active tasks shortly before the avenrun update\nhappens. The avenrun update itself is handled by the CPU which calls\ndo_timer().\n\n[ Impact: reduce xtime_lock write locked section ]\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\n" }, { "commit": "789f90fcf6b0b54e655740e9396c954378542c79", "tree": "dccfe1ffac1202729238385923e74a8b5ebab979", "parents": [ "548e1ddf255b4ebfb4ef20c08936fd8d4deb3bd9" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 15 15:19:27 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 15 15:26:56 2009 +0200" }, "message": "perf_counter: per user mlock gift\n\nInstead of a per-process mlock gift for perf-counters, use a\nper-user gift so that there is less of a DoS potential.\n\n[ Impact: allow less worst-case unprivileged memory consumption ]\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003c20090515132018.496182835@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "eea08f32adb3f97553d49a4f79a119833036000a", "tree": "4e6af5185309d7abe49a8fa19634ea38582381e4", "parents": [ "cd1bb94b4a0531e8211a3774f17de831f8285f76" ], "author": { "name": "Arun R Bharadwaj", "email": "arun@linux.vnet.ibm.com", "time": "Thu Apr 16 12:16:41 2009 +0530" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 13 16:52:42 2009 +0200" }, "message": "timers: Logic to move non pinned timers\n\n* Arun R Bharadwaj \u003carun@linux.vnet.ibm.com\u003e [2009-04-16 12:11:36]:\n\nThis patch migrates all non pinned timers and hrtimers to the current\nidle load balancer, from all the idle CPUs. Timers firing on busy CPUs\nare not migrated.\n\nWhile migrating hrtimers, care should be taken to check if migrating\na hrtimer would result in a latency or not. So we compare the expiry of the\nhrtimer with the next timer interrupt on the target cpu and migrate the\nhrtimer only if it expires *after* the next interrupt on the target cpu.\nSo, added a clockevents_get_next_event() helper function to return the\nnext_event on the target cpu\u0027s clock_event_device.\n\n[ tglx: cleanups and simplifications ]\n\nSigned-off-by: Arun R Bharadwaj \u003carun@linux.vnet.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "cd1bb94b4a0531e8211a3774f17de831f8285f76", "tree": "0a031dd2bd984cbfec88a3ced6b2c6e3326efb88", "parents": [ "5c333864a6ba811052d52ef14fbed056b9ac3512" ], "author": { "name": "Arun R Bharadwaj", "email": "arun@linux.vnet.ibm.com", "time": "Thu Apr 16 12:15:34 2009 +0530" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 13 16:52:42 2009 +0200" }, "message": "timers: /proc/sys sysctl hook to enable timer migration\n\n* Arun R Bharadwaj \u003carun@linux.vnet.ibm.com\u003e [2009-04-16 12:11:36]:\n\nThis patch creates the /proc/sys sysctl interface at\n/proc/sys/kernel/timer_migration\n\nTimer migration is enabled by default.\n\nTo disable timer migration, when CONFIG_SCHED_DEBUG \u003d y,\n\necho 0 \u003e /proc/sys/kernel/timer_migration\n\nSigned-off-by: Arun R Bharadwaj \u003carun@linux.vnet.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "5e751e992f3fb08ba35e1ca8095ec8fbf9eda523", "tree": "711b1b47622dc9661f1d3d9c67d55c0b21456e8c", "parents": [ "d254117099d711f215e62427f55dfb8ebd5ad011" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri May 08 13:55:22 2009 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon May 11 08:15:36 2009 +1000" }, "message": "CRED: Rename cred_exec_mutex to reflect that it\u0027s a guard against ptrace\n\nRename cred_exec_mutex to reflect that it\u0027s a guard against foreign\nintervention on a process\u0027s credential state, such as is made by ptrace(). The\nattachment of a debugger to a process affects execve()\u0027s calculation of the new\ncredential state - _and_ also setprocattr()\u0027s calculation of that state.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "d254117099d711f215e62427f55dfb8ebd5ad011", "tree": "0848ff8dd74314fec14a86497f8d288c86ba7c65", "parents": [ "07ff7a0b187f3951788f64ae1f30e8109bc8e9eb", "8c9ed899b44c19e81859fbb0e9d659fe2f8630fc" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 08 17:56:47 2009 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 08 17:56:47 2009 +1000" }, "message": "Merge branch \u0027master\u0027 into next\n" }, { "commit": "0ad5d703c6c0fcd385d956555460df95dff7eb7e", "tree": "4b777100f9be4fe90ca4bd043b9f98df672b5b3b", "parents": [ "44347d947f628060b92449702071bfe1d31dfb75", "1cb81b143fa8f0e4629f10690862e2e52ca792ff" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 07 11:18:34 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 07 13:36:22 2009 +0200" }, "message": "Merge branch \u0027tracing/hw-branch-tracing\u0027 into tracing/core\n\nMerge reason: this topic is ready for upstream now. It passed\n Oleg\u0027s review and Andrew had no further mm/*\n objections/observations either.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3bcac0263f0b45e67a64034ebcb69eb9abb742f4", "tree": "33f4db08edaa12e1c20df348e2fa28c7c2198ebe", "parents": [ "88c48db9788862d0290831d081bc3c64e13b592f" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Apr 29 13:45:05 2009 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Apr 30 09:07:13 2009 +1000" }, "message": "SELinux: Don\u0027t flush inherited SIGKILL during execve()\n\nDon\u0027t flush inherited SIGKILL during execve() in SELinux\u0027s post cred commit\nhook. This isn\u0027t really a security problem: if the SIGKILL came before the\ncredentials were changed, then we were right to receive it at the time, and\nshould honour it; if it came after the creds were changed, then we definitely\nshould honour it; and in any case, all that will happen is that the process\nwill be scrapped before it ever returns to userspace.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a", "tree": "4ba588631dd8189a818a91c9e3976526071178b6", "parents": [ "1130b0296184bc21806225fd06d533515a99d2db", "56a50adda49b2020156616c4eb15353e0f9ad7de" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 29 14:46:59 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 29 14:47:05 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nMerge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up\n the latest upstream fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "416dfdcdb894432547ead4fcb9fa6a36b396059e", "tree": "8033fdda07397a59c5fa98c88927040906ce6c1a", "parents": [ "56449f437add737a1e5e1cb7e00f63ac8ead1938", "091069740304c979f957ceacec39c461d0192158" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Apr 24 10:11:18 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Apr 24 10:11:23 2009 +0200" }, "message": "Merge commit \u0027v2.6.30-rc3\u0027 into tracing/hw-branch-tracing\n\nConflicts:\n\tarch/x86/kernel/ptrace.c\n\nMerge reason: fix the conflict above, and also pick up the CONFIG_BROKEN\n dependency change from upstream so that we can remove it\n\t here.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "261842b7c9099f56de2eb969c8ad65402d68e00e", "tree": "6cdf0b4b5ad188294da67520dc9579a0c67940ac", "parents": [ "12acd473d45cf2e40de3782cb2de712e5cd4d715" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Thu Apr 16 21:41:52 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Apr 17 16:21:32 2009 -0400" }, "message": "tracing: add same level recursion detection\n\nThe tracing infrastructure allows for recursion. That is, an interrupt\nmay interrupt the act of tracing an event, and that interrupt may very well\nperform its own trace. This is a recursive trace, and is fine to do.\n\nThe problem arises when there is a bug, and the utility doing the trace\ncalls something that recurses back into the tracer. This recursion is not\ncaused by an external event like an interrupt, but by code that is not\nexpected to recurse. The result could be a lockup.\n\nThis patch adds a bitmask to the task structure that keeps track\nof the trace recursion. To find the interrupt depth, the following\nalgorithm is used:\n\n level \u003d hardirq_count() + softirq_count() + in_nmi;\n\nHere, level will be the depth of interrutps and softirqs, and even handles\nthe nmi. Then the corresponding bit is set in the recursion bitmask.\nIf the bit was already set, we know we had a recursion at the same level\nand we warn about it and fail the writing to the buffer.\n\nAfter the data has been committed to the buffer, we clear the bit.\nNo atomics are needed. The only races are with interrupts and they reset\nthe bitmask before returning anywy.\n\n[ Impact: detect same irq level trace recursion ]\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "05725f7eb4b8acb147c5fc7b91397b1f6bcab00d", "tree": "1f22c6bec3429f7ec9ebb8acd25672249e39b380", "parents": [ "72c6a9870f901045f2464c3dc6ee8914bfdc07aa" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Apr 14 20:17:16 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 15 12:05:25 2009 +0200" }, "message": "rculist: use list_entry_rcu in places where it\u0027s appropriate\n\nUse previously introduced list_entry_rcu instead of an open-coded\nlist_entry + rcu_dereference combination.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nReviewed-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: dipankar@in.ibm.com\nLKML-Reference: \u003c20090414181715.GA3634@psychotron.englab.brq.redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e3c8ca8336707062f3f7cb1cd7e6b3c753baccdd", "tree": "281917ab686d2e2a9e1a3996f729fbe97037de97", "parents": [ "01fad98a1f1d3b38adcbab4bd97f7f4cb983ffb5" ], "author": { "name": "Nathan Lynch", "email": "ntl@pobox.com", "time": "Wed Apr 08 19:45:12 2009 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Apr 09 07:37:02 2009 +0200" }, "message": "sched: do not count frozen tasks toward load\n\nFreezing tasks via the cgroup freezer causes the load average to climb\nbecause the freezer\u0027s current implementation puts frozen tasks in\nuninterruptible sleep (D state).\n\nSome applications which perform job-scheduling functions consult the\nload average when making decisions. If a cgroup is frozen, the load\naverage does not provide a useful measure of the system\u0027s utilization\nto such applications. This is especially inconvenient if the job\nscheduler employs the cgroup freezer as a mechanism for preempting low\npriority jobs. Contrast this with using SIGSTOP for the same purpose:\nthe stopped tasks do not count toward system load.\n\nChange task_contributes_to_load() to return false if the task is\nfrozen. This results in /proc/loadavg behavior that better meets\nusers\u0027 expectations.\n\nSigned-off-by: Nathan Lynch \u003cntl@pobox.com\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nTested-by: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nCc: \u003cstable@kernel.org\u003e\nCc: containers@lists.linux-foundation.org\nCc: linux-pm@lists.linux-foundation.org\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nLKML-Reference: \u003c20090408194512.47a99b95@manatee.lan\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5ea472a77f8e4811ceee3f44a9deda6ad6e8b789", "tree": "a9ec5019e2b666a19874fc344ffb0dd5da6bce94", "parents": [ "6c009ecef8cca28c7c09eb16d0802e37915a76e1", "577c9c456f0e1371cbade38eaf91ae8e8a308555" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 10:35:30 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 10:35:30 2009 +0200" }, "message": "Merge commit \u0027v2.6.30-rc1\u0027 into perfcounters/core\n\nConflicts:\n\tarch/powerpc/include/asm/systbl.h\n\tarch/powerpc/include/asm/unistd.h\n\tinclude/linux/init_task.h\n\nMerge reason: the conflicts are non-trivial: PowerPC placement\n of sys_perf_counter_open has to be mixed with the\n\t new preadv/pwrite syscalls.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1551260d1f0fb1d23f264582092b862fce5e2dbd", "tree": "d06a0d20c74adda44a78bc2dc9a3e3016de380d6", "parents": [ "c93f216b5b985a12a18323e5ca2eb01db3d2f000", "5e34437840d33554f69380584311743b39e8fbeb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 07 14:11:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 07 14:11:07 2009 -0700" }, "message": "Merge branch \u0027core/softlockup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core/softlockup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n softlockup: make DETECT_HUNG_TASK default depend on DETECT_SOFTLOCKUP\n softlockup: move \u0027one\u0027 to the softlockup section in sysctl.c\n softlockup: ensure the task has been switched out once\n softlockup: remove timestamp checking from hung_task\n softlockup: convert read_lock in hung_task to rcu_read_lock\n softlockup: check all tasks in hung_task\n softlockup: remove unused definition for spawn_softlockup_task\n softlockup: fix potential race in hung_task when resetting timeout\n softlockup: fix to allow compiling with !DETECT_HUNG_TASK\n softlockup: decouple hung tasks check from softlockup detection\n" }, { "commit": "0f4814065ff8c24ca8bfd75c9b73502be152c287", "tree": "f3816ecb64ee198235d2e9c1649de3241c3f2ac2", "parents": [ "ee811517a5604aa63fae803b7c044712699e1303" ], "author": { "name": "Markus Metzger", "email": "markus.t.metzger@intel.com", "time": "Fri Apr 03 16:43:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 13:36:31 2009 +0200" }, "message": "x86, ptrace: add bts context unconditionally\n\nAdd the ptrace bts context field to task_struct unconditionally.\n\nInitialize the field directly in copy_process().\nRemove all the unneeded functionality used to initialize that field.\n\nSigned-off-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nCc: roland@redhat.com\nCc: eranian@googlemail.com\nCc: oleg@redhat.com\nCc: juan.villacis@intel.com\nCc: ak@linux.jf.intel.com\nLKML-Reference: \u003c20090403144603.292754000@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e2b371f00a6f529f6362654239bdec8dcd510760", "tree": "36e47cd9fb949fd72893c2d5ddab489fa55b1869", "parents": [ "a26b89f05d194413c7238e0bea071054f6b5d3c8" ], "author": { "name": "Markus Metzger", "email": "markus.t.metzger@intel.com", "time": "Fri Apr 03 16:43:35 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 13:36:13 2009 +0200" }, "message": "mm, x86, ptrace, bts: defer branch trace stopping\n\nWhen a ptraced task is unlinked, we need to stop branch tracing for\nthat task.\n\nSince the unlink is called with interrupts disabled, and we need\ninterrupts enabled to stop branch tracing, we defer the work.\n\nCollect all branch tracing related stuff in a branch tracing context.\n\nReviewed-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: roland@redhat.com\nCc: eranian@googlemail.com\nCc: juan.villacis@intel.com\nCc: ak@linux.jf.intel.com\nLKML-Reference: \u003c20090403144550.712401000@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a26b89f05d194413c7238e0bea071054f6b5d3c8", "tree": "8a2efbabce49ed747fe9b54e282e04b82d1b9982", "parents": [ "cac94f979326212831c0ea44ed9ea1622b4f4e93" ], "author": { "name": "Markus Metzger", "email": "markus.t.metzger@intel.com", "time": "Fri Apr 03 16:43:34 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 13:36:12 2009 +0200" }, "message": "sched, hw-branch-tracer: add wait_task_context_switch() function to sched.h\n\nAdd a function to wait until some other task has been\nswitched out at least once.\n\nThis differs from wait_task_inactive() subtly, in that the\nlatter will wait until the task has left the CPU.\n\nSigned-off-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nCc: markus.t.metzger@gmail.com\nCc: roland@redhat.com\nCc: eranian@googlemail.com\nCc: oleg@redhat.com\nCc: juan.villacis@intel.com\nCc: ak@linux.jf.intel.com\nLKML-Reference: \u003c20090403144549.794157000@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5e34437840d33554f69380584311743b39e8fbeb", "tree": "e081135619ee146af5efb9ee883afca950df5757", "parents": [ "77d05632baee21b1cef8730d7c06aa69601e4dca", "d508afb437daee7cf07da085b635c44a4ebf9b38" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 11:15:40 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 11:15:40 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into core/softlockup\n\nConflicts:\n\tkernel/sysctl.c\n" }, { "commit": "4a0deca657f3dbb8a707b5dc8f173beec01e7ed2", "tree": "b52fb2d5fa3391f5eac37ca599413b4e8d187c0c", "parents": [ "01ef09d9ffb5ce9f8d62d1e5206da3d5ca612acc" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Mar 19 20:26:12 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 09:30:15 2009 +0200" }, "message": "perf_counter: generic context switch event\n\nImpact: cleanup\n\nUse the generic software events for context switches.\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\nOrig-LKML-Reference: \u003c20090319194233.283522645@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f541ae326fa120fa5c57433e4d9a133df212ce41", "tree": "bdbd94ec72cfc601118051cb35e8617d55510177", "parents": [ "e255357764f92afcafafbd4879b222b8c752065a", "0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 09:02:57 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 09:02:57 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core-v2\n\nMerge reason: we have gathered quite a few conflicts, need to merge upstream\n\nConflicts:\n\tarch/powerpc/kernel/Makefile\n\tarch/x86/ia32/ia32entry.S\n\tarch/x86/include/asm/hardirq.h\n\tarch/x86/include/asm/unistd_32.h\n\tarch/x86/include/asm/unistd_64.h\n\tarch/x86/kernel/cpu/common.c\n\tarch/x86/kernel/irq.c\n\tarch/x86/kernel/syscall_table_32.S\n\tarch/x86/mm/iomap_32.c\n\tinclude/linux/sched.h\n\tkernel/Makefile\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95", "tree": "7ff8833745d2f268f897f6fa4a27263b4a572245", "parents": [ "de18836e447c2dc30120c0919b8db8ddc0401cc4", "0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 01:41:22 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 01:41:22 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into irq/threaded\n\nConflicts:\n\tinclude/linux/irq.h\n\tkernel/irq/handle.c\n" }, { "commit": "714f83d5d9f7c785f622259dad1f4fad12d64664", "tree": "20563541ae438e11d686b4d629074eb002a481b7", "parents": [ "8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc", "645dae969c3b8651c5bc7c54a1835ec03820f85f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 05 11:04:19 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 05 11:04:19 2009 -0700" }, "message": "Merge branch \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)\n tracing, net: fix net tree and tracing tree merge interaction\n tracing, powerpc: fix powerpc tree and tracing tree interaction\n ring-buffer: do not remove reader page from list on ring buffer free\n function-graph: allow unregistering twice\n trace: make argument \u0027mem\u0027 of trace_seq_putmem() const\n tracing: add missing \u0027extern\u0027 keywords to trace_output.h\n tracing: provide trace_seq_reserve()\n blktrace: print out BLK_TN_MESSAGE properly\n blktrace: extract duplidate code\n blktrace: fix memory leak when freeing struct blk_io_trace\n blktrace: fix blk_probes_ref chaos\n blktrace: make classic output more classic\n blktrace: fix off-by-one bug\n blktrace: fix the original blktrace\n blktrace: fix a race when creating blk_tree_root in debugfs\n blktrace: fix timestamp in binary output\n tracing, Text Edit Lock: cleanup\n tracing: filter fix for TRACE_EVENT_FORMAT events\n ftrace: Using FTRACE_WARN_ON() to check \"freed record\" in ftrace_release()\n x86: kretprobe-booster interrupt emulation code fix\n ...\n\nFix up trivial conflicts in\n arch/parisc/include/asm/ftrace.h\n include/linux/memory.h\n kernel/extable.c\n kernel/module.c\n" }, { "commit": "8fe74cf053de7ad2124a894996f84fa890a81093", "tree": "77dcd8fbf33ce53a3821942233962fb28c6f2848", "parents": [ "c2eb2fa6d2b6fe122d3479ec5b28d978418b2698", "ced117c73edc917e96dea7cca98c91383f0792f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 21:09:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 21:09:10 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n Remove two unneeded exports and make two symbols static in fs/mpage.c\n Cleanup after commit 585d3bc06f4ca57f975a5a1f698f65a45ea66225\n Trim includes of fdtable.h\n Don\u0027t crap into descriptor table in binfmt_som\n Trim includes in binfmt_elf\n Don\u0027t mess with descriptor table in load_elf_binary()\n Get rid of indirect include of fs_struct.h\n New helper - current_umask()\n check_unsafe_exec() doesn\u0027t care about signal handlers sharing\n New locking/refcounting for fs_struct\n Take fs_struct handling to new file (fs/fs_struct.c)\n Get rid of bumping fs_struct refcount in pivot_root(2)\n Kill unsharing fs_struct in __set_personality()\n" }, { "commit": "1b0f7ffd0ea27cd3a0b9ca04e3df9522048c32a3", "tree": "a8c27acdf95f55f93fe86661c6cba4cd36c8e4f1", "parents": [ "52ee2dfdd4f51cf422ea6a96a0846dc94244aa37" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:39 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:02 2009 -0700" }, "message": "pids: kill signal_struct-\u003e __pgrp/__session and friends\n\nWe are wasting 2 words in signal_struct without any reason to implement\ntask_pgrp_nr() and task_session_nr().\n\ntask_session_nr() has no callers since\n2e2ba22ea4fd4bb85f0fa37c521066db6775cbef, we can remove it.\n\ntask_pgrp_nr() is still (I believe wrongly) used in fs/autofsX and\nfs/coda.\n\nThis patch reimplements task_pgrp_nr() via task_pgrp_nr_ns(), and kills\n__pgrp/__session and the related helpers.\n\nThe change in drivers/char/tty_io.c is cosmetic, but hopefully makes sense\nanyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Alan Cox \u003cnumber6@the-village.bc.nu\u003e\t\t[tty parts]\nCc: Cedric Le Goater \u003cclg@fr.ibm.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nCc: Eric Biederman \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nCc: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Roland McGrath \u003croland@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": "52ee2dfdd4f51cf422ea6a96a0846dc94244aa37", "tree": "e15753e01d2c2fbe980edc45f78a9ae77d2cf891", "parents": [ "2ae448efc87df6d328f5835969076c7f9fce59c3" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:38 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:02 2009 -0700" }, "message": "pids: refactor vnr/nr_ns helpers to make them safe\n\nInho, the safety rules for vnr/nr_ns helpers are horrible and buggy.\n\ntask_pid_nr_ns(task) needs rcu/tasklist depending on task \u003d\u003d current.\n\nAs for \"special\" pids, vnr/nr_ns helpers always need rcu. However, if\ntask !\u003d current, they are unsafe even under rcu lock, we can\u0027t trust\ntask-\u003egroup_leader without the special checks.\n\nAnd almost every helper has a callsite which needs a fix.\n\nAlso, it is a bit annoying that the implementations of, say,\ntask_pgrp_vnr() and task_pgrp_nr_ns() are not \"symmetrical\".\n\nThis patch introduces the new helper, __task_pid_nr_ns(), which is always\nsafe to use, and turns all other helpers into the trivial wrappers.\n\nAfter this I\u0027ll send another patch which converts task_tgid_xxx() as well,\nthey\u0027re are a bit special.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Louis Rilling \u003cLouis.Rilling@kerlabs.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Roland McGrath \u003croland@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": "6dda81f4384b94930826eded254d8c16f89a9248", "tree": "a7b27ca16a6feba637cb01e68b54c58b6ca07bc2", "parents": [ "8e654fba4a376f436bdfe361fc5cdbc87ac09b35" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:35 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:02 2009 -0700" }, "message": "pids: document task_pgrp/task_session is not safe without tasklist/rcu\n\nEven if task \u003d\u003d current, it is not safe to dereference the result of\ntask_pgrp/task_session. We can race with another thread which changes the\nspecial pid via setpgid/setsid.\n\nDocument this. The next 2 patches give an example of the unsafe usage, we\nhave more bad users.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Louis Rilling \u003cLouis.Rilling@kerlabs.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Roland McGrath \u003croland@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": "39c626ae47c469abdfd30c6e42eff884931380d6", "tree": "58cbe75bac79ce8ef55c94189df26448d0283918", "parents": [ "7f5d3652d469cdf9eb2365dfea7ce3fb9e1409cc" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:00 2009 -0700" }, "message": "forget_original_parent: split out the un-ptrace part\n\nBy discussion with Roland.\n\n- Rename ptrace_exit() to exit_ptrace(), and change it to do all the\n necessary work with -\u003eptraced list by its own.\n\n- Move this code from exit.c to ptrace.c\n\n- Update the comment in ptrace_detach() to explain the rechecking of\n the child-\u003eptrace.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: \"Metzger, Markus T\" \u003cmarkus.t.metzger@intel.com\u003e\nCc: Roland McGrath \u003croland@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": "6f2c55b843836d26528c56a0968689accaedbc67", "tree": "17501e29d4b6ef3eb85da9a5d6ad3df7f19ec6a2", "parents": [ "14dd1ff0f9e75dd4ae2f1ff8e48becb76d14f4ab" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Apr 02 16:56:59 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:51 2009 -0700" }, "message": "Simplify copy_thread()\n\nFirst argument unused since 2.3.11.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: \u003clinux-arch@vger.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": "8302294f43250dc337108c51882a6007f2b1e2e0", "tree": "85acd4440799c46a372df9cad170fa0c21e59096", "parents": [ "4fe70410d9a219dabb47328effccae7e7f2a6e26", "2e572895bf3203e881356a4039ab0fa428ed2639" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 01 21:54:19 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Apr 02 00:49:02 2009 +0200" }, "message": "Merge branch \u0027tracing/core-v2\u0027 into tracing-for-linus\n\nConflicts:\n\tinclude/linux/slub_def.h\n\tlib/Kconfig.debug\n\tmm/slob.c\n\tmm/slub.c\n" }, { "commit": "9de1581e75ba9d7979766d4ab6d56f0f2d87f7c6", "tree": "da6854544454f7f6184e6cd54c8b4e88bfc3543a", "parents": [ "a12888f772dab4bf5e6f73668dc4f5f6026a7014" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Mar 31 15:19:29 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:11 2009 -0700" }, "message": "get_mm_hiwater_xxx: trivial, s/define/inline/\n\nAndrew pointed out get_mm_hiwater_xxx() evaluate \"mm\" argument thrice/twice,\nmake them inline.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nReviewed-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": "5ad4e53bd5406ee214ddc5a41f03f779b8b2d526", "tree": "b3dab5140284b3edf02bf2b13f74bfddb25aa62a", "parents": [ "ce3b0f8d5c2203301fc87f3aaaed73e5819e2a48" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 29 19:50:06 2009 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 31 23:00:27 2009 -0400" }, "message": "Get rid of indirect include of fs_struct.h\n\nDon\u0027t pull it in sched.h; very few files actually need it and those\ncan include directly. sched.h itself only needs forward declaration\nof struct fs_struct;\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "c4e1aa67ed9e4e542a064bc271ddbf152b677e91", "tree": "2a2ca00bed0fc22b4eb83db092c9178868d8f76b", "parents": [ "cf2f7d7c90279cdbc12429de278f3d27ac2050ae", "2f8501815256af8498904e68bd0984b1afffd6f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 30 17:17:35 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 30 17:17:35 2009 -0700" }, "message": "Merge branch \u0027locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (33 commits)\n lockdep: fix deadlock in lockdep_trace_alloc\n lockdep: annotate reclaim context (__GFP_NOFS), fix SLOB\n lockdep: annotate reclaim context (__GFP_NOFS), fix\n lockdep: build fix for !PROVE_LOCKING\n lockstat: warn about disabled lock debugging\n lockdep: use stringify.h\n lockdep: simplify check_prev_add_irq()\n lockdep: get_user_chars() redo\n lockdep: simplify get_user_chars()\n lockdep: add comments to mark_lock_irq()\n lockdep: remove macro usage from mark_held_locks()\n lockdep: fully reduce mark_lock_irq()\n lockdep: merge the !_READ mark_lock_irq() helpers\n lockdep: merge the _READ mark_lock_irq() helpers\n lockdep: simplify mark_lock_irq() helpers #3\n lockdep: further simplify mark_lock_irq() helpers\n lockdep: simplify the mark_lock_irq() helpers\n lockdep: split up mark_lock_irq()\n lockdep: generate usage strings\n lockdep: generate the state bit definitions\n ...\n" }, { "commit": "6e15cf04860074ad032e88c306bea656bbdd0f22", "tree": "c346383bb7563e8d66b2f4a502f875b259c34870", "parents": [ "be0ea69674ed95e1e98cb3687a241badc756d228", "60db56422043aaa455ac7f858ce23c273220f9d9" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 26 21:39:17 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 27 17:28:43 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into percpu-cpumask-x86-for-linus-2\n\nConflicts:\n\tarch/parisc/kernel/irq.c\n\tarch/x86/include/asm/fixmap_64.h\n\tarch/x86/include/asm/setup.h\n\tkernel/irq/handle.c\n\nSemantic merge:\n arch/x86/include/asm/fixmap.h\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "831576fe40f4175e0767623cffa4aeb28157943a", "tree": "de54e628e5849d6cf201df4446d760d17f752326", "parents": [ "21cdbc1378e8aa96e1ed4a606dce1a8e7daf7fdf", "66fef08f7d5267b2312c4b48a6d2957d2d414105" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 16:05:01 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 16:05:01 2009 -0700" }, "message": "Merge branch \u0027sched-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (46 commits)\n sched: Add comments to find_busiest_group() function\n sched: Refactor the power savings balance code\n sched: Optimize the !power_savings_balance during fbg()\n sched: Create a helper function to calculate imbalance\n sched: Create helper to calculate small_imbalance in fbg()\n sched: Create a helper function to calculate sched_domain stats for fbg()\n sched: Define structure to store the sched_domain statistics for fbg()\n sched: Create a helper function to calculate sched_group stats for fbg()\n sched: Define structure to store the sched_group statistics for fbg()\n sched: Fix indentations in find_busiest_group() using gotos\n sched: Simple helper functions for find_busiest_group()\n sched: remove unused fields from struct rq\n sched: jiffies not printed per CPU\n sched: small optimisation of can_migrate_task()\n sched: fix typos in documentation\n sched: add avg_overlap decay\n x86, sched_clock(): mark variables read-mostly\n sched: optimize ttwu vs group scheduling\n sched: TIF_NEED_RESCHED -\u003e need_reshed() cleanup\n sched: don\u0027t rebalance if attached on NULL domain\n ...\n" }, { "commit": "8aef2d2856158a36c295a8d1288281e4839bff13", "tree": "eef85397dedcad001982724e0be2da6dc089b39f", "parents": [ "05ce5818adee8f8efd0a5ca0d900a6789012516b" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Mar 24 01:10:15 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Mar 24 09:33:30 2009 -0400" }, "message": "function-graph: ignore times across schedule\n\nImpact: more accurate timings\n\nThe current method of function graph tracing does not take into\naccount the time spent when a task is not running. This shows functions\nthat call schedule have increased costs:\n\n 3) + 18.664 us | }\n ------------------------------------------\n 3) \u003cidle\u003e-0 \u003d\u003e kblockd-123\n ------------------------------------------\n\n 3) | finish_task_switch() {\n 3) 1.441 us | _spin_unlock_irq();\n 3) 3.966 us | }\n 3) ! 2959.433 us | }\n 3) ! 2961.465 us | }\n\nThis patch uses the tracepoint in the scheduling context switch to\naccount for time that has elapsed while a task is scheduled out.\nNow we see:\n\n ------------------------------------------\n 3) \u003cidle\u003e-0 \u003d\u003e edac-po-1067\n ------------------------------------------\n\n 3) | finish_task_switch() {\n 3) 0.685 us | _spin_unlock_irq();\n 3) 2.331 us | }\n 3) + 41.439 us | }\n 3) + 42.663 us | }\n\nSigned-off-by: Steven Rostedt \u003csrostedt@redhat.com\u003e\n" }, { "commit": "3aa551c9b4c40018f0e261a178e3d25478dc04a9", "tree": "2a696109273fcc421d774cc8fefa4180331a85ad", "parents": [ "80c5520811d3805adcb15c570ea5e2d489fa5d0b" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Mar 23 18:28:15 2009 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 24 12:15:23 2009 +0100" }, "message": "genirq: add threaded interrupt handler support\n\nAdd support for threaded interrupt handlers:\n\nA device driver can request that its main interrupt handler runs in a\nthread. To achive this the device driver requests the interrupt with\nrequest_threaded_irq() and provides additionally to the handler a\nthread function. The handler function is called in hard interrupt\ncontext and needs to check whether the interrupt originated from the\ndevice. If the interrupt originated from the device then the handler\ncan either return IRQ_HANDLED or IRQ_WAKE_THREAD. IRQ_HANDLED is\nreturned when no further action is required. IRQ_WAKE_THREAD causes\nthe genirq code to invoke the threaded (main) handler. When\nIRQ_WAKE_THREAD is returned handler must have disabled the interrupt\non the device level. This is mandatory for shared interrupt handlers,\nbut we need to do it as well for obscure x86 hardware where disabling\nan interrupt on the IO_APIC level redirects the interrupt to the\nlegacy PIC interrupt lines.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n\n" }, { "commit": "703a3cd72817e99201cef84a8a7aecc60b2b3581", "tree": "3e943755178ff410694722bb031f523136fbc432", "parents": [ "df7f54c012b92ec93d56b68547351dcdf8a163d3", "8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Mar 24 10:52:46 2009 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Mar 24 10:52:46 2009 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n" }, { "commit": "17d85bc7564571a1cce23ffdb2d2a33301876925", "tree": "815bfc3a02e94303c7c834770bf2a17012c10bf8", "parents": [ "d95c3578120e5bc4784069439f00ccb1b5f87717", "041b62374c7fedc11a8a1eeda2868612d3d1436c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 05:54:43 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 05:54:43 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc8\u0027 into cpus4096\n" }, { "commit": "f6411fe7e09b67470a2569231d6fa566c7c29b8b", "tree": "f12d569c70ff937175eb5cde2195fccfe2fa34eb", "parents": [ "df1c99d416500da8d26a4d78777467c53ee7689e", "f24ade3a3332811a512ed3b6c6aa69486719b1d8", "9ead64974b05501bbac0d63a47c99fa786d064ba" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 04:50:44 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 04:50:44 2009 +0100" }, "message": "Merge branches \u0027sched/clock\u0027, \u0027sched/urgent\u0027 and \u0027linus\u0027 into sched/core\n" }, { "commit": "480c93df5b99699390f93a7024c9f60d09da0e96", "tree": "b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af", "parents": [ "aecfcde920da8d32949f6cbbc1fc051b4ef9e7be", "d820ac4c2fa881079e6b689d2098adce337558ae" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 01:33:21 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 01:33:21 2009 +0100" }, "message": "Merge branch \u0027core/locking\u0027 into tracing/ftrace\n" }, { "commit": "3c1f67d60e2b4f4455563928999fd41cc653645d", "tree": "0d58c145a05fb09167f1ab6882b474eccb1f3563", "parents": [ "03d78913f01e8f6599823f00357ed17b32747d3d", "9ead64974b05501bbac0d63a47c99fa786d064ba" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 01:29:17 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 01:29:17 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/locking\n" }, { "commit": "76e6eee03353f01bfca707d4dbb1f10a4ee27dc0", "tree": "6b0378b1da6ae16e04d19f3c742b7863716b8e14", "parents": [ "99adcd9d67aaf04e28f5ae96df280f236bde4b66" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Mar 12 14:35:43 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Mar 12 14:35:44 2009 +1030" }, "message": "cpumask: tsk_cpumask for accessing the struct task_struct\u0027s cpus_allowed.\n\nThis allows us to change the representation (to a dangling bitmap or\ncpumask_var_t) without breaking all the callers: they can use\ntsk_cpumask() now and won\u0027t see a difference as the changes roll into\nlinux-next.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "f0ef03985130287c6c84ebe69416cf790e6cc00e", "tree": "3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7", "parents": [ "16097439703bcd38e9fe5608c12add6dacb825ea", "31bbed527e7039203920c51c9fb48c27aed0820c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 06 16:44:14 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 06 16:45:01 2009 +0100" }, "message": "Merge branch \u0027x86/core\u0027 into tracing/textedit\n\nConflicts:\n\tarch/x86/Kconfig\n\tblock/blktrace.c\n\tkernel/irq/handle.c\n\nSemantic conflict:\n\tkernel/trace/blktrace.c\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a1413c89ae6a4b7a9a43f7768934a81ffb5c629a", "tree": "7e16be26407c5fd4dfbfeb98b11590809a963664", "parents": [ "f254f3909efaf59ca2d0f408de2d044dace60706", "dd4124a8a06bca89c077a16437edac010f0bb993" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 05 21:48:31 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 05 21:48:50 2009 +0100" }, "message": "Merge branch \u0027x86/urgent\u0027 into x86/core\n\nConflicts:\n\tarch/x86/include/asm/fixmap_64.h\nSemantic merge:\n\tarch/x86/include/asm/fixmap.h\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a140feab42d1cfd811930ab76104559c19dfc4b0", "tree": "41fd871990e888dd5616a6bf1891a1ff307221df", "parents": [ "1075414b06109a99b0e87601e84c74a95bd45681", "fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 05 11:45:22 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 05 11:45:22 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc7\u0027 into core/locking\n" }, { "commit": "28b1bd1cbc33cae95a309691d814399a69cf3070", "tree": "6474d10332662f5302be0df8527c9e9e31e32a95", "parents": [ "2602c3ba4508f528db024c1d209256513ea05de6", "1075414b06109a99b0e87601e84c74a95bd45681" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 04 18:49:19 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 04 18:49:19 2009 +0100" }, "message": "Merge branch \u0027core/locking\u0027 into tracing/ftrace\n" }, { "commit": "8163d88c79dca35478a2405c837733ac50ea4c39", "tree": "6acae066a09b7dcbedab4a35ad62eba4ba3fd83c", "parents": [ "a1ef58f442542d8b3e3b963339fbc522c36e827c", "fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 04 11:42:31 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 04 11:42:31 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc7\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/mm/iomap_32.c\n" }, { "commit": "a1be621dfacbef0fd374d8acd553d71e07bf29ac", "tree": "32b0355454b43b1098b5e01dd699fd7281abf781", "parents": [ "3612fdf780e28b10323dd12d2b0f306c7ada4d4c", "fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 04 11:14:47 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 04 11:14:47 2009 +0100" }, "message": "Merge branch \u0027tracing/ftrace\u0027; commit \u0027v2.6.29-rc7\u0027 into tracing/core\n" }, { "commit": "5512b3ece0cbb5024b83099963222700aa45f59e", "tree": "24d60f354652f8b9ed5b0820aeb9da6add7be493", "parents": [ "c40c6f85a7594ad842233885386a0ca4cd40eafe", "8325d9c09dedf45476f4d6261d1b6a72e4a7453f", "54e991242850edc8c53f71fa5aa3ba7a93ce38f5", "778ef1e6cbb049c9bcbf405936ee6f2b6e451892" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Mar 02 12:02:36 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Mar 02 12:02:36 2009 +0100" }, "message": "Merge branches \u0027sched/clock\u0027, \u0027sched/urgent\u0027 and \u0027linus\u0027 into sched/core\n" }, { "commit": "54e991242850edc8c53f71fa5aa3ba7a93ce38f5", "tree": "7f136214aab690a8ee4a294ca9c1a7e01de0dc49", "parents": [ "cac64d00c256e65776d575e82aaf540632b66178" ], "author": { "name": "Dhaval Giani", "email": "dhaval@linux.vnet.ibm.com", "time": "Fri Feb 27 15:13:54 2009 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 27 11:11:53 2009 +0100" }, "message": "sched: don\u0027t allow setuid to succeed if the user does not have rt bandwidth\n\nImpact: fix hung task with certain (non-default) rt-limit settings\n\nCorey Hickey reported that on using setuid to change the uid of a\nrt process, the process would be unkillable and not be running.\nThis is because there was no rt runtime for that user group. Add\nin a check to see if a user can attach an rt task to its task group.\nOn failure, return EINVAL, which is also returned in\nCONFIG_CGROUP_SCHED.\n\nReported-by: Corey Hickey \u003cbugfood-ml@fatooh.org\u003e\nSigned-off-by: Dhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1b49061d400c9e51e3ac2aac026a099fe599b9bb", "tree": "54c632cd7f0be2573897c1463a247e69fb769940", "parents": [ "14131f2f98ac350ee9e73faed916d2238a8b6a0d", "83ce400928680a6c8123d492684b27857f5a2d95" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 26 21:21:59 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 27 08:35:19 2009 +0100" }, "message": "Merge branch \u0027sched/clock\u0027 into tracing/ftrace\n\nConflicts:\n\tkernel/sched_clock.c\n" }, { "commit": "b342501cd31e5546d0c9ca8ceff5ded1832f9e5b", "tree": "3cd5778565a45a74e8ad0640093927a77d4d625e", "parents": [ "694593e3374a67d95ece6a275a1f181644c2c4d8" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 26 20:20:29 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 26 21:20:22 2009 +0100" }, "message": "sched: allow architectures to specify sched_clock_stable\n\nAllow CONFIG_HAVE_UNSTABLE_SCHED_CLOCK architectures to still specify\nthat their sched_clock() implementation is reliable.\n\nThis will be used by x86 to switch on a faster sched_clock_cpu()\nimplementation on certain CPU types.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5274f8354d6a1ed9d6688e6a89b705b94aa1b6e9", "tree": "a40ae6f754648311b27811acbbd7af61cc65eab0", "parents": [ "ad0b0fd554dfc126b5750d14908dccc3bbf602be", "a0490fa35dc0022ef95f64802e8edf18c411c790", "d2f8d7ee1a9b4650b4e43325b321801264f7c37a" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Feb 15 21:15:16 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Feb 15 21:15:16 2009 +0100" }, "message": "Merge branch \u0027sched/urgent\u0027; commit \u0027v2.6.29-rc5\u0027 into sched/core\n" }, { "commit": "cf40bd16fdad42c053040bcd3988f5fdedbb6c57", "tree": "d97ab25726981712be806d77650b7f65167cfc88", "parents": [ "6f2b9b9a9d750a9175dc79c74bfed5add840983c" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Wed Jan 21 08:12:39 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Feb 14 23:27:49 2009 +0100" }, "message": "lockdep: annotate reclaim context (__GFP_NOFS)\n\nHere is another version, with the incremental patch rolled up, and\nadded reclaim context annotation to kswapd, and allocation tracing\nto slab allocators (which may only ever reach the page allocator\nin rare cases, so it is good to put annotations here too).\n\nHaven\u0027t tested this version as such, but it should be getting closer\nto merge worthy ;)\n\n--\nAfter noticing some code in mm/filemap.c accidentally perform a __GFP_FS\nallocation when it should not have been, I thought it might be a good idea to\ntry to catch this kind of thing with lockdep.\n\nI coded up a little idea that seems to work. Unfortunately the system has to\nactually be in __GFP_FS page reclaim, then take the lock, before it will mark\nit. But at least that might still be some orders of magnitude more common\n(and more debuggable) than an actual deadlock condition, so we have some\nimprovement I hope (the concept is no less complete than discovery of a lock\u0027s\ninterrupt contexts).\n\nI guess we could even do the same thing with __GFP_IO (normal reclaim), and\neven GFP_NOIO locks too... but filesystems will have the most locks and fiddly\ncode paths, so let\u0027s start there and see how it goes.\n\nIt *seems* to work. I did a quick test.\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ INFO: inconsistent lock state ]\n2.6.28-rc6-00007-ged31348-dirty #26\n---------------------------------\ninconsistent {in-reclaim-W} -\u003e {ov-reclaim-W} usage.\nmodprobe/8526 [HC0[0]:SC0[0]:HE1:SE1] takes:\n (testlock){--..}, at: [\u003cffffffffa0020055\u003e] brd_init+0x55/0x216 [brd]\n{in-reclaim-W} state was registered at:\n [\u003cffffffff80267bdb\u003e] __lock_acquire+0x75b/0x1a60\n [\u003cffffffff80268f71\u003e] lock_acquire+0x91/0xc0\n [\u003cffffffff8070f0e1\u003e] mutex_lock_nested+0xb1/0x310\n [\u003cffffffffa002002b\u003e] brd_init+0x2b/0x216 [brd]\n [\u003cffffffff8020903b\u003e] _stext+0x3b/0x170\n [\u003cffffffff80272ebf\u003e] sys_init_module+0xaf/0x1e0\n [\u003cffffffff8020c3fb\u003e] system_call_fastpath+0x16/0x1b\n [\u003cffffffffffffffff\u003e] 0xffffffffffffffff\nirq event stamp: 3929\nhardirqs last enabled at (3929): [\u003cffffffff8070f2b5\u003e] mutex_lock_nested+0x285/0x310\nhardirqs last disabled at (3928): [\u003cffffffff8070f089\u003e] mutex_lock_nested+0x59/0x310\nsoftirqs last enabled at (3732): [\u003cffffffff8061f623\u003e] sk_filter+0x83/0xe0\nsoftirqs last disabled at (3730): [\u003cffffffff8061f5b6\u003e] sk_filter+0x16/0xe0\n\nother info that might help us debug this:\n1 lock held by modprobe/8526:\n #0: (testlock){--..}, at: [\u003cffffffffa0020055\u003e] brd_init+0x55/0x216 [brd]\n\nstack backtrace:\nPid: 8526, comm: modprobe Not tainted 2.6.28-rc6-00007-ged31348-dirty #26\nCall Trace:\n [\u003cffffffff80265483\u003e] print_usage_bug+0x193/0x1d0\n [\u003cffffffff80266530\u003e] mark_lock+0xaf0/0xca0\n [\u003cffffffff80266735\u003e] mark_held_locks+0x55/0xc0\n [\u003cffffffffa0020000\u003e] ? brd_init+0x0/0x216 [brd]\n [\u003cffffffff802667ca\u003e] trace_reclaim_fs+0x2a/0x60\n [\u003cffffffff80285005\u003e] __alloc_pages_internal+0x475/0x580\n [\u003cffffffff8070f29e\u003e] ? mutex_lock_nested+0x26e/0x310\n [\u003cffffffffa0020000\u003e] ? brd_init+0x0/0x216 [brd]\n [\u003cffffffffa002006a\u003e] brd_init+0x6a/0x216 [brd]\n [\u003cffffffffa0020000\u003e] ? brd_init+0x0/0x216 [brd]\n [\u003cffffffff8020903b\u003e] _stext+0x3b/0x170\n [\u003cffffffff8070f8b9\u003e] ? mutex_unlock+0x9/0x10\n [\u003cffffffff8070f83d\u003e] ? __mutex_unlock_slowpath+0x10d/0x180\n [\u003cffffffff802669ec\u003e] ? trace_hardirqs_on_caller+0x12c/0x190\n [\u003cffffffff80272ebf\u003e] sys_init_module+0xaf/0x1e0\n [\u003cffffffff8020c3fb\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1c511f740fe7031867f51831854360e8be1ba34c", "tree": "bd678fbc8117f751a3d1f8dc93b91c215ceaf66f", "parents": [ "e7669b8e329255bbcb40af65b38e342825d97a46", "00f62f614bb713027b9296068d1879fbca511eb7", "b22f4858126a6aa852ad745b94f6b25dbdea708e", "071a0bc2ceace31266836801510879407a3701fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 10:25:18 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 10:25:18 2009 +0100" }, "message": "Merge branches \u0027tracing/ftrace\u0027, \u0027tracing/ring-buffer\u0027, \u0027tracing/sysprof\u0027, \u0027tracing/urgent\u0027 and \u0027linus\u0027 into tracing/core\n" }, { "commit": "f8a6b2b9cee298a9663cbe38ce1eb5240987cb62", "tree": "b356490269c9e77d164dcc1477792b882fbb8bdb", "parents": [ "ba1511bf7fbda452138e4096bf10d5a382710f4f", "071a0bc2ceace31266836801510879407a3701fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:44:22 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:44:22 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into x86/apic\n\nConflicts:\n\tarch/x86/kernel/acpi/boot.c\n\tarch/x86/mm/fault.c\n" }, { "commit": "e9c4ffb11f0b19005b5b9dc8481687a3637e5887", "tree": "7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63", "parents": [ "4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6", "071a0bc2ceace31266836801510879407a3701fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:34:07 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:34:07 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/acpi/boot.c\n" }, { "commit": "871cafcc962fa1655c44b4f0e54d4c5cc14e273c", "tree": "fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245", "parents": [ "cf2592f59c0e8ed4308adbdb2e0a88655379d579", "b578f3fcca1e78624dfb5f358776e63711d7fda2" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 12 13:08:57 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 12 13:08:57 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/softlockup\n" }, { "commit": "f9ce1f1cda8b73a36f47e424975a9dfa78b7840c", "tree": "66138b33dbf627f99f5ec67e0e39ce15ab830080", "parents": [ "523979adfa0b79d4e3aa053220c37a9233294206" ], "author": { "name": "Kentaro Takeda", "email": "takedakn@nttdata.co.jp", "time": "Thu Feb 05 17:18:11 2009 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Feb 12 15:15:03 2009 +1100" }, "message": "Add in_execve flag into task_struct.\n\nThis patch allows LSM modules to determine whether current process is in an\nexecve operation or not so that they can behave differently while an execve\noperation is in progress.\n\nThis patch is needed by TOMOYO. Please see another patch titled \"LSM adapter\nfunctions.\" for backgrounds.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "4da94d49b2ecb0a26e716a8811c3ecc542c2a65d", "tree": "a87980822b2499021f080c2b0235f441b30413cc", "parents": [ "3fccfd67df79c6351a156eb25a7a514e5f39c4d9" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Feb 11 11:30:27 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 14:04:21 2009 +0100" }, "message": "timers: fix TIMER_ABSTIME for process wide cpu timers\n\nThe POSIX timer interface allows for absolute time expiry values through the\nTIMER_ABSTIME flag, therefore we have to synchronize the timer to the clock\nevery time we start it.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3fccfd67df79c6351a156eb25a7a514e5f39c4d9", "tree": "de4776e69e197119ac64097f3ff6239a55ad77be", "parents": [ "ff08f76d738d0ec0f334b187f61e160caa321d54" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Feb 10 16:37:31 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 14:04:19 2009 +0100" }, "message": "timers: split process wide cpu clocks/timers, fix\n\nTo decrease the chance of a missed enable, always enable the timer when we\nsample it, we\u0027ll always disable it when we find that there are no active timers\nin the jiffy tick.\n\nThis fixes a flood of warnings reported by Mike Galbraith.\n\nReported-by: Mike Galbraith \u003cefault@gmx.de\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c", "tree": "aa2aac22a5b329b778a6771a87bbf1945ad49bbd", "parents": [ "d278c48435625cb6b7edcf6a547620768b175709", "8e4921515c1a379539607eb443d51c30f4f7f338" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 09:22:04 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 09:22:04 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc4\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/setup_percpu.c\n\tarch/x86/mm/fault.c\n\tdrivers/acpi/processor_idle.c\n\tkernel/irq/handle.c\n" }, { "commit": "23a185ca8abbeef64b6ffc33059b1d630e43ec10", "tree": "c5eb9454ff969377adb40532119240f6fc893fcb", "parents": [ "82aa9a1829199233f9bdaf26e2ee271114f4701e" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Mon Feb 09 22:42:47 2009 +1100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Feb 09 12:47:16 2009 +0100" }, "message": "perf_counters: make software counters work as per-cpu counters\n\nImpact: kernel crash fix\n\nYanmin Zhang reported that using a PERF_COUNT_TASK_CLOCK software\ncounter as a per-cpu counter would reliably crash the system, because\nit calls __task_delta_exec with a null pointer. The page fault,\ncontext switch and cpu migration counters also won\u0027t function\ncorrectly as per-cpu counters since they reference the current task.\n\nThis fixes the problem by redirecting the task_clock counter to the\ncpu_clock counter when used as a per-cpu counter, and by implementing\nper-cpu page fault, context switch and cpu migration counters.\n\nAlong the way, this:\n\n- Initializes counter-\u003ectx earlier, in perf_counter_alloc, so that\n sw_perf_counter_init can use it\n- Adds code to kernel/sched.c to count task migrations into each\n cpu, in rq-\u003enr_migrations_in\n- Exports the per-cpu context switch and task migration counts\n via new functions added to kernel/sched.c\n- Makes sure that if sw_perf_counter_init fails, we don\u0027t try to\n initialize the counter as a hardware counter. Since the user has\n passed a negative, non-raw event type, they clearly don\u0027t intend\n for it to be interpreted as a hardware event.\n\nReported-by: \"Zhang Yanmin\" \u003cyanmin_zhang@linux.intel.com\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "17406b82d621930cca8ccc1272cdac9a7dae8e40", "tree": "224c8b0b7c78a5467175fe10e116bdc6b73495ea", "parents": [ "94be52dc075a32af4aa73d7e10f68734d62d6af2" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@google.com", "time": "Fri Feb 06 15:37:47 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Feb 09 11:03:49 2009 +0100" }, "message": "softlockup: remove timestamp checking from hung_task\n\nImpact: saves sizeof(long) bytes per task_struct\n\nBy guaranteeing that sysctl_hung_task_timeout_secs have elapsed between\ntasklist scans we can avoid using timestamps.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4ad476e11f94fd3724c6e272d8220e99cd222b27", "tree": "a8684d4ecbfe1d2b2b1e29ed74de65394ad21b43", "parents": [ "304cc6ae1bf7a8e6d00053fbe0b7e2b26cdddda2", "8e4921515c1a379539607eb443d51c30f4f7f338" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Feb 09 10:32:48 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Feb 09 10:32:48 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc4\u0027 into tracing/core\n" }, { "commit": "140573d33b703194b7e1893711e78b7f546cca7c", "tree": "8e215102e7c5222013df84ceed8b961728d2db91", "parents": [ "34cb61359b503d7aff6447acb037a5efd6ce93b2", "ceacc2c1c85ac498ca4cf297bdfe5b4aaa9fd0e0", "483b4ee60edbefdfbff0dd538fb81f368d9e7c0d" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Feb 08 20:12:46 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Feb 08 20:12:46 2009 +0100" }, "message": "Merge branches \u0027sched/rt\u0027 and \u0027sched/urgent\u0027 into sched/core\n" }, { "commit": "673f8205914a12e928c65afbcd78ae748f78df53", "tree": "38c60215646d079fab3bff812e094e914960c7ec", "parents": [ "cf47b8f3d96b0b8b10b557444a28b3ca4024ff82", "ae1a25da8448271a99745da03100d5299575a269" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Feb 07 18:31:54 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Feb 07 18:31:54 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/locking\n\nConflicts:\n\tfs/btrfs/locking.c\n" }, { "commit": "7d8e23df69820e6be42bcc41d441f4860e8c76f7", "tree": "a39d2c85a0ba741c3fd497b9cd98136fcc4633b3", "parents": [ "4cd4c1b40d40447fb5e7ba80746c6d7ba91d7a53" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 06 14:57:51 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 06 14:57:51 2009 +0100" }, "message": "timers: split process wide cpu clocks/timers, remove spurious warning\n\nMike Galbraith reported that the new warning in thread_group_cputimer()\ntriggers en masse with Amarok running.\n\nOleg Nesterov observed:\n\n Can\u0027t fastpath_timer_check()-\u003ethread_group_cputimer() have the\n false warning too? Suppose we had the timer, then posix_cpu_timer_del()\n removes this timer, but task_cputime_zero(\u0026sig-\u003ecputime_expires) still\n not true.\n\nRemove the spurious debug warning.\n\nReported-by: Mike Galbraith \u003cefault@gmx.de\u003e\nExplained-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9d45cf9e36bf9bcf16df6e1cbf049807c8402823", "tree": "2118a16701418af10d215d2174df7ee0a5cbe6bd", "parents": [ "a146649bc19d5eba4f5bfac6720c5f252d517a71", "0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jan 31 17:32:31 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 05 22:30:01 2009 +0100" }, "message": "Merge branch \u0027x86/urgent\u0027 into x86/apic\n\nConflicts:\n\tarch/x86/mach-default/setup.c\n\nSemantic merge:\n\tarch/x86/kernel/irqinit_32.c\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4cd4c1b40d40447fb5e7ba80746c6d7ba91d7a53", "tree": "b1e580d5284648d6884e951d995509094a92cca4", "parents": [ "32bd671d6cbeda60dc73be77fa2b9037d9a9bfa0" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Feb 05 12:24:16 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 05 13:04:33 2009 +0100" }, "message": "timers: split process wide cpu clocks/timers\n\nChange the process wide cpu timers/clocks so that we:\n\n 1) don\u0027t mess up the kernel with too many threads,\n 2) don\u0027t have a per-cpu allocation for each process,\n 3) have no impact when not used.\n\nIn order to accomplish this we\u0027re going to split it into two parts:\n\n - clocks; which can take all the time they want since they run\n from user context -- ie. sys_clock_gettime(CLOCK_PROCESS_CPUTIME_ID)\n\n - timers; which need constant time sampling but since they\u0027re\n explicity used, the user can pay the overhead.\n\nThe clock readout will go back to a full sum of the thread group, while the\ntimers will run of a global \u0027clock\u0027 that only runs when needed, so only\nprograms that make use of the facility pay the price.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "32bd671d6cbeda60dc73be77fa2b9037d9a9bfa0", "tree": "591c941b9f12ce9f3caefd112f0ada3c5fcc53ab", "parents": [ "83895147b702434e6f236deeca75211fd0e3da3a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Feb 05 12:24:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 05 13:04:33 2009 +0100" }, "message": "signal: re-add dead task accumulation stats.\n\nWe\u0027re going to split the process wide cpu accounting into two parts:\n\n - clocks; which can take all the time they want since they run\n from user context.\n\n - timers; which need constant time tracing but can affort the overhead\n because they\u0027re default off -- and rare.\n\nThe clock readout will go back to a full sum of the thread group, for this\nwe need to re-add the exit stats that were removed in the initial itimer\nrework (f06febc9: timers: fix itimer/many thread hang).\n\nFurthermore, since that full sum can be rather slow for large thread groups\nand we have the complete dead task stats, revert the do_notify_parent time\ncomputation.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "35626129abcd6a7547e84c817ef5b6eff7a8758b", "tree": "f11a12218b023183355c1dab79bb21403bbb6713", "parents": [ "b1792e367053968f2ddb48bc911d314143ce6242" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Feb 02 16:00:29 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 03 06:32:10 2009 +0100" }, "message": "sched: add missing kernel-doc in sched.h\n\nAdd kernel-doc notation for @lock:\n\ninclude/linux/sched.h:457: No description found for parameter \u0027lock\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "dc573f9b20c8710105ac35c08ed0fe1da5160ecd", "tree": "24db0a0f6364b78f9c74e62541d26155e785b8f9", "parents": [ "b3a8c34886d0e3dd3a24a5b614ee025181da2f41", "ecf441b593ac41cb8cd8cd3695110167c42e098c", "b1792e367053968f2ddb48bc911d314143ce6242" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 03 06:25:38 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 03 06:25:38 2009 +0100" }, "message": "Merge branches \u0027tracing/ftrace\u0027, \u0027tracing/kmemtrace\u0027 and \u0027linus\u0027 into tracing/core\n" }, { "commit": "5e54f5986a579b8445aa1d5ad3435c2cf7568bed", "tree": "816f65fa49e4f4c127314dd5022bc3d3bbb8f716", "parents": [ "603a148f434742fff08273207ffa44176cad13a1" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@google.com", "time": "Fri Jan 30 15:29:54 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jan 31 20:12:28 2009 +0100" }, "message": "softlockup: remove unused definition for spawn_softlockup_task\n\nThe definition of spawn_softlockup_task in sched.h became\nunnecessary once it was converted to the early_initcall()\ninterface.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9df04e1f25effde823a600e755b51475d438f56b", "tree": "57a207adf5e4bfb010000724dc1482e421933be4", "parents": [ "3095eb87bb36ae880608fe3fc46cfd59ced1f319" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Thu Jan 29 14:25:26 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 29 18:04:45 2009 -0800" }, "message": "epoll: drop max_user_instances and rely only on max_user_watches\n\nLinus suggested to put limits where the money is, and max_user_watches\nalready does that w/out the need of max_user_instances. That has the\nadvantage to mitigate the potential DoS while allowing pretty generous\ndefault behavior.\n\nAllowing top 4% of low memory (per user) to be allocated in epoll watches,\nwe have:\n\nLOMEM MAX_WATCHES (per user)\n512MB ~178000\n1GB ~356000\n2GB ~712000\n\nA box with 512MB of lomem, will meet some challenge in hitting 180K\nwatches, socket buffers math teaches us. No more max_user_instances\nlimits then.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Willy Tarreau \u003cw@1wt.eu\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@googlemail.com\u003e\nCc: Bron Gondwana \u003cbrong@fastmail.fm\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": "3ddeb51d9c83931c1ca6abf76a38934c5a1ed918", "tree": "fc2efb59d627135ea2199a8a68415b162646b121", "parents": [ "5a611268b69f05262936dd177205acbce4471358", "5ee810072175042775e39bdd3eaaa68884c27805" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 27 12:01:51 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 27 12:01:51 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/percpu\n\nConflicts:\n\tarch/x86/kernel/setup_percpu.c\n" }, { "commit": "3386c05bdbd3e60ca7158253442f0a00133db28e", "tree": "19e48f0352e65eb83a0e922fb75528ed39f44ebd", "parents": [ "1e70c7f7a9d4a3d2cc78b40e1d7768d99cd79899", "6552ebae25ffd57574c6e72d17fce67fea08b918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 26 09:47:56 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 26 09:47:56 2009 -0800" }, "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 debugobjects: add and use INIT_WORK_ON_STACK\n rcu: remove duplicate CONFIG_RCU_CPU_STALL_DETECTOR\n relay: fix lock imbalance in relay_late_setup_files\n oprofile: fix uninitialized use of struct op_entry\n rcu: move Kconfig menu\n softlock: fix false panic which can occur if softlockup_thresh is reduced\n rcu: add __cpuinit to rcu_init_percpu_data()\n" }, { "commit": "7e49fcce1bdadd723ae6a0b3b324c4daced61563", "tree": "a2bf1a143ed33ca01612dfab1fb7c993c467cdb0", "parents": [ "b06a830183b610c0a88c29a92feb7991a867ab46" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Thu Jan 22 19:01:40 2009 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 23 11:10:57 2009 +0100" }, "message": "trace, lockdep: manual preempt count adding for local_bh_disable\n\nImpact: fix to preempt trace triggering lockdep check_flag failure\n\nIn local_bh_disable, the use of add_preempt_count causes the\npreempt tracer to start recording the time preemption is off.\nBut because it already modified the preempt_count to show\nsoftirqs disabled, and before it called the lockdep code to\nhandle this, it causes a state that lockdep can not handle.\n\nThe preempt tracer will reset the ring buffer on start of a trace,\nand the ring buffer reset code does a spin_lock_irqsave. This\ncalls into lockdep and lockdep will fail when it detects the\ninvalid state of having softirqs disabled but the internal\ncurrent-\u003esoftirqs_enabled is still set.\n\nThe fix is to manually add the SOFTIRQ_OFFSET to preempt count\nand call the preempt tracer code outside the lockdep critical\narea.\n\nThanks to Peter Zijlstra for suggesting this solution.\n\nSigned-off-by: Steven Rostedt \u003csrostedt@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "bfe2a3c3b5bf479788d5d5c5561346be6b169043", "tree": "652c987279db7cd841d556f7bb1a589b57fbd6cc", "parents": [ "77835492ed489c0b870f82f4c50687bd267acc0a", "35d266a24796f02f63299cfe5009dfc0d5a0e820" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 23 10:20:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 23 10:20:15 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/include/asm/hardirq_32.h\n\tarch/x86/include/asm/hardirq_64.h\n\nSemantic merge:\n\tarch/x86/include/asm/hardirq.h\n\t[ added apic_perf_irqs field. ]\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" } ], "next": "b2b062b8163391c42b3219d466ca1ac9742b9c7b" }