)]}' { "log": [ { "commit": "b11287e8c5b2797b86351f6db0fcd9ff99b20bab", "tree": "560985ca36806d4463f71db4eb4ac4dd538a3cca", "parents": [ "c8837434e8bfd08abf3b596dbaeffe4a8b59a284" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 22:03:59 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 22:07:36 2010 -0700" }, "message": "sparc64: Fix perf_arch_get_caller_regs().\n\nAfter b0f82b81fe6bbcf78d478071f33e44554726bc81 (\"perf: Drop the skip\nargument from perf_arch_fetch_regs_caller\") the build broke on sparc64\ndue to the lack of a module symbol export of __perf_arch_fetch_caller_regs.\n\nBut that assembler helper can actually be complete eliminated now that\nthe semantics of this interface have been greatly simplified.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4aed2fd8e3181fea7c09ba79cf64e7e3f4413bf9", "tree": "1f69733e5daab4915a76a41de0e4d1dc61e12cfb", "parents": [ "3a3527b6461b1298cc53ce72f336346739297ac8", "fc9ea5a1e53ee54f681e226d735008e2a6f8f470" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)\n tracing/kprobes: unregister_trace_probe needs to be called under mutex\n perf: expose event__process function\n perf events: Fix mmap offset determination\n perf, powerpc: fsl_emb: Restore setting perf_sample_data.period\n perf, powerpc: Convert the FSL driver to use local64_t\n perf tools: Don\u0027t keep unreferenced maps when unmaps are detected\n perf session: Invalidate last_match when removing threads from rb_tree\n perf session: Free the ref_reloc_sym memory at the right place\n x86,mmiotrace: Add support for tracing STOS instruction\n perf, sched migration: Librarize task states and event headers helpers\n perf, sched migration: Librarize the GUI class\n perf, sched migration: Make the GUI class client agnostic\n perf, sched migration: Make it vertically scrollable\n perf, sched migration: Parameterize cpu height and spacing\n perf, sched migration: Fix key bindings\n perf, sched migration: Ignore unhandled task states\n perf, sched migration: Handle ignored migrate out events\n perf: New migration tool overview\n tracing: Drop cpparg() macro\n perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call\n ...\n\nFix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c\n" }, { "commit": "c608558407aa64d2b98d58bfc116e95c0afb357e", "tree": "1dba985555b1fff5ce587c6368f47383ba00ebd4", "parents": [ "de48e369e8ea3a773cb2f959b76fcfad9966f4a0" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jul 23 19:19:35 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:58:22 2010 -0600" }, "message": "of: make of_find_device_by_node generic\n\nThere\u0027s no need for this function to be architecture specific and all four\narchitectures defining it had the same definition. The function has been\nmoved to drivers/of/platform.c.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\n[grant.likely@secretlab.ca: moved to drivers/of/platform.c, simplified code, and added kerneldoc comment]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cd4cd7306a403f62ef3ca783b9d1cf2a03e595ed", "tree": "2eceb6990f5a0097f158c91316ee93fc2db5282d", "parents": [ "a454dc50590c6d758abba016a303a221f2f1b4b8" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jul 22 16:04:30 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:58:22 2010 -0600" }, "message": "sparc: remove references to of_device and to_of_device\n\nof_device is just a #define alias to platform_device. This patch\nreplaces all references to it with platform_device.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ab1d63a85cee2545272f63a7644e9f855cb65d0", "tree": "089afe8c03370cdfaf3eeb30d09e1bcac8a67898", "parents": [ "eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 24 15:14:37 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:52 2010 -0600" }, "message": "of/platform: remove all of_bus_type and of_platform_bus_type references\n\nBoth of_bus_type and of_platform_bus_type are just #define aliases\nfor the platform bus. This patch removes all references to them and\nswitches to the of_register_platform_driver()/of_unregister_platform_driver()\nAPI for registering.\n\nSubsequent patches will convert each user of of_register_platform_driver()\ninto plain platform_drivers without the of_platform_driver shim. At which\npoint the of_register_platform_driver()/of_unregister_platform_driver()\nfunctions can be removed.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f", "tree": "5774d6d53b5f7d8f069e82b3937cdff7b3d45bbe", "parents": [ "05212157e94ccf4cf458413bbba509cfa95ff92b" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 08 07:48:21 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:51 2010 -0600" }, "message": "of: Merge of_platform_bus_type with platform_bus_type\n\nof_platform_bus was being used in the same manner as the platform_bus.\nThe only difference being that of_platform_bus devices are generated\nfrom data in the device tree, and platform_bus devices are usually\nstatically allocated in platform code. Having them separate causes\nthe problem of device drivers having to be registered twice if it\nwas possible for the same device to appear on either bus.\n\nThis patch removes of_platform_bus_type and registers all of_platform\nbus devices and drivers on the platform bus instead. A previous patch\nmade the of_device structure an alias for the platform_device structure,\nand a shim is used to adapt of_platform_drivers to the platform bus.\n\nAfter all of of_platform_bus drivers are converted to be normal platform\ndrivers, the shim code can be removed.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e4f62bf7396fca48efe61513640ee399a6046e3", "tree": "42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2", "parents": [ "9e3288dc9a94fab5ea87db42177d3a9e0345a614", "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "message": "Merge commit \u0027v2.6.35-rc6\u0027 into devicetree/next\n\nConflicts:\n\tarch/sparc/kernel/prom_64.c\n" }, { "commit": "9dcdbf7a33d9018ac5d45debcf261be648bdd56a", "tree": "bbcc1a018f11ff76cd7ce174ef3ffe2c02da07ee", "parents": [ "cc5edb0eb9ce892b530e34a5d110382483587942", "cd5b8f8755a89a57fc8c408d284b8b613f090345" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:43:03 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:43:06 2010 +0200" }, "message": "Merge branch \u0027linus\u0027 into perf/core\n\nMerge reason: Pick up the latest perf fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "95977d0ef23ee37990ce8704dfd6c61eab02a548", "tree": "d3bb7133f8f51f8e48c0c74ee28c14deb45fedbe", "parents": [ "a4ce96ac356e7024a7724ade9d18ba1bdf3c5c06", "f8324e20f8289dffc646d64366332e05eaacab25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n math-emu: correct test for downshifting fraction in _FP_FROM_INT()\n perf: Add DWARF register lookup for sparc\n MAINTAINERS: Add SBUS driver path to sparc entry.\n drivers/sbus: Remove unnecessary casts of private_data\n sparc: remove homegrown L1_CACHE_ALIGN macro\n sparc64: fix the build error due to smp_kgdb_capture_client()\n sparc64: Fix maybe_change_configuration() PCR setting.\n arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference\n sparc64: Update defconfig.\n sunsu: Fix use after free in su_remove().\n sunserial: Don\u0027t call add_preferred_console() when console\u003d is specified.\n sparc32: Kill none_mask, it\u0027s bogus.\n" }, { "commit": "035ebefc737cce56d3938e9b7eaa5ac0e9c28715", "tree": "37593760f4411ec3d3db9b46e2b9a21255624549", "parents": [ "ef2a4524d6e776bbce819eeccbdcaeee5ce74027" ], "author": { "name": "Andres Salomon", "email": "dilinger@queued.net", "time": "Tue Jul 13 09:42:26 2010 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jul 14 17:08:03 2010 -0600" }, "message": "of/sparc: move is_root_node() to of.h\n\nRename is_root_node() to of_node_is_root() and make it available for\nall archs to use, as it\u0027s not PROM-specific.\n\nSigned-off-by: Andres Salomon \u003cdilinger@queued.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "95f72d1ed41a66f1c1c29c24d479de81a0bea36f", "tree": "bd92b3804ff0bea083d69af0ede52f99ab34c0af", "parents": [ "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Jul 12 14:36:09 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 14 17:14:00 2010 +1000" }, "message": "lmb: rename to memblock\n\nvia following scripts\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/lmb/memblock/g\u0027 \\\n -e \u0027s/LMB/MEMBLOCK/g\u0027 \\\n $FILES\n\n for N in $(find . -name lmb.[ch]); do\n M\u003d$(echo $N | sed \u0027s/lmb/memblock/g\u0027)\n mv $N $M\n done\n\nand remove some wrong change like lmbench and dlmb etc.\n\nalso move memblock.c from lib/ to mm/\n\nSuggested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "1636f8ac2b08410df4766449f7c86b912443cd99", "tree": "9c923c017e956779f237d4ffa51d49beb3de6d3e", "parents": [ "2b07be2493681220cac4d185494a4edb0b8efd1e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jun 18 11:09:58 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jun 28 12:41:33 2010 -0700" }, "message": "sparc/of: Move of_device fields into struct pdev_archdata\n\nThis patch moves SPARC architecture specific data members out of\nstruct of_device and into the pdev_archdata structure. The reason\nfor this change is to unify the struct of_device definition amongst\nall the architectures. It also remvoes the .sysdata, .slot, .portid\nand .clock_freq properties because they aren\u0027t actually used by\nanything.\n\nA subsequent patch will replace struct of_device entirely with struct\nplatform_device and the of_platform support code will share common\nroutines with the platform bus (but the bus instances themselves can\nremain separate).\n\nThis patch also adds \u0027struct resources *resource\u0027 and num_resources\nto match the fields defined in struct platform_device. After this\nchange, \u0027struct platform_device\u0027 can be used as a drop-in replacement\nfor \u0027struct of_platform\u0027.\n\nThis change is in preparation for merging the of_platform_bus_type\nwith the platform_bus_type.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\n" }, { "commit": "c67dda14389205f0a223c5089307495290939b3b", "tree": "fad0bb26b28703d02a22ebdd44d94eabac4a2ade", "parents": [ "43bc2db47292a824152145253b1dd2847e7312a3", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 10:27:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 10:27:00 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "43bc2db47292a824152145253b1dd2847e7312a3", "tree": "435b438e3cc06258211b52e56e03aaf02eec04e8", "parents": [ "b7d45c3f741b114cdda9ee0cd727afaf60a1bf37" ], "author": { "name": "Dongdong Deng", "email": "dongdong.deng@windriver.com", "time": "Fri Jun 25 11:17:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 11:17:57 2010 -0700" }, "message": "sparc64: fix the build error due to smp_kgdb_capture_client()\n\nSigned-off-by: Dongdong Deng \u003cdongdong.deng@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7d45c3f741b114cdda9ee0cd727afaf60a1bf37", "tree": "2712b7f5ddab5af1fbc67555d880216baefe7227", "parents": [ "0d0659c78d7ea29ad6c3c538dcaae0227f31b9d2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:39:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:39:02 2010 -0700" }, "message": "sparc64: Fix maybe_change_configuration() PCR setting.\n\nNeed to mask out the existing event bits before OR\u0027ing in\nthe new ones.\n\nNoticed by Peter Zijlstra.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8", "tree": "3f44aa013d31d34951e9610e79ff14c1148ad6ac", "parents": [ "7be7923633a142402266d642ccebf74f556a649b", "018378c55b03f88ff513aba4e0e93b8d4a9cf241" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 18:55:20 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 18:55:57 2010 +0200" }, "message": "Merge branch \u0027perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core\n" }, { "commit": "e78505958cf123048fb48cb56b79cebb8edd15fb", "tree": "3688d124cdc906cbe9f6587c8671ba0a14c95262", "parents": [ "a6e6dea68c18f705957573ee5596097c7e82d0e5" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 21 14:43:08 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 11:12:37 2010 +0200" }, "message": "perf: Convert perf_event to local_t\n\nSince now all modification to event-\u003ecount (and -\u003eprev_count\nand -\u003eperiod_left) are local to a cpu, change then to local64_t so we\navoid the LOCK\u0027ed ops.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8d2cacbbb8deadfae78aa16e4e1ee619bdd7019e", "tree": "79fcb319d1c99e348b0a04056e016c85c3666b35", "parents": [ "3af9e859281bda7eb7c20b51879cf43aa788ac2e" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue May 25 17:49:05 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 11:12:34 2010 +0200" }, "message": "perf: Cleanup {start,commit,cancel}_txn details\n\nClarify some of the transactional group scheduling API details\nand change it so that a successfull -\u003ecommit_txn also closes\nthe transaction.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nLKML-Reference: \u003c1274803086.5882.1752.camel@twins\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b0f82b81fe6bbcf78d478071f33e44554726bc81", "tree": "6305c095b927f956a791b9dce687cb94a21718e6", "parents": [ "c9cf4dbb4d9ca715d8fedf13301a53296429abc6" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu May 20 07:47:21 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Jun 08 23:31:27 2010 +0200" }, "message": "perf: Drop the skip argument from perf_arch_fetch_regs_caller\n\nDrop this argument now that we always want to rewind only to the\nstate of the first caller.\nIt means frame pointers are not necessary anymore to reliably get\nthe source of an event. But this also means we need this helper\nto be a macro now, as an inline function is not an option since\nwe need to know when to provide a default implentation.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "0d0659c78d7ea29ad6c3c538dcaae0227f31b9d2", "tree": "4383a16168096e94919c980a2cbcd7a5e81c6492", "parents": [ "0fc251d9a6c9fb841b73f29dd73dcf91afe7883f" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Jun 04 16:17:37 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 16:17:37 2010 -0700" }, "message": "arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference\n\nAt the point of the test, action cannot be NULL, as it has been dereferenced\nin the code just above.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression E,E1;\nidentifier f;\nstatement S1,S2,S3;\n@@\n\nif ((E \u003d\u003d NULL \u0026\u0026 ...) || ...)\n{\n ... when !\u003d if (...) S1 else S2\n when !\u003d E \u003d E1\n* E-\u003ef\n ... when any\n}\nelse S3\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9", "tree": "40d5e99660c77c5791392d349a93113c044dbf14", "parents": [ "cad719d86e9dbd06634eaba6401e022c8101d6b2", "49c177461bfbedeccbab22bf3905db2f9da7f1c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 15:23:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 15:23:47 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (61 commits)\n tracing: Add __used annotation to event variable\n perf, trace: Fix !x86 build bug\n perf report: Support multiple events on the TUI\n perf annotate: Fix up usage of the build id cache\n x86/mmiotrace: Remove redundant instruction prefix checks\n perf annotate: Add TUI interface\n perf tui: Remove annotate from popup menu after failure\n perf report: Don\u0027t start the TUI if -D is used\n perf: Fix getline undeclared\n perf: Optimize perf_tp_event_match()\n perf: Remove more code from the fastpath\n perf: Optimize the !vmalloc backed buffer\n perf: Optimize perf_output_copy()\n perf: Fix wakeup storm for RO mmap()s\n perf-record: Share per-cpu buffers\n perf-record: Remove -M\n perf: Ensure that IOC_OUTPUT isn\u0027t used to create multi-writer buffers\n perf, trace: Optimize tracepoints by using per-tracepoint-per-cpu hlist to track events\n perf, trace: Optimize tracepoints by removing IRQ-disable from perf/tracepoint interaction\n perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig\n ...\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "c75fbb05b523571c0fdc48d4b968b73f0e20acbb", "tree": "14f6d3846bbfe434b9d9ff2adf3ee9b51b9131a0", "parents": [ "4063eb5fa4ef514077f84f47a7759ab255eddda5" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu May 20 21:04:19 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu May 20 21:04:19 2010 -0500" }, "message": "kgdb,sparc: Add in kgdb_arch_set_pc for sparc\n\nThe new debug core api requires all architectures that use to debug\ncore to implement a function to set the program counter.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d02093e29de9efc4a72d5e93baae9506969b789", "tree": "a6fc2450132ae419934f6eb9d223baa338b7d782", "parents": [ "6e0b7b2c39b91b467270dd0bc383914f99e1fb28", "e9ddbc075d95b2edf111247cdde16f33c31654a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "message": "Merge branch \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n avr32: Fix typo in read_persistent_clock()\n sparc: Convert sparc to use read/update_persistent_clock\n cris: Convert cris to use read/update_persistent_clock\n m68k: Convert m68k to use read/update_persistent_clock\n m32r: Convert m32r to use read/update_peristent_clock\n blackfin: Convert blackfin to use read/update_persistent_clock\n ia64: Convert ia64 to use read/update_persistent_clock\n avr32: Convert avr32 to use read/update_persistent_clock\n h8300: Convert h8300 to use read/update_persistent_clock\n frv: Convert frv to use read/update_persistent_clock\n mn10300: Convert mn10300 to use read/update_persistent_clock\n alpha: Convert alpha to use read/update_persistent_clock\n xtensa: Fix unnecessary setting of xtime\n time: Clean up direct xtime usage in xen\n" }, { "commit": "58f9b0b02414062eaff46716bc04b47d7e79add5", "tree": "fa5265f4c37c2f4afb42a126f39cccc9602e06a2", "parents": [ "61c7a080a5a061c976988fd4b844dfb468dda255" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:56 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:45 2010 -0600" }, "message": "of: eliminate of_device-\u003enode and dev_archdata-\u003e{of,prom}_node\n\nThis patch eliminates the node pointer from struct of_device and the\nof_node (or prom_node) pointer from struct dev_archdata since the node\npointer is now part of struct device proper when CONFIG_OF is set, and\nall users of the old pointer locations have already been converted over\nto use device-\u003eof_node.\n\nAlso remove dev_archdata_{get,set}_node() as it is no longer used by\nanything.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a13c3afd9b62b6dace80654964cc4ca7d2db8092", "tree": "b1492c20445ef4eabf288b5e02a04a3136f4fd24", "parents": [ "6d1acfd5c6bfd5231c13a8f2858d7f2afbaa1b62" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Fri Apr 23 13:56:33 2010 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 18 18:59:12 2010 +0200" }, "message": "perf, sparc: Implement group scheduling transactional APIs\n\nConvert to the transactional PMU API and remove the duplication of\ngroup_sched_in().\n\n[cross build only]\n\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nAcked-by: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1272002193.5707.65.camel@minggr.sh.intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d706c1b050274b3bf97d7cb0542c0d070c9ccb8b", "tree": "9104c28f9028589cc4b95d8846dfc3288dcbf289", "parents": [ "efb2e014fc4f2675011b802e1a84bf9a58756004" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:28 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Apr 28 18:20:57 2010 -0600" }, "message": "driver-core: Add device node pointer to struct device\n\nCurrently, platforms using CONFIG_OF add a \u0027struct device_node *of_node\u0027\nto dev-\u003earchdata. However, with CONFIG_OF becoming generic for all\narchitectures, it makes sense for commonality to move it out of archdata\nand into struct device proper.\n\nThis patch adds a struct device_node *of_node member to struct device\nand updates all locations which currently write the device_node pointer\ninto archdata to also update dev-\u003eof_node. Subsequent patches will\nmodify callers to use the archdata location and ultimately remove\nthe archdata member entirely.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCC: Michal Simek \u003cmonstr@monstr.eu\u003e\nCC: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCC: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCC: Jeremy Kerr \u003cjeremy.kerr@canonical.com\u003e\nCC: microblaze-uclinux@itee.uq.edu.au\nCC: linux-kernel@vger.kernel.org\nCC: linuxppc-dev@ozlabs.org\nCC: sparclinux@vger.kernel.org\n" }, { "commit": "667f0cee3e0321151aa7a1a5222afe67ca4be0ea", "tree": "5f4a7a5c228a21e893f95774ca95f9925abf4b1f", "parents": [ "87e8f0e3e6d0b720a2462ebc5667eaa462752f74" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 03:08:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 03:08:11 2010 -0700" }, "message": "sparc64: Fix stack dumping and tracing when function graph is enabled.\n\nLike x86, when the function graph tracer is enabled, emit the ftrace\nstub as well as the program counter it will be transformed back into.\n\nWe duplicate a lot of similar stack walking logic in 3 or 4 spots, so\neventually we should consolidate things like x86 does.\n\nThanks to Frederic Weisbecker for pointing this out.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87e8f0e3e6d0b720a2462ebc5667eaa462752f74", "tree": "4acba282285d9a749ec7a6dd20ee4da297ba16ce", "parents": [ "28a1f533ae8606020238b840b82ae70a3f87609e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 02:31:50 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 02:31:50 2010 -0700" }, "message": "sparc64: Show stack backtrace from show_regs() just like other platforms.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28a1f533ae8606020238b840b82ae70a3f87609e", "tree": "aba93c055c8e2cd36b05846ed38173daba44ce53", "parents": [ "baa06775e224e9f74e5c2de894c95cd49678beff" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 00:48:37 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 00:48:37 2010 -0700" }, "message": "sparc64: Fix hardirq tracing in trap return path.\n\nWe can overflow the hardirq stack if we set the %pil here\nso early, just let the normal control flow do it.\n\nThis is fine as we are allowed to do the actual IRQ enable\nat any point after we call trace_hardirqs_on.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "baa06775e224e9f74e5c2de894c95cd49678beff", "tree": "75f06a56bcb8e82e0a820d33cceb20ec74a18d23", "parents": [ "6c94b1ee0ca2bfb526d779c088ec20da6a3761db" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 19 13:46:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 19 13:46:48 2010 -0700" }, "message": "sparc64: Use correct pt_regs in decode_access_size() error paths.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec687886de00e1e63f3d821ccade9a61590408ed", "tree": "093e303475754d30b679bd35ae9cc5522832057e", "parents": [ "035df35d968323f6f463c8789553e8589efcbcd4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 02:04:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 02:04:29 2010 -0700" }, "message": "sparc64: Run NMIs on the hardirq stack.\n\nOtherwise we can overflow the main stack with the function tracer\nenabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2e2dc1d755cc5609d0c46d47f7d171318b3bffcd", "tree": "a3f97a0cb466fc361a53f689c02fd27b3ad78308", "parents": [ "c011f80ba0912486fe51dd2b3f71d9b33a151188" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Apr 13 14:28:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 14:28:24 2010 -0700" }, "message": "sparc: Fix forgotten kmemleak headers inclusion\n\nFix forgotten kmemleak headers inclusion for kmemleak_not_leak()\ndeclaration.\n\nThis fixes the following build error:\n\n\tarch/sparc/kernel/irq_64.c: In function ‘sun4v_build_virq’:\n\tarch/sparc/kernel/irq_64.c:657: error: implicit declaration of function ‘kmemleak_not_leak’\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9343af084c7e8911897b0883042ee690cee3aaef", "tree": "6211a4bdc84690bec6530d27a3abb19f5e8bb8f3", "parents": [ "e182c77cc291456eed127b1472952ddb59a81a9d", "0d0fb0f9c5fddef4a10242fe3337f00f528a3099" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 00:28:45 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 00:28:45 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tlib/Kconfig.debug\n" }, { "commit": "e182c77cc291456eed127b1472952ddb59a81a9d", "tree": "317f39f6360f4f988ca09118fd2e3c23f5619964", "parents": [ "25ad403f67d7673f38a473ec138d240804785ae3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 10 20:26:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 23:46:18 2010 -0700" }, "message": "sparc64: Fix memory leak in pci_register_iommu_region().\n\nFound by kmemleak.\n\nIf request_resource() fails, we leak the struct resource we\nallocated to represent the IOMMU mapping area.\n\nThis actually happens on sun4v machines because the IOMEM area is only\nreported sans the IOMMU region, unlike all previous systems. I\u0027ll\nneed to fix that at some point, but for now fix the leak.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25ad403f67d7673f38a473ec138d240804785ae3", "tree": "8ec027a5cd22ad1a2a53e630bae74e356490d3e9", "parents": [ "8b8d8e2840a440d62e8dc0ef36ba433b26f70d32" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 10 20:24:22 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 23:46:17 2010 -0700" }, "message": "sparc64: Add kmemleak annotation to sun4v_build_virq()\n\nThe only reference we store to this memory is in the form of a\nphysical address, so kmemleak can\u0027t see it.\n\nAdd a kmemleak_not_leak() annotation.\n\nIt\u0027s probably useful to be able to look at a dump of these things\neither via debugfs or similar, and thus we could at some point store\nthem in some kind of table and therefore get rid of this annotation.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b8d8e2840a440d62e8dc0ef36ba433b26f70d32", "tree": "5f093522c03c3120b6d5bccb5c1a2697ef64a899", "parents": [ "9960e9e8944f9b1ca6af5f7d26400ca45b429600" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 09 00:14:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 23:46:17 2010 -0700" }, "message": "sparc64: Support kmemleak.\n\nOnly missing thing was an _sdata marker in vmlinux.lds.S\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9960e9e8944f9b1ca6af5f7d26400ca45b429600", "tree": "2483b4c55f54663a8cc358fae5837e7d8232c554", "parents": [ "a71d1d6bb1b26e566e5c06c37857f4cdc1664780" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 07 04:41:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 22:37:26 2010 -0700" }, "message": "sparc64: Add function graph tracer support.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "daecbf58a509bc27c112647e825df763c3e3b0f4", "tree": "871f5dd9e18ff2f4c4ff88a004527a5b0e974f51", "parents": [ "f8e8a8e8cba3359df2a16c17d59eedb08adf3b43" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 17:38:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 22:37:07 2010 -0700" }, "message": "sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86.\n\nThis keeps us from having to use kstat_irqs_cpu() from the NMI handler,\nthe former of which is a profiled function.\n\nInstead we use a currently empty slot in the cpu_data\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8e8a8e8cba3359df2a16c17d59eedb08adf3b43", "tree": "369bb916604bc5c07ee3c8eff289168ba6f0f64b", "parents": [ "d96478d5a2dcfa3aba1ca4d71b07fef62b27d9c8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 17:34:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 22:36:19 2010 -0700" }, "message": "sparc64: Remove profiling from some low-level bits.\n\nThese include the timer implementation, perf events support, and the\nperformance counter register (pcr) programming layer.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d96478d5a2dcfa3aba1ca4d71b07fef62b27d9c8", "tree": "97f4a09d2819a46784ea79e8999a03764429b4a3", "parents": [ "ddacd0bc70fe724eba2b5967dd5b68e10d41486c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 17:32:08 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 22:36:10 2010 -0700" }, "message": "sparc64: Kill unnecessary static on local var in ftrace_call_replace().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cb256aa60409efd803806cfb0528a4b3f8397dba", "tree": "edb33d59e189c0715100251863357801342c76ec", "parents": [ "bdd32ce95f79fb5cc964cd789d7ae4500bba7c6f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 22:16:22 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 12 22:16:22 2010 -0700" }, "message": "sparc64: Use kstack_valid() in die_if_kernel().\n\nThis gets rid of a local function (is_kernel_stack()) which tries to\ndo the same thing, yet poorly in that it doesn\u0027t handle IRQ stacks\nproperly.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "336f5899d287f06d8329e208fc14ce50f7ec9698", "tree": "9b762d450d5eb248a6ff8317badb7e223d93ed58", "parents": [ "a4ab2773205e8b94c18625455f85e3b6bb9d7ad6", "db217dece3003df0841bacf9556b5c06aa097dae" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "message": "Merge branch \u0027master\u0027 into export-slabh\n" }, { "commit": "954fbc8985328a3b59b5881243d3aa04a8f8da7c", "tree": "8535ec2d841a3213661f8362ebb358bf34575346", "parents": [ "3f6c148df42d98f0991baf4353497d380a30bc19" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 23:50:59 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 23:50:59 2010 -0700" }, "message": "sparc64: Implement perf_arch_fetch_caller_regs\n\nWe provide regs-\u003etstate, regs-\u003etpc, regs-\u003etnpc and\nregs-\u003eu_regs[UREG_FP].\n\nregs-\u003etstate is necessary for:\n\n\tuser_mode()\t\t(via perf_exclude_event())\n\n\tperf_misc_flags()\t(via perf_prepare_sample())\n\nregs-\u003etpc is necessary for:\n\n\tperf_instruction_pointer() (via perf_prepare_sample())\n\nand regs-\u003eu_regs[UREG_FP] is necessary for:\n\n\tperf_callchain()\t(via perf_prepare_sample())\n\nThe regs-\u003etnpc value is provided just to be tidy.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87e8b821ed8db3dab03d96cd542e29666bf210aa", "tree": "0027060473aafbbb125655ba027319c8a1a665fc", "parents": [ "33cd9dfa3a13e3d8e41aef225a9f98169816723b", "5e11611a5d22252f3f9c169a3c9377eac0c32033" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 15:49:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 15:49:14 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "b857bd292223f54aaae3693c82fa7299a99991cd", "tree": "d1df20123185c44c4dbac7c82720b71721f82255", "parents": [ "c4a3987fa075b2d15ebc3d59b01fb7ed403cd3e1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 31 18:05:05 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 31 18:05:05 2010 -0700" }, "message": "sparc: Fix regset register window handling.\n\nWe have to adjust \u0027reg_window\u0027 down by 16 becuase the \u0027pos\u0027 iterator\nwe\u0027ll use to index into the stack slots will be between 16 and 32.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "c45140a996b511bccdcbbdbea7e36f001826bdf2", "tree": "8d6613880399d1a25598f7cb51834efbbda87ad9", "parents": [ "de329820e920cd9cfbc2127cad26a37026260cce", "9e8307ecaf9f8c8b5b3b22145021204c4e73114a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 29 14:41:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 29 14:41:00 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc64: Properly truncate pt_regs framepointer in perf callback.\n arch/sparc/kernel: Use set_cpus_allowed_ptr\n sparc: Fix use of uid16_t and gid16_t in asm/stat.h\n" }, { "commit": "9e8307ecaf9f8c8b5b3b22145021204c4e73114a", "tree": "d0361a2e093120880adecbd87c1f0f26a57541e9", "parents": [ "d2566af8c4860a03ca685ef0910de406679c3e4e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 29 13:08:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 29 13:08:52 2010 -0700" }, "message": "sparc64: Properly truncate pt_regs framepointer in perf callback.\n\nFor 32-bit processes, we save the full 64-bits of the regs in pt_regs.\n\nBut unlike when the userspace actually does load and store\ninstructions, the top 32-bits don\u0027t get automatically truncated by the\ncpu in kernel mode (because the kernel doesn\u0027t execute with PSTATE_AM\naddress masking enabled).\n\nSo we have to do it by hand.\n\nReported-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d2566af8c4860a03ca685ef0910de406679c3e4e", "tree": "16e5e988dac842c78444e35d3e4e8d20ee38ac2b", "parents": [ "7469a9acf919d36836f6c635099d8edc9be4528a" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat Mar 27 21:11:56 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 27 21:11:56 2010 -0700" }, "message": "arch/sparc/kernel: Use set_cpus_allowed_ptr\n\nUse set_cpus_allowed_ptr rather than set_cpus_allowed.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression E1,E2;\n@@\n\n- set_cpus_allowed(E1, cpumask_of_cpu(E2))\n+ set_cpus_allowed_ptr(E1, cpumask_of(E2))\n\n@@\nexpression E;\nidentifier I;\n@@\n\n- set_cpus_allowed(E, I)\n+ set_cpus_allowed_ptr(E, \u0026I)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9fdfbc2bff587f454dd95e2caa6d147c9abe39e4", "tree": "2feaee47cbcfb57dd0d5cf23509e22011541e717", "parents": [ "8cea4eb642890a1de58980e7e1617d1765ef8f7c", "dc1d628a67a8f042e711ea5accc0beedc3ef0092" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 14:39:42 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 14:39:42 2010 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf: Provide generic perf_sample_data initialization\n MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer\n perf trace: Don\u0027t use pager if scripting\n perf trace/scripting: Remove extraneous header read\n perf, ARM: Modify kuser rmb() call to compile for Thumb-2\n x86/stacktrace: Don\u0027t dereference bad frame pointers\n perf archive: Don\u0027t try to collect files without a build-id\n perf_events, x86: Fixup fixed counter constraints\n perf, x86: Restrict the ANY flag\n perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE\n perf, x86: add some IBS macros to perf_event.h\n perf, x86: make IBS macros available in perf_event.h\n hw-breakpoints: Remove stub unthrottle callback\n x86/hw-breakpoints: Remove the name field\n perf: Remove pointless breakpoint union\n perf lock: Drop the buffers multiplexing dependency\n perf lock: Fix and add misc documentally things\n percpu: Add __percpu sparse annotations to hw_breakpoint\n" }, { "commit": "f5c9c9be267f73eda6a668ac81ddde56ed7fa793", "tree": "7e1c463de9bd9daed3c679f9b7978184b5516b08", "parents": [ "8eff8a5c1d3a1de7a2d173e0effc6cc9bcbb5177" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Wed Mar 03 19:57:27 2010 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 13 01:14:14 2010 +0100" }, "message": "sparc: Convert sparc to use read/update_persistent_clock\n\nThis patch converts the sparc architecture to use the generic\nread_persistent_clock and update_persistent_clock interfaces, reducing\nthe amount of arch specific code we have to maintain, and allowing for\nfurther cleanups in the future.\n\n[ davem: compile fix: Here\u0027s a version that compiles, you have to get\n rid of the now unused variably last_rtc_update since we build with\n -Werror ]\n \nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: sparclinux@vger.kernel.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "c32da02342b7521df25fefc2ef20aee0e61cf887", "tree": "7e38f664fa3e13602c357d37f77d8adcf82fccc2", "parents": [ "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "318ae2edc3b29216abd8a2510f3f80b764f06858" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)\n doc: fix typo in comment explaining rb_tree usage\n Remove fs/ntfs/ChangeLog\n doc: fix console doc typo\n doc: cpuset: Update the cpuset flag file\n Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n Remove drivers/parport/ChangeLog\n Remove drivers/char/ChangeLog\n doc: typo - Table 1-2 should refer to \"status\", not \"statm\"\n tree-wide: fix typos \"ass?o[sc]iac?te\" -\u003e \"associate\" in comments\n No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h\n devres/irq: Fix devm_irq_match comment\n Remove reference to kthread_create_on_cpu\n tree-wide: Assorted spelling fixes\n tree-wide: fix \u0027lenght\u0027 typo in comments and code\n drm/kms: fix spelling in error message\n doc: capitalization and other minor fixes in pnp doc\n devres: typo fix s/dev/devm/\n Remove redundant trailing semicolons from macros\n fix typo \"definetly\" -\u003e \"definitely\" in comment\n tree-wide: s/widht/width/g typo in comments\n ...\n\nFix trivial conflict in Documentation/laptops/00-INDEX\n" }, { "commit": "349004294c365cb99a0ee84149286d6f29b1e6b9", "tree": "0e131233812fd3f93827b0a5076ab532142ae0a7", "parents": [ "06db881b4f1b5fb8fff563423f76b7361de8281a" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Mar 10 15:23:35 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:42 2010 -0800" }, "message": "dma-mapping: sparc: unify 32bit and 64bit dma_set_mask\n\nThis patchset transforms the PCI DMA API into the generic device model.\nIt\u0027s one of the reasons why we introduced the generic DMA API long ago;\ndriver writers are always able to use the generic DMA API with any bus\ninstead of using bus specific DMA APIs such as pci_map_single,\nsbus_map_single, etc (only two bus specific APIs exist now; pci and ssb).\n\nSome of the PCI DMA API are already implented on the top of the generic\nDMA API (include/asm-generic/pci-dma-compat.h). But there are some\nexceptions. This patchset finishes the transformation.\n\nThis patch:\n\nsparc has two dma_set_mask implementations for 32bit and 64bit. They are\nsame except for the error returned value. We can safely unify them since\nthe error returned value doesn\u0027t matter as long as it is negative (as\nDMA-API.txt describes).\n\nThis patch also changes dma_set_mask not to call\npci_set_dma_mask. Instead, dma_set_mask does the same thing that\npci_set_dma_mask does. This change enables ut to change\npci_set_dma_mask to call dma_set_mask; we can implement\npci_set_dma_mask as pci-dma-compat.h does.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: David Miller \u003cdavem@davemloft.net\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: James Bottomley \u003cJames.Bottomley@suse.de\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e28cbf22933d0c0ccaf3c4c27a1a263b41f73859", "tree": "a93ff48cfd97766a23b2c4f3ea86fccfc9c51d3f", "parents": [ "baed7fc9b580bd3fb8252ff1d9b36eaf1f86b670" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Mar 10 15:21:19 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "improve sys_newuname() for compat architectures\n\nOn an architecture that supports 32-bit compat we need to override the\nreported machine in uname with the 32-bit value. Instead of doing this\nseparately in every architecture introduce a COMPAT_UTS_MACHINE define in\n\u003casm/compat.h\u003e and apply it directly in sys_newuname().\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "baed7fc9b580bd3fb8252ff1d9b36eaf1f86b670", "tree": "38f23cd9888b92de3f73ed1f4ce48cd83e940e0e", "parents": [ "a4679373cf4ee0e7792dc56205365732b725c2c1" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Mar 10 15:21:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "Add generic sys_ipc wrapper\n\nAdd a generic implementation of the ipc demultiplexer syscall. Except for\ns390 and sparc64 all implementations of the sys_ipc are nearly identical.\n\nThere are slight differences in the types of the parameters, where mips\nand powerpc as the only 64-bit architectures with sys_ipc use unsigned\nlong for the \"third\" argument as it gets casted to a pointer later, while\nit traditionally is an \"int\" like most other paramters. frv goes even\nfurther and uses unsigned long for all parameters execept for \"ptr\" which\nis a pointer type everywhere. The change from int to unsigned long for\n\"third\" and back to \"int\" for the others on frv should be fine due to the\nin-register calling conventions for syscalls (we already had a similar\nissue with the generic sys_ptrace), but I\u0027d prefer to have the arch\nmaintainers looks over this in details.\n\nExcept for that h8300, m68k and m68knommu lack an impplementation of the\nsemtimedop sub call which this patch adds, and various architectures have\ngets used - at least on i386 it seems superflous as the compat code on\nx86-64 and ia64 doesn\u0027t even bother to implement it.\n\n[akpm@linux-foundation.org: add sys_ipc to sys_ni.c]\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nReviewed-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nAcked-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dc1d628a67a8f042e711ea5accc0beedc3ef0092", "tree": "728f72a5f9a8368b225890a95ea947c1c8cda301", "parents": [ "548b84166917d6f5e2296123b85ad24aecd3801d" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Mar 03 15:55:04 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 10 13:22:23 2010 +0100" }, "message": "perf: Provide generic perf_sample_data initialization\n\nThis makes it easier to extend perf_sample_data and fixes a bug on arm\nand sparc, which failed to set -\u003eraw to NULL, which can cause crashes\nwhen combined with PERF_SAMPLE_RAW.\n\nIt also optimizes PowerPC and tracepoint, because the struct\ninitialization is forced to zero out the whole structure.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Jean Pihet \u003cjpihet@mvista.com\u003e\nReviewed-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Jamie Iles \u003cjamie.iles@picochip.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nCc: stable@kernel.org\nLKML-Reference: \u003c20100304140100.315416040@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "6895210e89df20520916c94a4dc148a43229053e", "tree": "60b137cccd4a57bb98bbfed55a42859e4b60c8db", "parents": [ "4c10c937cc2eb197db565392db91d429eec71176", "8a4fd1e4922413cfdfa6c51a59efb720d904a5eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 08:24:47 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 08:24:47 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc64: Make prom entry spinlock NMI safe.\n sparc64: Kill off old sys_perfctr system call and state.\n sparc: Update defconfigs.\n sparc: Provide io{read,write}{16,32}be().\n" }, { "commit": "c7d5a0050773e98d1094eaa9f2a1a793fafac300", "tree": "9836ff13aabf0990d5f235f24c90b5ef5cd8ae71", "parents": [ "6c5ae5b278e29c1a23fd562e1a5276c2e2ea1738" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 03 08:08:49 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 03 08:08:49 2010 -0800" }, "message": "sparc64: Kill off old sys_perfctr system call and state.\n\nPeople should be using the perf events interfaces, and\nthe way these system call facilities used the %pcr conflicts\nwith the usage of the NMI watchdog and perf events.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a135ba14d71fb84c691a5386aff5049691fe6d7", "tree": "adb1de887dd6839d69d2fc16ffa2a10ff63298fa", "parents": [ "4850f524b2c4c8a4e9f8ef4dd9c7c4afde2f2b2c", "a29d8b8e2d811a24bbe49215a0f0c536b72ebc18" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 03 07:34:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 03 07:34:18 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: add __percpu sparse annotations to what\u0027s left\n percpu: add __percpu sparse annotations to fs\n percpu: add __percpu sparse annotations to core kernel subsystems\n local_t: Remove leftover local.h\n this_cpu: Remove pageset_notifier\n this_cpu: Page allocator conversion\n percpu, x86: Generic inc / dec percpu instructions\n local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c\n module: Use this_cpu_xx to dynamically allocate counters\n local_t: Remove cpu_local_xx macros\n percpu: refactor the code in pcpu_[de]populate_chunk()\n percpu: remove compile warnings caused by __verify_pcpu_ptr()\n percpu: make accessors check for percpu pointer in sparse\n percpu: add __percpu for sparse.\n percpu: make access macros universal\n percpu: remove per_cpu__ prefix.\n" }, { "commit": "b7f3a209e9b09b3110ea084836c75f2cd26b29f2", "tree": "b5f77cb3f2eab58a2a2f3705fdd08bd39ea02a3f", "parents": [ "6d6b89bd2e316b78d668f761d380837b81fa71ef", "4b17764737bb4ee3364b8bfa2059f51ebc19ccd6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 07:56:44 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 07:56:44 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:\n sparc: Support show_unhandled_signals.\n sparc: use __ratelimit\n sunxvr500: Additional PCI id for sunxvr500 driver\n sparc: use asm-generic/scatterlist.h\n sparc64: If \u0027slot-names\u0027 property exist, create sysfs PCI slot information.\n sparc: remove trailing space in messages\n sparc: remove redundant return statements\n" }, { "commit": "47871889c601d8199c51a4086f77eebd77c29b0b", "tree": "40cdcac3bff0ee40cc33dcca61d0577cdf965f77", "parents": [ "c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3", "30ff056c42c665b9ea535d8515890857ae382540" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tdrivers/firmware/iscsi_ibft.c\n" }, { "commit": "6556a6743549defc32e5f90ee2cb1ecd833a44c3", "tree": "622306583d4a3c13235a8bfc012854c125c597f1", "parents": [ "e0d272429a34ff143bfa04ee8e29dd4eed2964c7", "1dd2980d990068e20045b90c424518cc7f3657ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 28 10:20:25 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 28 10:20:25 2010 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (172 commits)\n perf_event, amd: Fix spinlock initialization\n perf_event: Fix preempt warning in perf_clock()\n perf tools: Flush maps on COMM events\n perf_events, x86: Split PMU definitions into separate files\n perf annotate: Handle samples not at objdump output addr boundaries\n perf_events, x86: Remove superflous MSR writes\n perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()\n perf_events, x86: AMD event scheduling\n perf_events: Add new start/stop PMU callbacks\n perf_events: Report the MMAP pgoff value in bytes\n perf annotate: Defer allocating sym_priv-\u003ehist array\n perf symbols: Improve debugging information about symtab origins\n perf top: Use a macro instead of a constant variable\n perf symbols: Check the right return variable\n perf/scripts: Tag syscall_name helper as not yet available\n perf/scripts: Add perf-trace-python Documentation\n perf/scripts: Remove unnecessary PyTuple resizes\n perf/scripts: Add syscall tracing scripts\n perf/scripts: Add Python scripting engine\n perf/scripts: Remove check-perf-trace from listed scripts\n ...\n\nFix trivial conflict in tools/perf/util/probe-event.c\n" }, { "commit": "e0d272429a34ff143bfa04ee8e29dd4eed2964c7", "tree": "5a719135b245811b5d61ed084d7b8c1bc2e87031", "parents": [ "d25e8dbdab203ed8b4fd0a174bb5259e35ecd87c", "480917427b0b6ff39de55ffc81391055472e6c26" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 28 10:17:55 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Feb 28 10:17:55 2010 -0800" }, "message": "Merge branch \u0027tracing-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)\n ftrace: Add function names to dangling } in function graph tracer\n tracing: Simplify memory recycle of trace_define_field\n tracing: Remove unnecessary variable in print_graph_return\n tracing: Fix typo of info text in trace_kprobe.c\n tracing: Fix typo in prof_sysexit_enable()\n tracing: Remove CONFIG_TRACE_POWER from kernel config\n tracing: Fix ftrace_event_call alignment for use with gcc 4.5\n ftrace: Remove memory barriers from NMI code when not needed\n tracing/kprobes: Add short documentation for HAVE_REGS_AND_STACK_ACCESS_API\n s390: Add pt_regs register and stack access API\n tracing/kprobes: Make Kconfig dependencies generic\n tracing: Unify arch_syscall_addr() implementations\n tracing: Add notrace to TRACE_EVENT implementation functions\n ftrace: Allow to remove a single function from function graph filter\n tracing: Add correct/incorrect to sort keys for branch annotation output\n tracing: Simplify test for function_graph tracing start point\n tracing: Drop the tr check from the graph tracing path\n tracing: Add stack dump to trace_printk if stacktrace option is set\n tracing: Use appropriate perl constructs in recordmcount.pl\n tracing: optimize recordmcount.pl for offsets-handling\n ...\n" }, { "commit": "c7ec2b585525477f393942ecb18fff1f5e259118", "tree": "d7c5819148bf05305dbad11aa94a7e070b0548cc", "parents": [ "275143e9b237dd7e0b6d01660fd9b8acd9922fa7" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Sun Feb 28 03:31:29 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 03:31:29 2010 -0800" }, "message": "sparc: use __ratelimit\n\nReplace open-coded rate limiting logic with __ratelimit().\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6fb83029db161141d68cf019760a893d03d0682b", "tree": "6f149c23cedc9b2a5f72b5b90ab8426b39afbb7c", "parents": [ "281b3714e91162b66add1cfac404cf7b81e3e2f2", "e01292b1fd68ff2abe234d584b06e64344d2c1de" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Feb 27 10:06:10 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Feb 27 10:06:10 2010 +0100" }, "message": "Merge branch \u0027tracing/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core\n" }, { "commit": "68c6b859846bd078b37c6ca5f3882032f129e72d", "tree": "e243605957f1cab3532d57d86ea87355c10b6385", "parents": [ "a4a47bc03fe520e95e0c4212bf97c86545fb14f9", "bb8d41330ce27edb91adb6922d3f8e1a8923f727" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 10:35:27 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 10:35:27 2010 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (48 commits)\n x86/PCI: Prevent mmconfig memory corruption\n ACPI: Use GPE reference counting to support shared GPEs\n x86/PCI: use host bridge _CRS info by default on 2008 and newer machines\n PCI: augment bus resource table with a list\n PCI: add pci_bus_for_each_resource(), remove direct bus-\u003eresource[] refs\n PCI: read bridge windows before filling in subtractive decode resources\n PCI: split up pci_read_bridge_bases()\n PCIe PME: use pci_pcie_cap()\n PCI PM: Run-time callbacks for PCI bus type\n PCIe PME: use pci_is_pcie()\n PCI / ACPI / PM: Platform support for PCI PME wake-up\n ACPI / ACPICA: Multiple system notify handlers per device\n ACPI / PM: Add more run-time wake-up fields\n ACPI: Use GPE reference counting to support shared GPEs\n PCI PM: Make it possible to force using INTx for PCIe PME signaling\n PCI PM: PCIe PME root port service driver\n PCI PM: Add function for checking PME status of devices\n PCI: mark is_pcie obsolete\n PCI: set PCI_PREF_RANGE_TYPE_64 in pci_bridge_check_ranges\n PCI: pciehp: second try to get big range for pcie devices\n ...\n" }, { "commit": "6e37738a2fac964583debe91099bc3248554f6e5", "tree": "1f1bd19fcfcd328be139a796e2016877814436ad", "parents": [ "38331f62c20456454eed9ebea2525f072c6f1d2e" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Thu Feb 11 13:21:58 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 26 10:56:53 2010 +0100" }, "message": "perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()\n\nSince the cpu argument to hw_perf_group_sched_in() is always\nsmp_processor_id(), simplify the code a little by removing this argument\nand using the current cpu where needed.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c1265890918.5396.3.camel@laptop\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6ebdc661b608671e9ca572af8bb42d58108cc008", "tree": "e99caacb964a27caeae699160fa5eddcb14526e9", "parents": [ "d7930c9ef9cc67044f5ddaac54d06ca22645a012", "df0edeb59eb559be0bee53452fda2f5cc0ae133f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 25 15:38:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 25 15:38:37 2010 -0800" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (41 commits)\n of: remove undefined request_OF_resource \u0026 release_OF_resource\n of/sparc: Remove sparc-local declaration of allnodes and devtree_lock\n of: move definition of of_chosen into common code.\n of: remove unused extern reference to devtree_lock\n of: put default string compare and #a/s-cell values into common header\n of/flattree: Don\u0027t assume HAVE_LMB\n of: protect linux/of.h with CONFIG_OF\n proc_devtree: fix THIS_MODULE without module.h\n of: Remove old and misplaced function declarations\n of/flattree: Make the kernel accept ePAPR style phandle information\n of/flattree: endian-convert members of boot_param_header\n of: assume big-endian properties, adding conversions where necessary\n of: use __be32 for cell value accessors\n of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing\n of/flattree: use callback to setup initrd from /chosen\n proc_devtree: include linux/of.h\n of: make set_node_proc_entry private to proc_devtree.c\n of: include linux/proc_fs.h\n of/flattree: merge early_init_dt_scan_memory() common code\n of: add \u0027of_\u0027 prefix to machine_is_compatible()\n ...\n" }, { "commit": "3b7a17fcdae532d29dffab9d564a28be08960988", "tree": "64ac96e997751e34fcd237485fac9b868d1e0614", "parents": [ "b26b2d494b659f988b4d75eb394dfa0ddac415c9" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jan 01 17:40:50 2010 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Feb 22 16:16:57 2010 -0800" }, "message": "resource/PCI: mark struct resource as const\n\nNow that we return the new resource start position, there is no\nneed to update \"struct resource\" inside the align function.\nTherefore, mark the struct resource as const.\n\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nCc: Yinghai Lu \u003cyhlu.kernel@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b26b2d494b659f988b4d75eb394dfa0ddac415c9", "tree": "d262f333e529a21017dc072e604a626b38520515", "parents": [ "93da6202264ce1256b04db8008a43882ae62d060" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jan 01 17:40:49 2010 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Feb 22 16:16:56 2010 -0800" }, "message": "resource/PCI: align functions now return start of resource\n\nAs suggested by Linus, align functions should return the start\nof a resource, not void. An update of \"res-\u003estart\" is no longer\nnecessary.\n\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nCc: Yinghai Lu \u003cyhlu.kernel@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "586f64c749a71fa2c86e1e2c121d22c8bc60669a", "tree": "33cfe68f3fd15ad069f9eafc0f18264c52c4a0bc", "parents": [ "b7e9f6219d01ccb4af6fe5ad082150032ecae8ab" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Feb 22 11:10:48 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Feb 22 11:10:48 2010 +0100" }, "message": "Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n\nThis is a partial revert of commit 3ad2f3fbb961 (\"tree-wide: Assorted\nspelling fixes\") as the change in arch/sparc/kernel/leon_kernel.c has\nbeen already fixed while refactoring the file in the sparc tree.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "2ef2d7477549c85b84b24b155baa798650cbf90b", "tree": "49b9f1521ff078eabb328288afb72ad6bb592c37", "parents": [ "198d2f63a6096fe575b696b13ba61b62c620266f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 20 19:53:55 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 20 19:53:55 2010 -0800" }, "message": "sparc64: If \u0027slot-names\u0027 property exist, create sysfs PCI slot information.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "198d2f63a6096fe575b696b13ba61b62c620266f", "tree": "d0c2b0697370cc670029cd1eb2a80c35c71eac60", "parents": [ "0da2b300b91ddeb9944c3fb4faaf78c1c482c0af", "1f474646fdc36b457606bbcd6a3592e6cbd31ac4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 20 13:53:16 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 20 13:53:16 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6\n" }, { "commit": "1f474646fdc36b457606bbcd6a3592e6cbd31ac4", "tree": "706149d39c9de0bc0ceacfb2ab44e909caba5b3c", "parents": [ "d7ecfb3c2aa155c9f6152ebe91de92067d16ba6e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 19 15:19:52 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 19 15:19:52 2010 -0800" }, "message": "sparc64: Fix sun4u execute bit check in TSB I-TLB load.\n\nThanks to testcase and report from Brad Spengler:\n\n--------------------\n#include \u003cstdio.h\u003e\n\ntypedef int (* _wee)(void);\n\nint main(void)\n{\n char buf[8] \u003d { \u0027\\x81\u0027, \u0027\\xc7\u0027, \u0027\\xe0\u0027, \u0027\\x08\u0027, \u0027\\x81\u0027, \u0027\\xe8\u0027,\n \u0027\\x00\u0027, \u0027\\x00\u0027 };\n _wee wee;\n printf(\"%p\\n\", \u0026buf);\n wee \u003d (_wee)\u0026buf;\n wee();\n\n return 0;\n}\n--------------------\n\nTSB I-tlb load code tries to use andcc to check the _PAGE_EXEC_4U bit,\nbut that\u0027s bit 12 so it gets sign extended all the way up to bit 63\nand the test nearly always passes as a result.\n\nUse sethi to fix the bug.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7ecfb3c2aa155c9f6152ebe91de92067d16ba6e", "tree": "dec51d650e6f5f5d9f2167bf025347a608dde8f9", "parents": [ "172d2d0041fdd4f3617dbdff8296bf279db3d5fb" ], "author": { "name": "Kristoffer Glembo", "email": "kristoffer@gaisler.com", "time": "Mon Feb 15 16:10:28 2010 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 16:42:20 2010 -0800" }, "message": "sparc: Fix incorrect comparison in of_bus_ambapp_match()\n\nUse type instead of name in comparison.\n\nSigned-off-by: Kristoffer Glembo \u003ckristoffer@gaisler.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "172d2d0041fdd4f3617dbdff8296bf279db3d5fb", "tree": "5bce3a7e17c05f43239cd6ba01e0005343625858", "parents": [ "8c2fcadc933f713d51f46ec4dcd9b12830e0df84" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 16:42:08 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 16:42:08 2010 -0800" }, "message": "sparc64: Sync of_create_pci_dev() with drivers/pci/probe.c changes.\n\nMirrors powerpc commits bb209c8287d2d55ec4a67e3933346e0a3ee0da76\n(\"powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()\")\nand 26b4a0ca46985ae9586c194f7859f3838b1230f8\n(\"powerpc/pci: Add missing hookup to pci_slot\")\n\nWe also need to initialize -\u003edma_mask explicitly here too.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c2fcadc933f713d51f46ec4dcd9b12830e0df84", "tree": "e0797b2db664d702f9d02dd0f45efddb2f0d7fe9", "parents": [ "232486e1e9f34889424b68ee6270440b554479a2", "b0483e78e5c4c9871fc5541875b3bc006846d46b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 16:20:14 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 16:20:14 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "e7b8e675d9c71b868b66f62f725a948047514719", "tree": "77877e2470148dc47653408c4b624734a8f14239", "parents": [ "ea2c68a08fedb5053ba312d661e47df9f4d72411" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue Jan 26 04:40:03 2010 -0500" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Feb 17 13:07:21 2010 +0100" }, "message": "tracing: Unify arch_syscall_addr() implementations\n\nMost implementations of arch_syscall_addr() are the same, so create a\ndefault version in common code and move the one piece that differs (the\nsyscall table) to asm/syscall.h. New arch ports don\u0027t have to waste\ntime copying \u0026 pasting this simple function.\n\nThe s390/sparc versions need to be different, so document why.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nAcked-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nLKML-Reference: \u003c1264498803-17278-1-git-send-email-vapier@gentoo.org\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "2bb4646fce8d09916b351d1a62f98db7cec6fc41", "tree": "c1f0d002e69868606eca9d1b919835f422892063", "parents": [ "6836b9bdd98e3b500cd49512484df68f46e14659", "b0483e78e5c4c9871fc5541875b3bc006846d46b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 22:09:29 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 22:09:29 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "177867ce08f2756fa361e37086fc1792d7b4cf29", "tree": "11031433795fc8808a195d995b524c27af1d2329", "parents": [ "bec92044b73085ba92aabf973cb5aafc251f3a34" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 15:23:23 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 15:23:23 2010 -0800" }, "message": "sparc64: Kill bogus ip_tables.h include.\n\nFixes the following build failure:\n\n CC arch/sparc/kernel/sys_sparc32.o\nIn file included from include/linux/netfilter_ipv4/ip_tables.h:28,\n from arch/sparc/kernel/sys_sparc32.c:46:\ninclude/linux/netfilter/x_tables.h:525: error: expected declaration specifiers or ‘...’ before ‘nf_hookfn’\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0d351c3e932c2e155ef5e4c3f5b87223abd4eea6", "tree": "a1ca21dd26dbe86a131c879f6401686eb4de41b1", "parents": [ "fc0bdae49d810e4cb32d7b547bc6d4dfb08f9e2e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Feb 14 14:13:57 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Feb 14 13:02:44 2010 -0700" }, "message": "of/sparc: Remove sparc-local declaration of allnodes and devtree_lock\n\nBoth allnodes and devtree_lock are defined in common code. The\nextern declaration should be in the common header too so that the\ncompiler can type check. allnodes is already in of.h, but\ndevtree_lock should be declared there too.\n\nThis patch removes the SPARC declarations and uses decls in of.h instead.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0da2b300b91ddeb9944c3fb4faaf78c1c482c0af", "tree": "3b9c78dc9c52cf7698063853befd4af9017b19de", "parents": [ "1349ea08e8de7b3e09998f33ea4e6c74f3e0db1a" ], "author": { "name": "Frans Pop", "email": "elendil@planet.nl", "time": "Fri Feb 12 12:08:51 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 12 12:08:51 2010 -0800" }, "message": "sparc: remove trailing space in messages\n\nAlso fixes a typo in one message.\n\nSigned-off-by: Frans Pop \u003celendil@planet.nl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "232486e1e9f34889424b68ee6270440b554479a2", "tree": "146eefb55c19b9cc21f0263ffa19f2e6a5e707fe", "parents": [ "440ab7ac2d6b735fb278a1ff1674f6716314c6bb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 12 12:03:45 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 12 12:03:45 2010 -0800" }, "message": "sparc64: Tighten checks in kstack_valid().\n\nThe kernel stack pointer is invalid if it is not 16-byte\naligned.\n\nBased upon a report by Meelis Roos \u003cmroos@linux.ee\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2d6cff7f5255985939fb752daee4fab397ed61d", "tree": "0dee8087cce187ad3272f9cc18457e879ffd78c9", "parents": [ "803bf5ec259941936262d10ecc84511b76a20921", "440ab7ac2d6b735fb278a1ff1674f6716314c6bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 11 14:00:27 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 11 14:00:27 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc32: Fix thinko in previous change.\n sparc: Align clone and signal stacks to 16 bytes.\n" }, { "commit": "440ab7ac2d6b735fb278a1ff1674f6716314c6bb", "tree": "0e1c3e2b4967782c53f50a8611cedb63cf02d13e", "parents": [ "f036d9f3985a529a81e582f68aa984eb7b20d54d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 11 12:29:16 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 11 12:29:16 2010 -0800" }, "message": "sparc32: Fix thinko in previous change.\n\nShould mask stack with 0xf not \"0x15\".\n\nNoticed by Blue Swirl \u003cblauwirbel@gmail.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1349ea08e8de7b3e09998f33ea4e6c74f3e0db1a", "tree": "541f95834e6da7b92d938585f30ad2586804f92a", "parents": [ "e28cab42f384745c8a947a9ccd51e4aae52f5d51" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Feb 10 11:47:57 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 10 11:47:57 2010 -0800" }, "message": "sparc: remove redundant return statements\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f036d9f3985a529a81e582f68aa984eb7b20d54d", "tree": "eaf58cc5d2c81e3ca08e23b5cda76eacd515d166", "parents": [ "6abce7711fcbd72b42f0c9632c1beccf4e674663" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 09 16:18:40 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 09 16:18:40 2010 -0800" }, "message": "sparc: Align clone and signal stacks to 16 bytes.\n\nThis is mandatory for 64-bit processes, and doing it also for 32-bit\nprocesses saves a conditional in the compat case.\n\nThis fixes the glibc/nptl/tst-stdio1 test case, as well\nas many others, on 64-bit.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89751a7cb70a20f0d604dd7c4be29dd7b0011718", "tree": "17abed1974c3c79c978b20bd396078df80f19f40", "parents": [ "fcdeb7fedf89f4bbc2e11959794968080cd8426e" ], "author": { "name": "Jeremy Kerr", "email": "jeremy.kerr@canonical.com", "time": "Mon Feb 01 21:34:11 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 09 08:32:48 2010 -0700" }, "message": "of: merge of_find_node_by_phandle\n\nMerge common function between powerpc, sparc and microblaze. Code is\nidentical for powerpc and microblaze, but adds a lock (and release) of\nthe devtree_lock on sparc.\n\nSigned-off-by: Jeremy Kerr \u003cjeremy.kerr@canonical.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "3ad2f3fbb961429d2aa627465ae4829758bc7e07", "tree": "f365c513e8f5b477a61336a600ff54f32b7ad6e1", "parents": [ "1537a3638cbf741d3826c1002026cce487a6bee0" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Wed Feb 03 08:01:28 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 09 11:13:56 2010 +0100" }, "message": "tree-wide: Assorted spelling fixes\n\nIn particular, several occurances of funny versions of \u0027success\u0027,\n\u0027unknown\u0027, \u0027therefore\u0027, \u0027acknowledge\u0027, \u0027argument\u0027, \u0027achieve\u0027, \u0027address\u0027,\n\u0027beginning\u0027, \u0027desirable\u0027, \u0027separate\u0027 and \u0027necessary\u0027 are fixed.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Junio C Hamano \u003cgitster@pobox.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "ab386128f20c44c458a90039ab1bdc265ac474c9", "tree": "2ad188744922b1bb951fd10ff50dc04c83acce22", "parents": [ "dbfc196a3cc1a2514ad0737a82f764de23bd65e6", "ab658321f32770b903a4426e2a6fae0392757755" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Feb 02 14:38:15 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Feb 02 14:38:15 2010 +0900" }, "message": "Merge branch \u0027master\u0027 into percpu\n" }, { "commit": "94673e968cbcce07fa78dac4b0ae05d24b5816e1", "tree": "e09e561f6188801b1f5cc3b37b880931ecbaf12b", "parents": [ "05d43ed8a89c159ff641d472f970e3f1baa66318" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 21:42:02 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 08:22:01 2010 -0800" }, "message": "sparc: TIF_ABI_PENDING bit removal\n\nHere are the sparc bits to remove TIF_ABI_PENDING now that\nset_personality() is called at the appropriate place in exec.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0ada0a73120c28cc432bcdbac061781465c2f48f", "tree": "d17cadd4ea47e25d9e48e7d409a39c84268fbd27", "parents": [ "6016a363f6b56b46b24655bcfc0499b715851cf3", "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jan 28 14:38:25 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jan 28 14:38:25 2010 -0700" }, "message": "Merge commit \u0027v2.6.33-rc5\u0027 into secretlab/test-devicetree\n" }, { "commit": "6016a363f6b56b46b24655bcfc0499b715851cf3", "tree": "aaca35be4765ec7c7d847bed702c121bbd1b8a81", "parents": [ "923f7e30b480438f1e86e01e5cde814248b59a39" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jan 28 14:06:53 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jan 28 14:06:53 2010 -0700" }, "message": "of: unify phandle name in struct device_node\n\nIn struct device_node, the phandle is named \u0027linux_phandle\u0027 for PowerPC\nand MicroBlaze, and \u0027node\u0027 for SPARC. There is no good reason for the\ndifference, it is just an artifact of the code diverging over a couple\nof years. This patch renames both to simply .phandle.\n\nNote: the .node also existed in PowerPC/MicroBlaze, but the only user\nseems to be arch/powerpc/platforms/powermac/pfunc_core.c. It doesn\u0027t\nlook like the assignment between .linux_phandle and .node is\nsignificantly different enough to warrant the separate code paths\nunless ibm,phandle properties actually appear in Apple device trees.\n\nI think it is safe to eliminate the old .node property and use\nphandle everywhere.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "6abce7711fcbd72b42f0c9632c1beccf4e674663", "tree": "fb05481145e37f45bb0c25f41b24f70746e928f9", "parents": [ "1091ce6215a1cab60c3a4601a569cb727ca8637a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 04:16:49 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 04:16:49 2010 -0800" }, "message": "sparc64: Fix UP build.\n\nCan\u0027t reference irq_desc[].affinity when !SMP.\n\nReported-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1091ce6215a1cab60c3a4601a569cb727ca8637a", "tree": "45038c0ee7cc4f83d268098ce8c91bfa97e63c07", "parents": [ "e5981fd6d77c63c003cac44ab52da72994e7ead3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 19:30:49 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 19:30:49 2010 -0800" }, "message": "sparc64: Fix IRQ -\u003eset_affinity() methods.\n\nAs noted by Benjamin Herrenschmidt, the generic IRQ layer\nonly sets irq_desc[irq].affinity after -\u003eset_affinity()\nsucceeds.\n\nSo we have to use the passed in cpumask.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e7bef6b04ca2e8e4cf667c43d7e2ab3034a869d5", "tree": "b21d045e0b97f6e3f68a97e992e92432b3f91c2f", "parents": [ "4f6dbe4ac01d2664231d3f3eceadd33a44cde993" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 02:59:47 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 16:23:03 2010 -0800" }, "message": "sparc64: Fully support both performance counters.\n\nAdd the rest of the conflict detection and resolution logic necessary\nto support more than one counter at a time on sparc64.\n\nThe structure and implementation closely mimicks that of powerpc.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "4f6dbe4ac01d2664231d3f3eceadd33a44cde993" }