)]}' { "log": [ { "commit": "e534c7c5f8d6e9fc46f57fab067c7e48d8ceb172", "tree": "90150391bb1222888627ab22276158ffaf905f12", "parents": [ "7281201922a0063fa60804ce39c277fc98142a47" ], "author": { "name": "Lee Schermerhorn", "email": "lee.schermerhorn@hp.com", "time": "Wed May 26 14:44:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:57 2010 -0700" }, "message": "numa: x86_64: use generic percpu var numa_node_id() implementation\n\nx86 arch specific changes to use generic numa_node_id() based on generic\npercpu variable infrastructure. Back out x86\u0027s custom version of\nnuma_node_id()\n\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Eric Whitney \u003ceric.whitney@hp.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4a14d84ea2adc6c02dde4ae2d4552c15e014a475", "tree": "bdced2d932bf7363493dd0de5710e5e079d35181", "parents": [ "18e98307de0d746cb0845ebf66535ce2184c25a2" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed May 26 14:44:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:54 2010 -0700" }, "message": "x86_32: use asm-generic/scatterlist.h\n\nCc: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "18e98307de0d746cb0845ebf66535ce2184c25a2", "tree": "eac998f31e3930ffc1f54e524a2a9bbc82b851e0", "parents": [ "204f3a04449a9a775e465f7d87bcab08f170e59e" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed May 26 14:44:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:54 2010 -0700" }, "message": "asm-generic: add NEED_SG_DMA_LENGTH to define sg_dma_len()\n\nThere are only two ways to define sg_dma_len(); use sg-\u003edma_length or\nsg-\u003elength. This patch introduces NEED_SG_DMA_LENGTH that enables\narchitectures to choose sg-\u003edma_length or sg-\u003elength.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\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: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6109e2ce2600e2db26cd0424bb9c6ed019723288", "tree": "54b5d347bf12e0a987edfb52f287399f748a9a38", "parents": [ "0961d6581c870850342ad6ea25263763433d666f", "ac81860ea073daed50246af54db706c6e491f240" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 18:58:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 18:58:52 2010 -0700" }, "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: (36 commits)\n PCI: hotplug: pciehp: Removed check for hotplug of display devices\n PCI: read memory ranges out of Broadcom CNB20LE host bridge\n PCI: Allow manual resource allocation for PCI hotplug bridges\n x86/PCI: make ACPI MCFG reserved error messages ACPI specific\n PCI hotplug: Use kmemdup\n PM/PCI: Update PCI power management documentation\n PCI: output FW warning in pci_read/write_vpd\n PCI: fix typos pci_device_dis/enable to pci_dis/enable_device in comments\n PCI quirks: disable msi on AMD rs4xx internal gfx bridges\n PCI: Disable MSI for MCP55 on P5N32-E SLI\n x86/PCI: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs\n PCI: aerdrv: trivial cleanup for aerdrv_core.c\n PCI: aerdrv: trivial cleanup for aerdrv.c\n PCI: aerdrv: introduce default_downstream_reset_link\n PCI: aerdrv: rework find_aer_service\n PCI: aerdrv: remove is_downstream\n PCI: aerdrv: remove magical ROOT_ERR_STATUS_MASKS\n PCI: aerdrv: redefine PCI_ERR_ROOT_*_SRC\n PCI: aerdrv: rework do_recovery\n PCI: aerdrv: rework get_e_source()\n ...\n" }, { "commit": "3f6ea84a3035cc0ef7488f8e93bc76766799e082", "tree": "30f714b86c1221e2e832f27e1d15c6c1803c8b95", "parents": [ "3322340a9db2251ac9d09bc7b8d49e872298ae95" ], "author": { "name": "Ira W. Snyder", "email": "iws@ovro.caltech.edu", "time": "Thu Apr 01 11:43:30 2010 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri May 21 14:43:46 2010 -0700" }, "message": "PCI: read memory ranges out of Broadcom CNB20LE host bridge\n\nRead the memory ranges behind the Broadcom CNB20LE host bridge out of the\nhardware. This allows PCI hotplugging to work, since we know which memory\nrange to allocate PCI BAR\u0027s from.\n\nThe x86 PCI code automatically prefers the ACPI _CRS information when it is\navailable. In that case, this information is not used.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea", "tree": "0f359975ccad4ac72e86b8edf1924c076e74bd89", "parents": [ "98f01720cbe3e2eb719682777049b6514e9db556", "c59bd5688299cddb71183e156e7a3c1409b90df2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:01 2010 -0700" }, "message": "Merge branch \u0027core-hweight-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-hweight-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, hweight: Use a 32-bit popcnt for __arch_hweight32()\n arch, hweight: Fix compilation errors\n x86: Add optimized popcnt variants\n bitops: Optimize hweight() by making use of compile-time evaluation\n" }, { "commit": "b7723f9d21d8d6043e63f5e3e412f321f5f1900c", "tree": "984098e5c060600e90e62f1b101593805f7cb2e9", "parents": [ "93c9d7f60c0cb7715890b1f9e159da6f4d1f5a65", "6fc108a08dcddf8f9113cc7102ddaacf7ed37a6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:40:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 08:40:21 2010 -0700" }, "message": "Merge branch \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Clean up arch/x86/Kconfig*\n x86-64: Don\u0027t export init_level4_pgt\n" }, { "commit": "0102752e4c9e0655b39734550d4c35327954f7f9", "tree": "04c23f88e57c8e804d144434c60b91879e83648d", "parents": [ "b2812d031dea86926e9c10f7714af33ac2f6b43d" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Apr 11 18:55:56 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat May 01 04:32:11 2010 +0200" }, "message": "hw-breakpoints: Separate constraint space for data and instruction breakpoints\n\nThere are two outstanding fashions for archs to implement hardware\nbreakpoints.\n\nThe first is to separate breakpoint address pattern definition\nspace between data and instruction breakpoints. We then have\ntypically distinct instruction address breakpoint registers\nand data address breakpoint registers, delivered with\nseparate control registers for data and instruction breakpoints\nas well. This is the case of PowerPc and ARM for example.\n\nThe second consists in having merged breakpoint address space\ndefinition between data and instruction breakpoint. Address\nregisters can host either instruction or data address and\nthe access mode for the breakpoint is defined in a control\nregister. This is the case of x86 and Super H.\n\nThis patch adds a new CONFIG_HAVE_MIXED_BREAKPOINTS_REGS config\nthat archs can select if they belong to the second case. Those\nwill have their slot allocation merged for instructions and\ndata breakpoints.\n\nThe others will have a separate slot tracking between data and\ninstruction breakpoints.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Mahesh Salgaonkar \u003cmahesh@linux.vnet.ibm.com\u003e\nCc: K. Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6fc108a08dcddf8f9113cc7102ddaacf7ed37a6b", "tree": "f603e401149d7c5c64617e9e940d7da070ba9adf", "parents": [ "47f9fe26299ae022ac1e3fa12e7e73def62b7898" ], "author": { "name": "Jan Beulich", "email": "JBeulich@novell.com", "time": "Wed Apr 21 15:23:44 2010 +0100" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Apr 28 17:25:53 2010 -0700" }, "message": "x86: Clean up arch/x86/Kconfig*\n\nNo functional change intended.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nLKML-Reference: \u003c4BCF2690020000780003B340@vpn.id2.novell.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "ca7e0c612005937a4a5a75d3fed90459993de65c", "tree": "b574fc0f0189b52ffc87ba20c418228db556faa1", "parents": [ "8141d0050d76e5695011b5ab577ec66fb51a998c", "f5284e7635787224dda1a2bf82a4c56b1c75671f" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Apr 08 13:36:36 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Apr 08 13:37:18 2010 +0200" }, "message": "Merge branch \u0027linus\u0027 into perf/core\n\nSemantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c\n\nMerge reason: pick up latest fixes, fix the conflict\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d61931d89be506372d01a90d1755f6d0a9fafe2d", "tree": "652c34238edcb6c558163abc3cd9d6ce7c5f91a5", "parents": [ "1527bc8b928dd1399c3d3467dd47d9ede210978a" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Fri Mar 05 17:34:46 2010 +0100" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Apr 06 15:52:11 2010 -0700" }, "message": "x86: Add optimized popcnt variants\n\nAdd support for the hardware version of the Hamming weight function,\npopcnt, present in CPUs which advertize it under CPUID, Function\n0x0000_0001_ECX[23]. On CPUs which don\u0027t support it, we fallback to the\ndefault lib/hweight.c sw versions.\n\nA synthetic benchmark comparing popcnt with __sw_hweight64 showed almost\na 3x speedup on a F10h machine.\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nLKML-Reference: \u003c20100318112015.GC11152@aftab\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "51591e31dcb3716f03f962e26ec36a029aa46340", "tree": "f665dbdd69ad5a5e464d1434995d5939261c8d82", "parents": [ "042be38e6106ed70b42d096ab4a1ed4187e510e6" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Mar 25 15:39:27 2010 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Apr 02 19:09:31 2010 +0200" }, "message": "x86: Increase CONFIG_NODES_SHIFT max to 10\n\nSome larger systems require more than 512 nodes, so increase the\nmaximum CONFIG_NODES_SHIFT to 10 for a new max of 1024 nodes.\n\nThis was tested with numa\u003dfake\u003d64M on systems with more than\n64GB of RAM. A total of 1022 nodes were initialized.\n\nSuccessfully builds with no additional warnings on x86_64\nallyesconfig.\n\n( No effect on any existing config. Newly enabled CONFIG_MAXSMP\u003dy\n will see the new default. )\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nLKML-Reference: \u003calpine.DEB.2.00.1003251538060.8589@chino.kir.corp.google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d2f1e15b661e71fd52111f51c99a6ce41384e9ef", "tree": "8731e7e772e6f825ebbc6eef7681bc46302149bd", "parents": [ "40b7e05e17eef31ff30fe08dfc2424ef653a792c", "220bf991b0366cc50a94feede3d7341fa5710ee4" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Mar 22 18:46:57 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Mar 22 18:47:01 2010 +0100" }, "message": "Merge commit \u0027v2.6.34-rc2\u0027 into perf/core\n\nMerge reason: Pick up latest perf fixes from upstream.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "15c989d4d14b82f43cae7efc6a7794cdd556f274", "tree": "3f1a22991aacf42acaf56467cbe79897146d3e32", "parents": [ "4e3eaddd142e2142c048c5052a0a9d2604fccfc6", "0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 14:45:49 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 14:45:49 2010 -0800" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems\n x86, UV: Fix target_cpus() in x2apic_uv_x.c\n x86: Reduce per cpu warning boot up messages\n x86: Reduce per cpu MCA boot up messages\n x86_64, cpa: Don\u0027t work hard in preserving kernel 2M mappings when using 4K already\n" }, { "commit": "0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9", "tree": "c84df0d86adf5347268939be88426394cd28e18e", "parents": [ "8447b360a3897bdfb0677107564d1dd9ab6e63be" ], "author": { "name": "Borislav Petkov", "email": "bp@amd64.org", "time": "Fri Mar 12 15:43:03 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Mar 13 08:36:16 2010 +0100" }, "message": "x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems\n\nde957628ce7c84764ff41331111036b3ae5bad0f changed setting of the\nx86_init.iommu.iommu_init function ptr only when GART IOMMU is\nfound.\n\nOne side effect of it is that num_k8_northbridges\nis not initialized anymore if not explicitly\ncalled. This resulted in uninitialized pointers in\n\u003carch/x86/kernel/cpu/intel_cacheinfo.c:amd_calc_l3_indices()\u003e,\nfor example, which uses the num_k8_northbridges thing through\nnode_to_k8_nb_misc().\n\nFix that through an initcall that runs right after the PCI\nsubsystem and does all the scanning. Then, remove initialization\nin gart_iommu_init() which is a rootfs_initcall and we\u0027re\nrunning before that.\n\nWhat is more, since num_k8_northbridges is being used in other\nplaces beside GART IOMMU, include it whenever we add AMD CPU\nsupport. The previous dependency chain in kconfig contained\n\nK8_NB depends on AGP_AMD64|GART_IOMMU\n\nwhich was clearly incorrect. The more natural way in terms of\nhardware dependency should be\n\nAGP_AMD64|GART_IOMMU depends on K8_NB depends on CPU_SUP_AMD \u0026\u0026\nPCI. Make it so Number One!\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nCc: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nLKML-Reference: \u003c20100312144303.GA29262@aftab\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nTested-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "3bc4e4590de89c2dfcfb1000344cd072574c9ad4", "tree": "3f870c9c14b4603977ed8c7b7ab1f7d2347276ef", "parents": [ "5637f2df8d56b64697c1ee5c96cf0d6b650b30cb" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Mar 10 15:23:22 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:41 2010 -0800" }, "message": "pci-dma: x86: use include/linux/pci-dma.h\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ba7e4d13fc7e25af1d167d40e6f028298dfc55ad", "tree": "2256022da50cf87b601a43f718d39b4dbcc482c8", "parents": [ "63fb3f9b2312e131be5a0a2dddb63f2fb123db9b" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jun 06 13:58:12 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 10 13:34:12 2010 +0100" }, "message": "perf, x86: Add INSTRUCTION_DECODER config flag\n\nThe PEBS+LBR decoding magic needs the insn_get_length() infrastructure\nto be able to decode x86 instruction length.\n\nSo split it out of KPROBES dependency and make it enabled when either\nKPROBES or PERF_EVENTS is enabled.\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "322aafa6645a48c3b7837ca7385f126ab78127fd", "tree": "50f6665aedcf051cecd571183df81ba7f248014b", "parents": [ "dd04265b028c00c365a78f9ff78a05e217f98656", "c7bbf52aa4fa332b84c4f2bb33e69561ee6870b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 07 15:59:39 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 07 15:59:39 2010 -0800" }, "message": "Merge branch \u0027x86-mrst-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-mrst-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)\n x86, mrst: Fix whitespace breakage in apb_timer.c\n x86, mrst: Fix APB timer per cpu clockevent\n x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC\n x86, olpc: Use pci subarch init for OLPC\n x86, pci: Add arch_init to x86_init abstraction\n x86, mrst: Add Kconfig dependencies for Moorestown\n x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST\u003dn\n x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI\n x86, pci: Add sanity check for PCI fixed bar probing\n x86, legacy_irq: Remove duplicate vector assigment\n x86, legacy_irq: Remove left over nr_legacy_irqs\n x86, mrst: Platform clock setup code\n x86, apbt: Moorestown APB system timer driver\n x86, mrst: Add vrtc platform data setup code\n x86, mrst: Add platform timer info parsing code\n x86, mrst: Fill in PCI functions in x86_init layer\n x86, mrst: Add dummy legacy pic to platform setup\n x86/PCI: Moorestown PCI support\n x86, ioapic: Add dummy ioapic functions\n x86, ioapic: Early enable ioapic for timer irq\n ...\n\nFixed up semantic conflict of new clocksources due to commit\n17622339af25 (\"clocksource: add argument to resume callback\").\n" }, { "commit": "660f6a360be399f4ebdd6572a3d24afe54e9bb1c", "tree": "9c16463c495a656e34577d59c97b58997b61d242", "parents": [ "586fac13f8685bf9dfb32e1ee98bfb14f0dd0061", "e5a11016643d1ab7172193591506d33a844734cc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 05 10:50:22 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 05 10:50:22 2010 -0800" }, "message": "Merge branch \u0027perf-probes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-probes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Issue at least one memory barrier in stop_machine_text_poke()\n perf probe: Correct probe syntax on command line help\n perf probe: Add lazy line matching support\n perf probe: Show more lines after last line\n perf probe: Check function address range strictly in line finder\n perf probe: Use libdw callback routines\n perf probe: Use elfutils-libdw for analyzing debuginfo\n perf probe: Rename probe finder functions\n perf probe: Fix bugs in line range finder\n perf probe: Update perf probe document\n perf probe: Do not show --line option without dwarf support\n kprobes: Add documents of jump optimization\n kprobes/x86: Support kprobes jump optimization on x86\n x86: Add text_poke_smp for SMP cross modifying code\n kprobes/x86: Cleanup save/restore registers\n kprobes/x86: Boost probes when reentering\n kprobes: Jump optimization sysctl interface\n kprobes: Introduce kprobes jump optimization\n kprobes: Introduce generic insn_slot framework\n kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE\n" }, { "commit": "a626b46e17d0762d664ce471d40bc506b6e721ab", "tree": "445f6ac655ea9247d2e27529f23ba02d0991fec0", "parents": [ "c1dcb4bb1e3e16e9baee578d9bb040e5fba1063e", "dce46a04d55d6358d2d4ab44a4946a19f9425fe2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 03 08:15:05 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 03 08:15:05 2010 -0800" }, "message": "Merge branch \u0027x86-bootmem-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-bootmem-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)\n early_res: Need to save the allocation name in drop_range_partial()\n sparsemem: Fix compilation on PowerPC\n early_res: Add free_early_partial()\n x86: Fix non-bootmem compilation on PowerPC\n core: Move early_res from arch/x86 to kernel/\n x86: Add find_fw_memmap_area\n Move round_up/down to kernel.h\n x86: Make 32bit support NO_BOOTMEM\n early_res: Enhance check_and_double_early_res\n x86: Move back find_e820_area to e820.c\n x86: Add find_early_area_size\n x86: Separate early_res related code from e820.c\n x86: Move bios page reserve early to head32/64.c\n sparsemem: Put mem map for one node together.\n sparsemem: Put usemap for one node together\n x86: Make 64 bit use early_res instead of bootmem before slab\n x86: Only call dma32_reserve_bootmem 64bit !CONFIG_NUMA\n x86: Make early_node_mem get mem \u003e 4 GB if possible\n x86: Dynamically increase early_res array size\n x86: Introduce max_early_res and early_res_count\n ...\n" }, { "commit": "d8111cd91abee016d62b401e057fee66ba80be67", "tree": "74d7049797857acd840c6e0338d6e6681b4578ee", "parents": [ "d5d0e88c1e5b069aadb050ff6ec95df312de876a" ], "author": { "name": "Jacob Pan", "email": "jacob.jun.pan@linux.intel.com", "time": "Tue Mar 02 09:19:28 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Mar 02 18:15:05 2010 -0800" }, "message": "x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC\n\nPCI_IOAPIC is used for PCI hotplug, Moorestown does not have ACPI PCI\nhotplug, as it does not have ACPI. This unnecessary dependency causes\nX86_MRST fail to be selected if ACPI is not selected.\n\nSigned-off-by: Jacob Pan \u003cjacob.jun.pan@linux.intel.com\u003e\nLKML-Reference: \u003c1267550368-7435-1-git-send-email-jacob.jun.pan@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\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": "4b2f3f7d0fe97ad312fb572c8f8d88836ae8fb1e", "tree": "d20afdb3a2c20f211076e6067f2212d4ca50185e", "parents": [ "722a639fd2cec44501c04ae32af57fd822c5a2d5" ], "author": { "name": "Jacob Pan", "email": "jacob.jun.pan@linux.intel.com", "time": "Thu Feb 25 10:02:14 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Feb 25 16:16:26 2010 -0800" }, "message": "x86, mrst: Add Kconfig dependencies for Moorestown\n\nThe Moorestown platform requires IOAPIC for all interrupts from the\nsouth complex, since there is no legacy PIC.\n\nFurthermore, Moorestown I/O requires PCI. Moorestown PCI depends on PCI MMCONFIG\nand DIRECT method to perform device enumeration, as there is no PCI BIOS.\n\n[ hpa: rewrote commit message ]\n\nSigned-off-by: Jacob Pan \u003cjacob.jun.pan@linux.intel.com\u003e\nLKML-Reference: \u003c1267120934-9505-1-git-send-email-jacob.jun.pan@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "a92d152ef9dd89c578ca2ec7118e9de8fb74a75f", "tree": "90ee3c6e1b69e1858f38d994092d1e9d2d86d958", "parents": [ "c54113823c777f035fa7444f8841fbccda4a5cc0" ], "author": { "name": "Pan, Jacob jun", "email": "jacob.jun.pan@intel.com", "time": "Wed Feb 24 16:59:55 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Feb 25 09:04:19 2010 -0800" }, "message": "x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI\n\nThe NUMAQ initialization sets x86_init.pci.init to pci_numaq_init,\nwhich obviously isn\u0027t defined if CONFIG_PCI isn\u0027t defined. This\ndependency was implicit in the past, because pci_numaq_init was\ninvoked from arch/x86/pci/legacy.c, which itself was conditioned on\nCONFIG_PCI.\n\nI suspect that no NUMA-Q machines without PCI were ever built, so\ninstead of complicating the code by adding #ifdefs or stub functions,\njust disable this bit of the configuration space.\n\n[ hpa: rewrote the checkin comment ]\n\nSigned-off-by: Jacob Pan \u003cjacob.jun.pan@intel.com\u003e\nLKML-Reference: \u003c43F901BD926A4E43B106BF17856F0755A321EE1F@orsmsx508.amr.corp.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "c0f7ac3a9edde786bc129d37627953a8b8abefdf", "tree": "8d6f2df2d1a08f2893327dd2a8b6e56525705456", "parents": [ "3d55cc8a058ee96291d6d45b1e35121b9920eca3" ], "author": { "name": "Masami Hiramatsu", "email": "mhiramat@redhat.com", "time": "Thu Feb 25 08:34:46 2010 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 25 17:49:26 2010 +0100" }, "message": "kprobes/x86: Support kprobes jump optimization on x86\n\nIntroduce x86 arch-specific optimization code, which supports\nboth of x86-32 and x86-64.\n\nThis code also supports safety checking, which decodes whole of\na function in which probe is inserted, and checks following\nconditions before optimization:\n - The optimized instructions which will be replaced by a jump instruction\n don\u0027t straddle the function boundary.\n - There is no indirect jump instruction, because it will jumps into\n the address range which is replaced by jump operand.\n - There is no jump/loop instruction which jumps into the address range\n which is replaced by jump operand.\n - Don\u0027t optimize kprobes if it is in functions into which fixup code will\n jumps.\n\nThis uses text_poke_multibyte() which doesn\u0027t support modifying\ncode on NMI/MCE handler. However, since kprobes itself doesn\u0027t\nsupport NMI/MCE code probing, it\u0027s not a problem.\n\nChanges in v9:\n - Use *_text_reserved() for checking the probe can be optimized.\n - Verify jump address range is in 2G range when preparing slot.\n - Backup original code when switching optimized buffer, instead of\n preparing buffer, because there can be int3 of other probes in\n preparing phase.\n - Check kprobe is disabled in arch_check_optimized_kprobe().\n - Strictly check indirect jump opcodes (ff /4, ff /5).\n\nChanges in v6:\n - Split stop_machine-based jump patching code.\n - Update comments and coding style.\n\nChanges in v5:\n - Introduce stop_machine-based jump replacing.\n\nSigned-off-by: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: systemtap \u003csystemtap@sources.redhat.com\u003e\nCc: DLE \u003cdle-develop@lists.sourceforge.net\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Jim Keniston \u003cjkenisto@us.ibm.com\u003e\nCc: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Anders Kaseorg \u003candersk@ksplice.com\u003e\nCc: Tim Abbott \u003ctabbott@ksplice.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Mathieu Desnoyers \u003ccompudj@krystal.dyndns.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nLKML-Reference: \u003c20100225133446.6725.78994.stgit@localhost6.localdomain6\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "bb24c4716185f6e116c440462c65c1f56649183b", "tree": "70af8cb5932207d0b16330f47829bbf084f7b04e", "parents": [ "cf089455966e21aeb8e4cd2669e0c1885667b04e" ], "author": { "name": "Jacob Pan", "email": "jacob.jun.pan@intel.com", "time": "Wed Sep 02 07:37:17 2009 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Feb 24 11:01:21 2010 -0800" }, "message": "x86, apbt: Moorestown APB system timer driver\n\nMoorestown platform does not have PIT or HPET platform timers. Instead it\nhas a bank of eight APB timers. The number of available timers to the os\nis exposed via SFI mtmr tables. All APB timer interrupts are routed via\nioapic rtes and delivered as MSI.\nCurrently, we use timer 0 and 1 for per cpu clockevent devices, timer 2\nfor clocksource.\n\nSigned-off-by: Jacob Pan \u003cjacob.jun.pan@intel.com\u003e\nLKML-Reference: \u003c43F901BD926A4E43B106BF17856F0755A318D2D2@orsmsx508.amr.corp.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "f850c30c8b426ba1688cb63b1a3e534eed03a138", "tree": "b01f27bc57b73cf8311c8135be0ffc8e93b16ed6", "parents": [ "e7b8e675d9c71b868b66f62f725a948047514719" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Feb 10 17:25:17 2010 +0100" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Feb 17 13:13:08 2010 +0100" }, "message": "tracing/kprobes: Make Kconfig dependencies generic\n\nKPROBES_EVENT actually depends on the regs and stack access API\n(b1cf540f) and not on x86.\nSo introduce a new config option which architectures can select if\nthey have the API implemented and switch x86.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Masami Hiramatsu \u003cmhiramat@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nLKML-Reference: \u003c20100210162517.GB6933@osiris.boeblingen.de.ibm.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "580e0ad21d6d6f932461d24b47041e3dd499c23f", "tree": "3476c71849c0f9aa54c160b9a994bf4d211bd697", "parents": [ "dd645cee7b50b61cb2d05b59eb6027679c437af6" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue Feb 16 18:40:35 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Feb 16 21:43:39 2010 -0800" }, "message": "core: Move early_res from arch/x86 to kernel/\n\nThis makes the range reservation feature available to other\narchitectures.\n\n-v2: add get_max_mapped, max_pfn_mapped only defined in x86...\n to fix PPC compiling\n-v3: according to hpa, add CONFIG_HAVE_EARLY_RES\n-v4: fix typo about EARLY_RES in config\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nLKML-Reference: \u003c4B7B5723.4070009@kernel.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "59be5a8e8ce765cf739ec7f07176219972de7481", "tree": "0dead91be8e1ccbbb0514877d4d1c1047cf401f0", "parents": [ "53db62a2529280ff216c941d8a2650204547e44a" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Feb 10 01:20:28 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Feb 12 09:42:39 2010 -0800" }, "message": "x86: Make 32bit support NO_BOOTMEM\n\nLet\u0027s make 32bit consistent with 64bit.\n\n-v2: Andrew pointed out for 32bit that we should use -1ULL\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nLKML-Reference: \u003c1265793639-15071-25-git-send-email-yinghai@kernel.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "08677214e318297f228237be0042aac754f48f1d", "tree": "6d03424f7e287fcf66136b44512328afb1aeee49", "parents": [ "c252a5bb1f57afb1e336d68085217727ca7b2134" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Feb 10 01:20:20 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Feb 12 09:41:59 2010 -0800" }, "message": "x86: Make 64 bit use early_res instead of bootmem before slab\n\nFinally we can use early_res to replace bootmem for x86_64 now.\n\nStill can use CONFIG_NO_BOOTMEM to enable it or not.\n\n-v2: fix 32bit compiling about MAX_DMA32_PFN\n-v3: folded bug fix from LKML message below\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nLKML-Reference: \u003c4B747239.4070907@kernel.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "b160091802d4a76dd063facb09fcf10bf5d5d747", "tree": "fbc6b4c8315fc0088466c6b747d4419a86dc13d2", "parents": [ "3b2e3d85aeb80769fb96c15ee4f6e14135328471" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Sat Jan 23 18:27:47 2010 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Sat Jan 23 18:27:47 2010 -0800" }, "message": "x86: Remove \"x86 CPU features in debugfs\" (CONFIG_X86_CPU_DEBUG)\n\nCONFIG_X86_CPU_DEBUG, which provides some parsed versions of the x86\nCPU configuration via debugfs, has caused boot failures on real\nhardware. The value of this feature has been marginal at best, as all\nthis information is already available to userspace via generic\ninterfaces.\n\nCauses crashes that have not been fixed + minimal utility -\u003e remove.\n\nSee the referenced LKML thread for more information.\n\nReported-by: Ozan Çağlayan \u003cozan@pardus.org.tr\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nLKML-Reference: \u003calpine.LFD.2.00.1001221755320.13231@localhost.localdomain\u003e\nCc: Jaswinder Singh Rajput \u003cjaswinder@kernel.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: \u003cstable@kernel.org\u003e\n" }, { "commit": "a29815a333c6c6e677294bbe5958e771d0aad3fd", "tree": "589a782f1992a7da55469379688deaa9f355b779", "parents": [ "c0f607c608ba889db5250235ba620f818aa44a4d" ], "author": { "name": "Avi Kivity", "email": "avi@qumranet.com", "time": "Sun Jan 10 16:28:09 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 11 09:45:37 2010 -0800" }, "message": "core, x86: make LIST_POISON less deadly\n\nThe list macros use LIST_POISON1 and LIST_POISON2 as undereferencable\npointers in order to trap erronous use of freed list_heads. Unfortunately\nuserspace can arrange for those pointers to actually be dereferencable,\npotentially turning an oops to an expolit.\n\nTo avoid this allow architectures (currently x86_64 only) to override\nthe default values for these pointers with truly-undereferencable values.\nThis is easy on x86_64 as the virtual address space is large and contains\nareas that cannot be mapped.\n\nOther 64-bit architectures will likely find similar unmapped ranges.\n\n[ingo: switch to 0xdead000000000000 as the unmapped area]\n[ingo: add comments, cleanup]\n[jaswinder: eliminate sparse warnings]\n\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "13510997d600a076e064f10587a8f6d20f8fff41", "tree": "add740bac060355140ca6b19b237d0167d83a1ee", "parents": [ "e7db7b4270ed2a606b8c0b5f944a5f92ade0e84c" ], "author": { "name": "Albin Tonnerre", "email": "albin.tonnerre@free-electrons.com", "time": "Fri Jan 08 14:42:45 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 11 09:34:05 2010 -0800" }, "message": "x86: add support for LZO-compressed kernels\n\nThe necessary changes to the x86 Kconfig and boot/compressed to allow the\nuse of this new compression method\n\nSigned-off-by: Albin Tonnerre \u003calbin.tonnerre@free-electrons.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nTested-by: Wu Zhangjin \u003cwuzhangjin@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nTested-by: Russell King \u003crmk@arm.linux.org.uk\u003e\nAcked-by: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "99e8c5a3b875a34d894a711c9a3669858d6adf45", "tree": "cb0feb7052857b9f32b476f9b4d793b8ff628974", "parents": [ "5d27c23df09b702868d9a3bff86ec6abd22963ac" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Dec 17 01:33:54 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 18 13:11:51 2009 +0100" }, "message": "hw-breakpoints: Fix hardware breakpoints -\u003e perf events dependency\n\nThe kbuild\u0027s select command doesn\u0027t propagate through the config\ndependencies.\n\nHence the current rules of hardware breakpoint\u0027s config can\u0027t\nensure perf can never be disabled under us.\n\nWe have:\n\nconfig X86\n\tselects HAVE_HW_BREAKPOINTS\n\nconfig HAVE_HW_BREAKPOINTS\n\tselect PERF_EVENTS\n\nconfig PERF_EVENTS\n\t[...]\n\nx86 will select the breakpoints but that won\u0027t propagate to perf\nevents. The user can still disable the latter, but it is\nnecessary for the breakpoints.\n\nWhat we need is:\n\n - x86 selects HAVE_HW_BREAKPOINTS and PERF_EVENTS\n - HAVE_HW_BREAKPOINTS depends on PERF_EVENTS\n\nso that we ensure PERF_EVENTS is enabled and frozen for x86.\n\nThis fixes the following kind of build errors:\n\n In file included from arch/x86/kernel/hw_breakpoint.c:31:\n include/linux/hw_breakpoint.h: In function \u0027hw_breakpoint_addr\u0027:\n include/linux/hw_breakpoint.h:39: error: \u0027struct perf_event\u0027 has no member named \u0027attr\u0027\n\nv2: Select also ANON_INODES from x86, required for perf\n\nReported-by: Cyrill Gorcunov \u003cgorcunov@gmail.com\u003e\nReported-by: Michal Marek \u003cmmarek@suse.cz\u003e\nReported-by: Andrew Randrianasulu \u003crandrik_a@yahoo.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: K.Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nLKML-Reference: \u003c1261010034-7786-1-git-send-regression-fweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c95d1e53ed89b75a4d7b68d1cbae4607b1479243", "tree": "b82d2ef1e349a3da948fe4c7dbd56ebed0ad0e84", "parents": [ "f3a57a60d3e107d17aebb9e52b61c503e5bc14f9" ], "author": { "name": "Andres Salomon", "email": "dilinger@collabora.co.uk", "time": "Mon Dec 14 18:00:41 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:28 2009 -0800" }, "message": "cs5535: drop the Geode-specific MFGPT/GPIO code\n\nWith generic modular drivers handling all of this stuff, the\ngeode-specific code can go away. The cs5535-gpio, cs5535-mfgpt, and\ncs5535-clockevt drivers now handle this.\n\nSigned-off-by: Andres Salomon \u003cdilinger@collabora.co.uk\u003e\nCc: Jordan Crouse \u003cjordan@cosmicpenguin.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: john stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3c55494670745e523f69b56edb66ca0b50a470c2", "tree": "557d7a2cb785a7938068ae8fee83f0b27ab9891d", "parents": [ "1ea3fa7bbfbe81cfbdcc35748a57c35f9b32c5d6" ], "author": { "name": "Andres Salomon", "email": "dilinger@collabora.co.uk", "time": "Mon Dec 14 18:00:36 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:27 2009 -0800" }, "message": "ALSA: cs5535audio: free OLPC quirks from reliance on MGEODE_LX cpu optimization\n\nPreviously, OLPC support for the mic extensions was only enabled in the\nALSA driver if CONFIG_OLPC and CONFIG_MGEODE_LX were both set. This was\nbecause the old geode GPIO code was written in a manner that assumed\nCONFIG_MGEODE_LX. With the new cs553x-gpio driver, this is no longer the\ncase; as such, we can drop the requirement on CONFIG_MGEODE_LX and instead\ninclude a requirement on GPIOLIB.\n\nWe use the generic GPIO API rather than the cs553x-specific API.\n\nSigned-off-by: Andres Salomon \u003cdilinger@collabora.co.uk\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: Jordan Crouse \u003cjordan@cosmicpenguin.net\u003e\nCc: David Brownell \u003cdavid-b@pacbell.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "86ed4aa457f9c832856156a2ee6477d108825855", "tree": "5a7250b526079a9fe2656eac58fbacf5f7d07da4", "parents": [ "830cd2ac6ecce6b027d947fcdc724dd27a33813a", "fe5ed91ddce85a0ed0e4f92c10b099873ef62167" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 13:38:11 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 13:38:11 2009 -0800" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, mce: don\u0027t restart timer if disabled\n x86: Use -maccumulate-outgoing-args for sane mcount prologues\n x86: Prevent GCC 4.4.x (pentium-mmx et al) function prologue wreckage\n x86: AMD Northbridge: Verify NB\u0027s node is online\n x86 VSDO: Fix Kconfig help\n x86: Fix typo in Intel CPU cache size descriptor\n x86: Add new Intel CPU cache size descriptors\n" }, { "commit": "b391738bd1c708fe85592410c6a7c9752689481d", "tree": "e4a27d1b98725dcc42eae65f72a9ac4375420faa", "parents": [ "e33c01972239fee4696679ae5f7d1f340f424999", "2fb8f4e6a83dcaec15c1dd0ee8a6f618e7ece7f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 13:34:17 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 13:34:17 2009 -0800" }, "message": "Merge branch \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: pat: Remove ioremap_default()\n x86: pat: Clean up req_type special case for reserve_memtype()\n x86: Relegate CONFIG_PAT and CONFIG_MTRR configurability to EMBEDDED\n" }, { "commit": "ed9216c1717a3f3738a77908aff78995ea69e7ff", "tree": "c6b5ace7c333dabbf1d94074a13a98244bcdfb26", "parents": [ "d7fc02c7bae7b1cf69269992cf880a43a350cdaa", "d5696725b2a4c59503f5e0bc33adeee7f30cd45b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:02:38 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:02:38 2009 -0800" }, "message": "Merge branch \u0027kvm-updates/2.6.33\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.33\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (84 commits)\n KVM: VMX: Fix comparison of guest efer with stale host value\n KVM: s390: Fix prefix register checking in arch/s390/kvm/sigp.c\n KVM: Drop user return notifier when disabling virtualization on a cpu\n KVM: VMX: Disable unrestricted guest when EPT disabled\n KVM: x86 emulator: limit instructions to 15 bytes\n KVM: s390: Make psw available on all exits, not just a subset\n KVM: x86: Add KVM_GET/SET_VCPU_EVENTS\n KVM: VMX: Report unexpected simultaneous exceptions as internal errors\n KVM: Allow internal errors reported to userspace to carry extra data\n KVM: Reorder IOCTLs in main kvm.h\n KVM: x86: Polish exception injection via KVM_SET_GUEST_DEBUG\n KVM: only clear irq_source_id if irqchip is present\n KVM: x86: disallow KVM_{SET,GET}_LAPIC without allocated in-kernel lapic\n KVM: x86: disallow multiple KVM_CREATE_IRQCHIP\n KVM: VMX: Remove vmx-\u003emsr_offset_efer\n KVM: MMU: update invlpg handler comment\n KVM: VMX: move CR3/PDPTR update to vmx_set_cr3\n KVM: remove duplicated task_switch check\n KVM: powerpc: Fix BUILD_BUG_ON condition\n KVM: VMX: Use shared msr infrastructure\n ...\n\nTrivial conflicts due to new Kconfig options in arch/Kconfig and kernel/Makefile\n" }, { "commit": "58988b07cfe2ebe9f9b39d973fd8a083390e749f", "tree": "f7a164abe85b8aa768c58a80c1261208372fb4b0", "parents": [ "22763c5cf3690a681551162c15d34d935308c8d7", "8e7cac79808b62f242069a6ac88d364d35621371" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Dec 03 09:30:06 2009 +0200" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Dec 03 09:30:06 2009 +0200" }, "message": "Merge remote branch \u0027tip/x86/entry\u0027 into kvm-updates/2.6.33\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "96200591a34f8ecb98481c626125df43a2463b55", "tree": "314c376b01f254d04f9aaf449b1f9147ad177fa6", "parents": [ "7031281e02bf951a2259849217193fb9d75a9762", "68efa37df779b3e04280598e8b5b3a1919b65fee" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 21 14:07:23 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Nov 21 14:07:23 2009 +0100" }, "message": "Merge branch \u0027tracing/hw-breakpoints\u0027 into perf/core\n\nConflicts:\n\tarch/x86/kernel/kprobes.c\n\tkernel/trace/Makefile\n\nMerge reason: hw-breakpoints perf integration is looking\n good in testing and in reviews, plus conflicts\n are mounting up - so merge \u0026 resolve.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e84446de5cccd90de7d7ec46527d3b343b022a09", "tree": "403484364e7938809495e152fdbbd0e1537bcce3", "parents": [ "e02e0e1a130b9ca37c5186d38ad4b3aaf58bb149" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Nov 10 15:46:52 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Nov 11 07:26:41 2009 +0100" }, "message": "x86 VSDO: Fix Kconfig help\n\nCOMPAT_VDSO has 2 help text blocks, but kconfig only uses the\nlast one found, so merge the 2 blocks.\n\nIt would be real nice if kconfig would warn about this.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nLKML-Reference: \u003c4AF9FB6C.70003@oracle.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "14a3f40aafacde1dfd6912327ae14df4baf10304", "tree": "66b27a9db33d35e4cd2909b35d21cc36f239aaa6", "parents": [ "02dd0a0613e0d84c7dd8315e3fe6204d005b7c79" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Fri Oct 23 07:31:01 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Oct 23 16:35:23 2009 +0200" }, "message": "x86: Remove STACKPROTECTOR_ALL\n\nSTACKPROTECTOR_ALL has a really high overhead (runtime and stack\nfootprint) and is not really worth it protection wise (the\nnormal STACKPROTECTOR is in effect for all functions with\nbuffers already), so lets just remove the option entirely.\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nReported-by: Chuck Ebbert \u003ccebbert@redhat.com\u003e\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Eric Sandeen \u003csandeen@redhat.com\u003e\nLKML-Reference: \u003c20091023073101.3dce4ebb@infradead.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0f8f86c7bdd1c954fbe153af437a0d91a6c5721a", "tree": "94a8d419a470a4f9852ca397bb9bbe48db92ff5c", "parents": [ "dca2d6ac09d9ef59ff46820d4f0c94b08a671202", "f39cdf25bf77219676ec5360980ac40b1a7e144a" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Oct 18 01:09:09 2009 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Oct 18 01:12:33 2009 +0200" }, "message": "Merge commit \u0027perf/core\u0027 into perf/hw-breakpoint\n\nConflicts:\n\tkernel/Makefile\n\tkernel/trace/Makefile\n\tkernel/trace/trace.h\n\tsamples/Makefile\n\nMerge reason: We need to be uptodate with the perf events development\nbranch because we plan to rewrite the breakpoints API on top of\nperf events.\n" }, { "commit": "c03cb3149daed3e411657e3212d05ae27cf1a874", "tree": "4a3d731dbb36e97b2ed0b1b53b2f765fc9bfd48b", "parents": [ "d93a8f829fe1d2f3002f2c6ddb553d12db420412" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Sun Oct 11 10:33:02 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Oct 12 13:06:57 2009 +0200" }, "message": "x86: Relegate CONFIG_PAT and CONFIG_MTRR configurability to EMBEDDED\n\nMTRR and PAT support (which got added to CPUs over 10 years ago)\nare no longer really optional in that more and more things are\ndepending on PAT just working, including various drivers and newer\nversions of X. (to not even speak of MTRR)\n\nHaving this as a regular config option just no longer makes sense.\n\nThis patch relegates CONFIG_X86_PAT to the EMBEDDED category so\nultra-embedded can still disable it if they really need to.\n\nAlso-Suggested-by: Roland Dreier \u003crdreier@cisco.com\u003e\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nLKML-Reference: \u003c20091011103302.62bded41@infradead.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d0153ca35d344d9b640dc305031b0703ba3f30f0", "tree": "969edf8a9d389abf5cded1af6dcf9334ddd235cf", "parents": [ "f579bbcd9bb8b688df03191b92c56ab8af4d6322" ], "author": { "name": "Alok Kataria", "email": "akataria@vmware.com", "time": "Tue Sep 29 10:25:24 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 08 22:27:55 2009 +0200" }, "message": "x86, vmi: Mark VMI deprecated and schedule it for removal\n\nAdd text in feature-removal.txt indicating that VMI will be removed in\nthe 2.6.37 timeframe.\n\nSigned-off-by: Alok N Kataria \u003cakataria@vmware.com\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nLKML-Reference: \u003c1254193238.13456.48.camel@ank32.eng.vmware.com\u003e\n[ removed a bogus Kconfig change, marked (DEPRECATED) in Kconfig ]\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7c68af6e32c73992bad24107311f3433c89016e2", "tree": "9046ac5339f944e8ddccd34be226790b953dda61", "parents": [ "817b33d38f81c8736d39283c35c886ae4668f1af" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sat Sep 19 09:40:22 2009 +0300" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Oct 01 12:12:18 2009 -0700" }, "message": "core, x86: Add user return notifiers\n\nAdd a general per-cpu notifier that is called whenever the kernel is\nabout to return to userspace. The notifier uses a thread_info flag\nand existing checks, so there is no impact on user return or context\nswitch fast paths.\n\nThis will be used initially to speed up KVM task switching by lazily\nupdating MSRs.\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\nLKML-Reference: \u003c1253342422-13811-1-git-send-email-avi@redhat.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "4701472e441e41be2549a25228f703bc9cd13b5b", "tree": "33c61fe1d2d135c2f330ed61456b8714e982619d", "parents": [ "ea3acb199a5d7e4da1de0a4288eba993b29f33b9" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinder@kernel.org", "time": "Sat Sep 26 21:41:41 2009 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Oct 01 10:59:08 2009 +0200" }, "message": "x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL\n\nRemove unused CONFIG FAST_CMPXCHG_LOCAL from Kconfig.\n\nReported-by: Robert P. J. Day \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nAcked-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: \"Robert P. J. Day\" \u003crpjday@crashcourse.ca\u003e\nCc: linux-mm@kvack.org\nLKML-Reference: \u003c1253981501.4568.61.camel@ht.satnam\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d949f36f1865c60239d4265b50c4b75354fcb8f3", "tree": "176a784ce7f6a71dc3ff544b70606f71025a13d8", "parents": [ "0d9df2515dbceb67d343c0f10fd3ff218380d524" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 26 09:35:07 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Sep 27 09:55:11 2009 +0200" }, "message": "x86: Fix hwpoison code related build failure on 32-bit NUMAQ\n\nThis build failure triggers:\n\n In file included from include/linux/suspend.h:8,\n from arch/x86/kernel/asm-offsets_32.c:11,\n from arch/x86/kernel/asm-offsets.c:2:\n include/linux/mm.h:503:2: error: #error SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH \u003e BITS_PER_LONG - NR_PAGEFLAGS\n\nBecause due to the hwpoison page flag we ran out of page\nflags on 32-bit.\n\nDont turn on hwpoison on 32-bit NUMA (it\u0027s rare in any\ncase).\n\nAlso clean up the Kconfig dependencies in the generic MM\ncode by introducing ARCH_SUPPORTS_MEMORY_FAILURE.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b09a75fc5e77b7c58d097236f89b1ff72dcdb562", "tree": "8f818f1b3e44d9bc822b13dc7c368077981dd6ea", "parents": [ "cf63ff5fa4399e215cc5ef322ccd8bddfff9afa6", "b94996c99c8befed9cbbb8804a4625e203913318" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:06:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:06:10 2009 -0700" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6: (23 commits)\n intel-iommu: Disable PMRs after we enable translation, not before\n intel-iommu: Kill DMAR_BROKEN_GFX_WA option.\n intel-iommu: Fix integer wrap on 32 bit kernels\n intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()\n intel-iommu: Limit DOMAIN_MAX_PFN to fit in an \u0027unsigned long\u0027\n intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS\n intel-iommu: Disallow interrupt remapping if not all ioapics covered\n intel-iommu: include linux/dmi.h to use dmi_ routines\n pci/dmar: correct off-by-one error in dmar_fault()\n intel-iommu: Cope with yet another BIOS screwup causing crashes\n intel-iommu: iommu init error path bug fixes\n intel-iommu: Mark functions with __init\n USB: Work around BIOS bugs by quiescing USB controllers earlier\n ia64: IOMMU passthrough mode shouldn\u0027t trigger swiotlb init\n intel-iommu: make domain_add_dev_info() call domain_context_mapping()\n intel-iommu: Unify hardware and software passthrough support\n intel-iommu: Cope with broken HP DC7900 BIOS\n iommu\u003dpt is a valid early param\n intel-iommu: double kfree()\n intel-iommu: Kill pointless intel_unmap_single() function\n ...\n\nFixed up trivial include lines conflict in drivers/pci/intel-iommu.c\n" }, { "commit": "746942d06acdb4dd78d16baa5f3728a48a033bdd", "tree": "1470ffab015f6b7c2ff6f44314f9fab17d3a4c3f", "parents": [ "c11f6c82581e8be4e1829c677db54e7f55cebece", "c602c65b2f81d14456771d1e3f15d1381f4b7efa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:34:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:34:07 2009 -0700" }, "message": "Merge branch \u0027sfi-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6\n\n* \u0027sfi-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:\n SFI: remove unneeded includes\n sfi: Remove unused code\n SFI: Hook PCI MMCONFIG\n x86: add arch-specific SFI support\n SFI: add capability to parse ACPI tables\n SFI: add platform-independent core support\n SFI: create linux/sfi.h\n SFI: Simple Firmware Interface - MAINTAINERS, Kconfig\n" }, { "commit": "9492587cf35d370db33ef4b38375dfb35a105b61", "tree": "59daaf91e847d3c5cd6f542626da75db5814b06d", "parents": [ "a0614da88b67ffa3dbcc0d40b817e682c7c4a0ee" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Sep 22 16:45:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:41 2009 -0700" }, "message": "kcore: register text area in generic way\n\nSome 64bit arch has special segment for mapping kernel text. It should be\nentried to /proc/kcore in addtion to direct-linear-map, vmalloc area.\nThis patch unifies KCORE_TEXT entry scattered under x86 and ia64.\n\nI\u0027m not familiar with other archs (mips has its own even after this patch)\nbut range of [_stext ..._end) is a valid area of text and it\u0027s not in\ndirect-map area, defining CONFIG_ARCH_PROC_KCORE_TEXT is only a necessary\nthing to do.\n\nNote: I left mips as it is now.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cdd6c482c9ff9c55475ee7392ec8f672eddb7be6", "tree": "81f98a3ab46c589792057fe2392c1e10f8ad7893", "parents": [ "dfc65094d0313cc48969fa60bcf33d693aeb05a7" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 12:02:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 14:28:04 2009 +0200" }, "message": "perf: Do the big rename: Performance Counters -\u003e Performance Events\n\nBye-bye Performance Counters, welcome Performance Events!\n\nIn the past few months the perfcounters subsystem has grown out its\ninitial role of counting hardware events, and has become (and is\nbecoming) a much broader generic event enumeration, reporting, logging,\nmonitoring, analysis facility.\n\nNaming its core object \u0027perf_counter\u0027 and naming the subsystem\n\u0027perfcounters\u0027 has become more and more of a misnomer. With pending\ncode like hw-breakpoints support the \u0027counter\u0027 name is less and\nless appropriate.\n\nAll in one, we\u0027ve decided to rename the subsystem to \u0027performance\nevents\u0027 and to propagate this rename through all fields, variables\nand API names. (in an ABI compatible fashion)\n\nThe word \u0027event\u0027 is also a bit shorter than \u0027counter\u0027 - which makes\nit slightly more convenient to write/handle as well.\n\nThanks goes to Stephane Eranian who first observed this misnomer and\nsuggested a rename.\n\nUser-space tooling and ABI compatibility is not affected - this patch\nshould be function-invariant. (Also, defconfigs were not touched to\nkeep the size down.)\n\nThis patch has been generated via the following script:\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/PERF_EVENT_/PERF_RECORD_/g\u0027 \\\n -e \u0027s/PERF_COUNTER/PERF_EVENT/g\u0027 \\\n -e \u0027s/perf_counter/perf_event/g\u0027 \\\n -e \u0027s/nb_counters/nb_events/g\u0027 \\\n -e \u0027s/swcounter/swevent/g\u0027 \\\n -e \u0027s/tpcounter_event/tp_event/g\u0027 \\\n $FILES\n\n for N in $(find . -name perf_counter.[ch]); do\n M\u003d$(echo $N | sed \u0027s/perf_counter/perf_event/g\u0027)\n mv $N $M\n done\n\n FILES\u003d$(find . -name perf_event.*)\n\n sed -i \\\n -e \u0027s/COUNTER_MASK/REG_MASK/g\u0027 \\\n -e \u0027s/COUNTER/EVENT/g\u0027 \\\n -e \u0027s/\\\u003cevent\\\u003e/event_id/g\u0027 \\\n -e \u0027s/counter/event/g\u0027 \\\n -e \u0027s/Counter/Event/g\u0027 \\\n $FILES\n\n... to keep it as correct as possible. This script can also be\nused by anyone who has pending perfcounters patches - it converts\na Linux kernel tree over to the new naming. We tried to time this\nchange to the point in time where the amount of pending patches\nis the smallest: the end of the merge window.\n\nNamespace clashes were fixed up in a preparatory patch - and some\nstylistic fallout will be fixed up in a subsequent patch.\n\n( NOTE: \u0027counters\u0027 are still the proper terminology when we deal\n with hardware registers - and these sed scripts are a bit\n over-eager in renaming them. I\u0027ve undone some of that, but\n in case there\u0027s something left where \u0027counter\u0027 would be\n better than \u0027event\u0027 we can undo that on an individual basis\n instead of touching an otherwise nicely automated patch. )\n\nSuggested-by: Stephane Eranian \u003ceranian@google.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nReviewed-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0c02a20ff7695f9c54cc7c013dda326270ccdac8", "tree": "b3ab998e983d625af1f9af318199b0c025000609", "parents": [ "64de5af000e99f32dd49ff5dd9a0fd7db1f60305" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Sep 19 09:37:23 2009 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Sep 19 09:37:23 2009 -0700" }, "message": "intel-iommu: Kill DMAR_BROKEN_GFX_WA option.\n\nJust make it depend on BROKEN for now, in case people scream really loud\nabout it (and because we might want to keep some of this logic for an\nupcoming BIOS workaround, so I don\u0027t just want to rip it out entirely\njust yet). But for graphics devices, it really ought to be unnecessary.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "c602c65b2f81d14456771d1e3f15d1381f4b7efa", "tree": "f1f833c8dd6c1519eeb101be32f7fe54a9605af5", "parents": [ "3834f47291df475be3f0f0fb7ccaa098967cc054", "78f28b7c555359c67c2a0d23f7436e915329421e" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Sep 19 00:11:26 2009 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sat Sep 19 00:11:26 2009 -0400" }, "message": "Merge branch \u0027linus\u0027 into sfi-release\n\nConflicts:\n\tarch/x86/kernel/setup.c\n\tdrivers/acpi/power.c\n\tinit/main.c\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "78f28b7c555359c67c2a0d23f7436e915329421e", "tree": "7f8197f82f83c0c19fd9bc85b5d10b5a755d0656", "parents": [ "3240a77b515f4a15e24d8a3a2135bc87b02cf1d6", "7bd867dfb4e0357e06a3211ab2bd0e714110def3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 14:05:47 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 14:05:47 2009 -0700" }, "message": "Merge branch \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)\n x86: Move get/set_wallclock to x86_platform_ops\n x86: platform: Fix section annotations\n x86: apic namespace cleanup\n x86: Distangle ioapic and i8259\n x86: Add Moorestown early detection\n x86: Add hardware_subarch ID for Moorestown\n x86: Add early platform detection\n x86: Move tsc_init to late_time_init\n x86: Move tsc_calibration to x86_init_ops\n x86: Replace the now identical time_32/64.c by time.c\n x86: time_32/64.c unify profile_pc\n x86: Move calibrate_cpu to tsc.c\n x86: Make timer setup and global variables the same in time_32/64.c\n x86: Remove mca bus ifdef from timer interrupt\n x86: Simplify timer_ack magic in time_32.c\n x86: Prepare unification of time_32/64.c\n x86: Remove do_timer hook\n x86: Add timer_init to x86_init_ops\n x86: Move percpu clockevents setup to x86_init_ops\n x86: Move xen_post_allocator_init into xen_pagetable_setup_done\n ...\n\nFix up conflicts in arch/x86/include/asm/io_apic.h\n" }, { "commit": "df58bee21ed218cb7dfb561a590b1bd2a99531cf", "tree": "885acc2720996707dacb1da5700051a8ed99c655", "parents": [ "dcbf77b9e86e1726f5fbd01bb98820dac06d456e", "e34e77ce348feac3c8c607774efb1f8a9262127d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 21:07:08 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 21:07:08 2009 -0700" }, "message": "Merge branch \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits)\n x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c\n x86, mce: CE in last bank prevents panic by unknown MCE\n x86, mce: Fake panic support for MCE testing\n x86, mce: Move debugfs mce dir creating to mce.c\n x86, mce: Support specifying raise mode for software MCE injection\n x86, mce: Support specifying context for software mce injection\n x86, mce: fix reporting of Thermal Monitoring mechanism enabled\n x86, mce: remove never executed code\n x86, mce: add missing __cpuinit tags\n x86, mce: fix \"mce\" boot option handling for CONFIG_X86_NEW_MCE\n x86, mce: don\u0027t log boot MCEs on Pentium M (model \u003d\u003d 13) CPUs\n x86: mce: Lower maximum number of banks to architecture limit\n x86: mce: macros to compute banks MSRs\n x86: mce: Move per bank data in a single datastructure\n x86: mce: Move code in mce.c\n x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE\n x86: mce: Remove old i386 machine check code\n x86: mce: Update X86_MCE description in x86/Kconfig\n x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE\n x86, mce: use atomic_inc_return() instead of add by 1\n ...\n\nManually fixed up trivial conflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tarch/x86/kernel/cpu/mcheck/mce.c\n" }, { "commit": "ada3fa15057205b7d3f727bba5cd26b5912e350f", "tree": "60962fc9e4021b92f484d1a58e72cd3906d4f3db", "parents": [ "2f82af08fcc7dc01a7e98a49a5995a77e32a2925", "5579fd7e6aed8860ea0c8e3f11897493153b10ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:39:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:39:44 2009 -0700" }, "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: (46 commits)\n powerpc64: convert to dynamic percpu allocator\n sparc64: use embedding percpu first chunk allocator\n percpu: kill lpage first chunk allocator\n x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA\n percpu: update embedding first chunk allocator to handle sparse units\n percpu: use group information to allocate vmap areas sparsely\n vmalloc: implement pcpu_get_vm_areas()\n vmalloc: separate out insert_vmalloc_vm()\n percpu: add chunk-\u003ebase_addr\n percpu: add pcpu_unit_offsets[]\n percpu: introduce pcpu_alloc_info and pcpu_group_info\n percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward\n percpu: add @align to pcpu_fc_alloc_fn_t\n percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()\n percpu: drop @static_size from first chunk allocators\n percpu: generalize first chunk allocator selection\n percpu: build first chunk allocators selectively\n percpu: rename 4k first chunk allocator to page\n percpu: improve boot messages\n percpu: fix pcpu_reclaim() locking\n ...\n\nFix trivial conflict as by Tejun Heo in kernel/sched.c\n" }, { "commit": "227423904c709a8e60245c97081bbeb4fb500655", "tree": "97db1b8df1e4518334aea2fdf60363e0a691eb1e", "parents": [ "1aaf2e59135fd67321f47c11c64a54aac27014e9", "fa526d0d641b5365676a1fb821ce359e217c9b85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:19:38 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:19:38 2009 -0700" }, "message": "Merge branch \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-pat-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, pat: Fix cacheflush address in change_page_attr_set_clr()\n mm: remove !NUMA condition from PAGEFLAGS_EXTENDED condition set\n x86: Fix earlyprintk\u003ddbgp for machines without NX\n x86, pat: Sanity check remap_pfn_range for RAM region\n x86, pat: Lookup the protection from memtype list on vm_insert_pfn()\n x86, pat: Add lookup_memtype to get the current memtype of a paddr\n x86, pat: Use page flags to track memtypes of RAM pages\n x86, pat: Generalize the use of page flag PG_uncached\n x86, pat: Add rbtree to do quick lookup in memtype tracking\n x86, pat: Add PAT reserve free to io_mapping* APIs\n x86, pat: New i/f for driver to request memtype for IO regions\n x86, pat: ioremap to follow same PAT restrictions as other PAT users\n x86, pat: Keep identity maps consistent with mmaps even when pat_disabled\n x86, mtrr: make mtrr_aps_delayed_init static bool\n x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init\n generic-ipi: Allow cpus not yet online to call smp_call_function with irqs disabled\n x86: Fix an incorrect argument of reserve_bootmem()\n x86: Fix system crash when loading with \"reservetop\" parameter\n" }, { "commit": "1aaf2e59135fd67321f47c11c64a54aac27014e9", "tree": "633ffa4db3ac6e8d566cba549510561ffd61d8f4", "parents": [ "66a4fe0cb80a9fde8cb173289afb863fd279466a", "936e894a976dd3b0f07f1f6f43c17b77b7e6146d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:19:20 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:19:20 2009 -0700" }, "message": "Merge branch \u0027x86-txt-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-txt-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, intel_txt: clean up the impact on generic code, unbreak non-x86\n x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE\n x86, intel_txt: Fix typos in Kconfig help\n x86, intel_txt: Factor out the code for S3 setup\n x86, intel_txt: tboot.c needs \u003casm/fixmap.h\u003e\n intel_txt: Force IOMMU on for Intel TXT launch\n x86, intel_txt: Intel TXT Sx shutdown support\n x86, intel_txt: Intel TXT reboot/halt shutdown support\n x86, intel_txt: Intel TXT boot support\n" }, { "commit": "dca2d6ac09d9ef59ff46820d4f0c94b08a671202", "tree": "fdec753b842dad09e3a4151954fab3eb5c43500d", "parents": [ "d6a65dffb30d8636b1e5d4c201564ef401a246cf", "18240904960a39e582ced8ba8ececb10b8c22dd3" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 15 12:18:15 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 15 12:18:15 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into tracing/hw-breakpoints\n\nConflicts:\n\tarch/x86/kernel/process_64.c\n\nSemantic conflict fixed in:\n\tarch/x86/kvm/x86.c\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "483e3cd6a34ad2d7e41100bc1b98614ac42a4567", "tree": "ef544ccdd1e95991c32fd8b656714583b7398371", "parents": [ "774a694f8cd08115d130a290d73c6d8563f26b1b", "d28daf923ac5e4a0d7cecebae56f3e339189366b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:24:03 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:24:03 2009 -0700" }, "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: (105 commits)\n ring-buffer: only enable ring_buffer_swap_cpu when needed\n ring-buffer: check for swapped buffers in start of committing\n tracing: report error in trace if we fail to swap latency buffer\n tracing: add trace_array_printk for internal tracers to use\n tracing: pass around ring buffer instead of tracer\n tracing: make tracing_reset safe for external use\n tracing: use timestamp to determine start of latency traces\n tracing: Remove mentioning of legacy latency_trace file from documentation\n tracing/filters: Defer pred allocation, fix memory leak\n tracing: remove users of tracing_reset\n tracing: disable buffers and synchronize_sched before resetting\n tracing: disable update max tracer while reading trace\n tracing: print out start and stop in latency traces\n ring-buffer: disable all cpu buffers when one finds a problem\n ring-buffer: do not count discarded events\n ring-buffer: remove ring_buffer_event_discard\n ring-buffer: fix ring_buffer_read crossing pages\n ring-buffer: remove unnecessary cpu_relax\n ring-buffer: do not swap buffers during a commit\n ring-buffer: do not reset while in a commit\n ...\n" }, { "commit": "a1922ed661ab2c1637d0b10cde933bd9cd33d965", "tree": "0f1777542b385ebefd30b3586d830fd8ed6fda5b", "parents": [ "75e33751ca8bbb72dd6f1a74d2810ddc8cbe4bdf", "d28daf923ac5e4a0d7cecebae56f3e339189366b" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 07 08:19:51 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 07 08:19:51 2009 +0200" }, "message": "Merge branch \u0027tracing/core\u0027 into tracing/hw-breakpoints\n\nConflicts:\n\tarch/Kconfig\n\tkernel/trace/trace.h\n\nMerge reason: resolve the conflicts, plus adopt to the new\n ring-buffer APIs.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ed011b22ce567eabefa9ea571d3721c10ecd0553", "tree": "c7aee6684613075c772388a99a9137014549434e", "parents": [ "85bac32c4a52c592b857f2c360cc5ec93a097d70", "e07cccf4046978df10f2e13fe2b99b2f9b3a65db" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Sep 06 06:11:38 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Sep 06 06:11:42 2009 +0200" }, "message": "Merge commit \u0027v2.6.31-rc9\u0027 into tracing/core\n\nMerge reason: move from -rc5 to -rc9.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6ac162d6c01ac7626f46c68c0770556cf682ce34", "tree": "0fe446984c99f88490c11a759ea75a2d7a9bea45", "parents": [ "37d0892c5a94e208cf863e3b7bac014edee4346d" ], "author": { "name": "Pavel Vasilyev", "email": "pavel@pavlinux.ru", "time": "Thu Sep 03 16:20:55 2009 +0200" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Thu Sep 03 16:20:55 2009 +0200" }, "message": "x86/gart: Do not select AGP for GART_IOMMU\n\nThere is no dependency from the gart code to the agp code.\nAnd since a lot of systems today do not have agp anymore\nremove this dependency from the kernel configuration.\n\nSigned-off-by: Pavel Vasilyev \u003cpavel@pavlinux.ru\u003e\nSigned-off-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\n" }, { "commit": "936e894a976dd3b0f07f1f6f43c17b77b7e6146d", "tree": "5ed5c1f6735dcd26550594df23c8f7fe2aa21a15", "parents": [ "69575d388603365f2afbf4166df93152df59b165", "326ba5010a5429a5a528b268b36a5900d4ab0eba" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Sep 02 08:17:56 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Sep 02 08:17:56 2009 +0200" }, "message": "Merge commit \u0027v2.6.31-rc8\u0027 into x86/txt\n\nConflicts:\n\tarch/x86/kernel/reboot.c\n\tsecurity/Kconfig\n\nMerge reason: resolve the conflicts, bump up from rc3 to rc8.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "69575d388603365f2afbf4166df93152df59b165", "tree": "ca3d66668c8ec47befc0adbfa62cf135229bda59", "parents": [ "62a3207b8cf3de35368cdc3822b30b82d59eea95" ], "author": { "name": "Shane Wang", "email": "shane.wang@intel.com", "time": "Tue Sep 01 18:25:07 2009 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Sep 01 18:25:07 2009 -0700" }, "message": "x86, intel_txt: clean up the impact on generic code, unbreak non-x86\n\nMove tboot.h from asm to linux to fix the build errors of intel_txt\npatch on non-X86 platforms. Remove the tboot code from generic code\ninit/main.c and kernel/cpu.c.\n\nSigned-off-by: Shane Wang \u003cshane.wang@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "3f4110a48a749a1aa1c54fb807afb3f32f49711c", "tree": "5c0cab75bbb0868b59ee9a5b9f76fb2f5d325211", "parents": [ "162bc7ab01a00eba1c5d614e64a51e1268ee3f96" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Aug 29 14:54:20 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Aug 31 11:09:40 2009 +0200" }, "message": "x86: Add Moorestown early detection\n\nMoorestown MID devices need to be detected early in the boot process\nto setup and do not call x86_default_early_setup as there is no EBDA\nregion to reserve.\n\n[ Copied the minimal code from Jacobs latest MRST series ]\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Jacob Pan \u003cjacob.jun.pan@intel.com\u003e\n" }, { "commit": "5f0db7a2fb78895a197f64e548333b3bbd433996", "tree": "f567926a5c29626553b3b8918eaa4c57502c0bce", "parents": [ "efafc8b213e67ed148a5b53ade29ee7b48af907d" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Fri Aug 14 15:37:50 2009 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Aug 28 19:57:34 2009 -0400" }, "message": "SFI: Hook PCI MMCONFIG\n\nFirst check ACPI, and if that fails, ask SFI to find the MCFG.\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "efafc8b213e67ed148a5b53ade29ee7b48af907d", "tree": "416ffc86b22dcb4a7825b7148d208ff52bdd50d3", "parents": [ "13e82d023c4c3f13ab1e665cbb917a7ebba8935c" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Fri Aug 14 15:23:29 2009 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Aug 28 19:57:34 2009 -0400" }, "message": "x86: add arch-specific SFI support\n\narch/x86/kernel/sfi.c serves the dual-purpose of supporting the\nSFI core with arch specific code, as well as a home for the\narch-specific code that uses SFI.\n\nanalogous to ACPI, drivers/sfi/Kconfig is pulled in by arch/x86/Kconfig\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\nCc: x86@kernel.org\n" }, { "commit": "b855192c08fcb14adbc5d3a7cab182022d433cca", "tree": "3a10cafbfbf98cafacf667eb218c71300b351bfa", "parents": [ "d886c73cd4cf02a71e1650cbcb6176799d78aac1", "3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Aug 26 17:17:51 2009 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Aug 26 17:24:28 2009 -0700" }, "message": "Merge branch \u0027x86/urgent\u0027 into x86/pat\n\nReason: Change to is_new_memtype_allowed() in x86/urgent\n\nResolved semantic conflicts in:\n\n\t arch/x86/mm/pat.c\n\t arch/x86/mm/ioremap.c\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "46cf98cdaef5471926010b5bddf84c44ec177fdd", "tree": "e4be7eb533b1d6bb090ceaa8b1a50c0970bf0ef2", "parents": [ "335ef896d4c6639849d79367f0fef9abc06d121b" ], "author": { "name": "Venkatesh Pallipadi", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Jul 10 09:57:37 2009 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Aug 26 15:41:22 2009 -0700" }, "message": "x86, pat: Generalize the use of page flag PG_uncached\n\nOnly IA64 was using PG_uncached as of now. We now intend to use this bit\nin x86 as well, to keep track of memory type of those addresses that\nhave page struct for them. So, generalize the use of that bit across\nia64 and x86.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "667000011927b4fcc359beac4a2447889db6d349", "tree": "d21f0bce17e08479885818792529d3cadf7b8003", "parents": [ "d88cb582325830698de5071fa8b8c9e933dbbcad" ], "author": { "name": "Josh Stone", "email": "jistone@redhat.com", "time": "Mon Aug 24 14:43:11 2009 -0700" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Aug 26 00:17:35 2009 +0200" }, "message": "tracing: Rename FTRACE_SYSCALLS for tracepoints\n\ns/HAVE_FTRACE_SYSCALLS/HAVE_SYSCALL_TRACEPOINTS/g\ns/TIF_SYSCALL_FTRACE/TIF_SYSCALL_TRACEPOINT/g\n\nThe syscall enter/exit tracing is no longer specific to just ftrace, so\nthey now have names that reflect their tie to tracepoints instead.\n\nSigned-off-by: Josh Stone \u003cjistone@redhat.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@polymtl.ca\u003e\nCc: Jiaying Zhang \u003cjiayingz@google.com\u003e\nCc: Martin Bligh \u003cmbligh@google.com\u003e\nCc: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nLKML-Reference: \u003c1251150194-1713-2-git-send-email-jistone@redhat.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "4518e6a0c038b98be4c480e6f4481e8676bd15dd", "tree": "81b222a74951186aa85b5dfddae1fcae3b7e8ea9", "parents": [ "c8826dd538602d730ed2c18c6753f1bbfa6c4933" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 15:00:52 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 15:00:52 2009 +0900" }, "message": "x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA\n\nEmbedding percpu first chunk allocator can now handle very sparse unit\nmapping. Use embedding allocator instead of lpage for 64bit NUMA.\nThis removes extra TLB pressure and the need to do complex and fragile\ndancing when changing page attributes.\n\nFor 32bit, using very sparse unit mapping isn\u0027t a good idea because\nthe vmalloc space is very constrained. 32bit NUMA machines aren\u0027t\nexactly the focus of optimization and it isn\u0027t very clear whether\nlpage performs better than page. Use page first chunk allocator for\n32bit NUMAs.\n\nAs this leaves setup_pcpu_*() functions pretty much empty, fold them\ninto setup_per_cpu_areas().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\n" }, { "commit": "08fc45806103e59a37418e84719b878f9bb32540", "tree": "8b39b7769fd42457bdb2950ce02d9893f39c0b7d", "parents": [ "00ae4064b1445524752575dd84df227c0687c99d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 15:00:49 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 15:00:49 2009 +0900" }, "message": "percpu: build first chunk allocators selectively\n\nThere\u0027s no need to build unused first chunk allocators in. Define\nCONFIG_NEED_PER_CPU_*_FIRST_CHUNK and let archs enable them\nselectively.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c", "tree": "04c93f391a1b65c8bf8d7ba8643c07d26c26590a", "parents": [ "a76761b621bcd8336065c4fe3a74f046858bc34c", "142d44b0dd6741a64a7bdbe029110e7c1dcf1d23" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 14:41:02 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 14:45:31 2009 +0900" }, "message": "Merge branch \u0027percpu-for-linus\u0027 into percpu-for-next\n\nConflicts:\n\tarch/sparc/kernel/smp_64.c\n\tarch/x86/kernel/cpu/perf_counter.c\n\tarch/x86/kernel/setup_percpu.c\n\tdrivers/cpufreq/cpufreq_ondemand.c\n\tmm/percpu.c\n\nConflicts in core and arch percpu codes are mostly from commit\ned78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many\nnum_possible_cpus() with nr_cpu_ids. As for-next branch has moved all\nthe first chunk allocators into mm/percpu.c, the changes are moved\nfrom arch code to mm/percpu.c.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "04da8a43da804723a550f00dd158fd5b5e25ae35", "tree": "002fa5e83efaa745b7eaddd329c2aa9d79d2d2f6", "parents": [ "0a5ac84650fb7a7f226814103d95724e34b012ae" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Aug 11 10:40:08 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Aug 12 14:12:49 2009 +0200" }, "message": "perf_counter, x86: Fix/improve apic fallback\n\nJohannes Stezenbach reported that his Pentium-M based\nlaptop does not have the local APIC enabled by default,\nand hence perfcounters do not get initialized.\n\nAdd a fallback for this case: allow non-sampled counters\nand return with an error on sampled counters. This allows\n\u0027perf stat\u0027 to work out of box - and allows \u0027perf top\u0027\nand \u0027perf record\u0027 to fall back on a hrtimer based sampling\nmethod.\n\n( Passing \u0027lapic\u0027 on the boot line will allow hardware\n sampling to occur - but if the APIC is disabled\n permanently by the hardware then this fallback still\n allows more systems to use perfcounters. )\n\nAlso decouple perfcounter support from X86_LOCAL_APIC.\n\n-v2: fix typo breaking counters on all other systems ...\n\nReported-by: Johannes Stezenbach \u003cjs@sig21.net\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c1ebf835617035b1f08f734247dcb981e17aac6b", "tree": "7d47021cef80d34032da007d2b9e7c4be9ed8e89", "parents": [ "5bb38adcb54cf7192b154368ad62982caa11ca0b" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Thu Jul 09 00:31:41 2009 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Jul 09 18:39:47 2009 -0700" }, "message": "x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE\n\nDrop the CONFIG_X86_NEW_MCE symbol and change all\nreferences to it to check for CONFIG_X86_MCE directly.\n\nNo code changes\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "5bb38adcb54cf7192b154368ad62982caa11ca0b", "tree": "aad7b2b51b20bb7432eab895e715a0407b1ad02f", "parents": [ "bab9bc6583fe6c1660d6ed36dd14bbb4edfaf393" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Thu Jul 09 00:31:39 2009 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Jul 09 18:39:46 2009 -0700" }, "message": "x86: mce: Remove old i386 machine check code\n\nAs announced in feature-remove-schedule.txt remove CONFIG_X86_OLD_MCE\n\nThis patch only removes code.\n\nThe ancient machine check code for very old systems that are not supported\nby CONFIG_X86_NEW_MCE is still kept.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "bab9bc6583fe6c1660d6ed36dd14bbb4edfaf393", "tree": "6b2125ecc71e3d4d24265c20100b404349b9403e", "parents": [ "c31d96338a6041520ba5f1b6a4a5012ef00686b3" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Thu Jul 09 00:31:38 2009 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Jul 09 18:39:46 2009 -0700" }, "message": "x86: mce: Update X86_MCE description in x86/Kconfig\n\n- Clarify that this config controls thermal throttling\nreporting too\n- Clarify the types of errors reported by machine checks\n- Drop references to ancient CPUs.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "c31d96338a6041520ba5f1b6a4a5012ef00686b3", "tree": "df0d2ee5b25c06cc32e32c2f13a38d92e971d22a", "parents": [ "a95436e44a76a32dcbe7c8df59701ddde53017c1" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Thu Jul 09 00:31:37 2009 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Jul 09 18:39:46 2009 -0700" }, "message": "x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE\n\nAdd a missing depency for ANCIENT_MCE. It didn\u0027t matter\nin practice because the ANCIENT code wasn\u0027t compiled without\nX86_MCE, but it\u0027s better to express that clearly in\nKconfig.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "62edf5dc4a524e4cb525e6020b955a1ad593d9ba", "tree": "e811a942b7661fc9e97f1611ee75e7f125d51365", "parents": [ "40e4aa34324bff3938a900014254f88943d05e15" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Jul 04 10:59:46 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Jul 04 10:59:46 2009 +0100" }, "message": "intel-iommu: Restore DMAR_BROKEN_GFX_WA option for broken graphics drivers\n\nWe need to give people a little more time to fix the broken drivers.\nRe-introduce this, but tied in properly with the \u0027iommu\u003dpt\u0027 support this\ntime. Change the config option name and make it default to \u0027no\u0027 too.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "c43768cbb7655ea5ff782ae250f6e2ef4297cf98", "tree": "3982e41dde3eecaa3739a5d1a8ed18d04bd74f01", "parents": [ "1a8dd307cc0a2119be4e578c517795464e6dabba", "746a99a5af60ee676afa2ba469ccd1373493c7e7" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Jul 04 07:13:18 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Jul 04 07:13:18 2009 +0900" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nPull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix\nchanges. As alpha in percpu tree uses \u0027weak\u0027 attribute instead of\ninline assembly, there\u0027s no need for __used attribute.\n\nConflicts:\n\tarch/alpha/include/asm/percpu.h\n\tarch/mn10300/kernel/vmlinux.lds.S\n\tinclude/linux/percpu-defs.h\n" }, { "commit": "c7ab48d2acaf959e4d59c3f55d12fdb7ca9afd7c", "tree": "5474dadf86c95ddf3b347000f5c114f154e7a0ab", "parents": [ "b213203e475212a69ad6fedfb73464087e317148" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Jun 26 19:10:36 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Jun 29 12:37:44 2009 +0100" }, "message": "intel-iommu: Clean up identity mapping code, remove CONFIG_DMAR_GFX_WA\n\nThere\u0027s no need for the GFX workaround now we have \u0027iommu\u003dpt\u0027 for the\ncases where people really care about performance. There\u0027s no need to\nhave a special case for just one type of device.\n\nThis also speeds up the iommu\u003dpt path and reduces memory usage by\nsetting up the si_domain _once_ and then using it for all devices,\nrather than giving each device its own private page tables.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "e74e396204bfcb67570ba4517b08f5918e69afea", "tree": "df57c859e10f7fcbe5790e9b51a106d5bccfe8dc", "parents": [ "0017c869ddcb73069905d09f9e98e68627466237" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 30 19:07:44 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jun 24 15:13:35 2009 +0900" }, "message": "percpu: use dynamic percpu allocator as the default percpu allocator\n\nThis patch makes most !CONFIG_HAVE_SETUP_PER_CPU_AREA archs use\ndynamic percpu allocator. The first chunk is allocated using\nembedding helper and 8k is reserved for modules. This ensures that\nthe new allocator behaves almost identically to the original allocator\nas long as static percpu variables are concerned, so it shouldn\u0027t\nintroduce much breakage.\n\ns390 and alpha use custom SHIFT_PERCPU_PTR() to work around addressing\nrange limit the addressing model imposes. Unfortunately, this breaks\nif the address is specified using a variable, so for now, the two\narchs aren\u0027t converted.\n\nThe following architectures are affected by this change.\n\n* sh\n* arm\n* cris\n* mips\n* sparc(32)\n* blackfin\n* avr32\n* parisc (broken, under investigation)\n* m32r\n* powerpc(32)\n\nAs this change makes the dynamic allocator the default one,\nCONFIG_HAVE_DYNAMIC_PER_CPU_AREA is replaced with its invert -\nCONFIG_HAVE_LEGACY_PER_CPU_AREA, which is added to yet-to-be converted\narchs. These archs implement their own setup_per_cpu_areas() and the\nconversion is not trivial.\n\n* powerpc(64)\n* sparc(64)\n* ia64\n* alpha\n* s390\n\nBoot and batch alloc/free tests on x86_32 with debug code (x86_32\ndoesn\u0027t use default first chunk initialization). Compile tested on\nsparc(32), powerpc(32), arm and alpha.\n\nKyle McMartin reported that this change breaks parisc. The problem is\nstill under investigation and he is okay with pushing this patch\nforward and fixing parisc later.\n\n[ Impact: use dynamic allocator for most archs w/o custom percpu setup ]\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Bryan Wu \u003ccooloney@kernel.org\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Matthew Wilcox \u003cmatthew@wil.cx\u003e\nCc: Grant Grundler \u003cgrundler@parisc-linux.org\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b0b7065b64fe517b4a50915a1555e8ee98890d64", "tree": "950e7735585a83f5b4efe7a9473b5b42d5ca4f57", "parents": [ "38df92b8cee936334f686c06df0e5fbb92e252df", "d4c4038343510d83727ea922de4435996c26c0c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 20 10:56:46 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 20 10:56:46 2009 -0700" }, "message": "Merge branch \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)\n tracing/urgent: warn in case of ftrace_start_up inbalance\n tracing/urgent: fix unbalanced ftrace_start_up\n function-graph: add stack frame test\n function-graph: disable when both x86_32 and optimize for size are configured\n ring-buffer: have benchmark test print to trace buffer\n ring-buffer: do not grab locks in nmi\n ring-buffer: add locks around rb_per_cpu_empty\n ring-buffer: check for less than two in size allocation\n ring-buffer: remove useless compile check for buffer_page size\n ring-buffer: remove useless warn on check\n ring-buffer: use BUF_PAGE_HDR_SIZE in calculating index\n tracing: update sample event documentation\n tracing/filters: fix race between filter setting and module unload\n tracing/filters: free filter_string in destroy_preds()\n ring-buffer: use commit counters for commit pointer accounting\n ring-buffer: remove unused variable\n ring-buffer: have benchmark test handle discarded events\n ring-buffer: prevent adding write in discarded area\n tracing/filters: strloc should be unsigned short\n tracing/filters: operand can be negative\n ...\n\nFix up kmemcheck-induced conflict in kernel/trace/ring_buffer.c manually\n" }, { "commit": "71e308a239c098673570d0b417d42262bb535909", "tree": "a9e415d0ae6302e820a1f9d4ff55a724b3a12cf6", "parents": [ "eb4a03780d4c4464ef2ad86d80cca3f3284fe81d" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Thu Jun 18 12:45:08 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Jun 18 18:40:18 2009 -0400" }, "message": "function-graph: add stack frame test\n\nIn case gcc does something funny with the stack frames, or the return\nfrom function code, we would like to detect that.\n\nAn arch may implement passing of a variable that is unique to the\nfunction and can be saved on entering a function and can be tested\nwhen exiting the function. Usually the frame pointer can be used for\nthis purpose.\n\nThis patch also implements this for x86. Where it passes in the stack\nframe of the parent function, and will test that frame on exit.\n\nThere was a case in x86_32 with optimize for size (-Os) where, for a\nfew functions, gcc would align the stack frame and place a copy of the\nreturn address into it. The function graph tracer modified the copy and\nnot the actual return address. On return from the funtion, it did not go\nto the tracer hook, but returned to the parent. This broke the function\ngraph tracer, because the return of the parent (where gcc did not do\nthis funky manipulation) returned to the location that the child function\nwas suppose to. This caused strange kernel crashes.\n\nThis test detected the problem and pointed out where the issue was.\n\nThis modifies the parameters of one of the functions that the arch\nspecific code calls, so it includes changes to arch code to accommodate\nthe new prototype.\n\nNote, I notice that the parsic arch implements its own push_return_trace.\nThis is now a generic function and the ftrace_push_return_trace should be\nused instead. This patch does not touch that code.\n\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "7c095e4603dd6ce78ff5b9b70896fe3e05c13f5c", "tree": "4de9ce5ba2c5e19e85c8c54e4884845a929504bb", "parents": [ "c147d8ea3e2f6f953647f2347ae732fd99b32e73" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Jun 17 16:28:12 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:58 2009 -0700" }, "message": "dma-mapping: x86: use asm-generic/dma-mapping-common.h\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eadb8a091b27a840de7450f84ecff5ef13476424", "tree": "58c3782d40def63baa8167f3d31e3048cb4c7660", "parents": [ "73874005cd8800440be4299bd095387fff4b90ac", "65795efbd380a832ae508b04dba8f8e53f0b84d9" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 17 12:52:15 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 17 12:56:49 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into tracing/hw-breakpoints\n\nConflicts:\n\tarch/x86/Kconfig\n\tarch/x86/kernel/traps.c\n\tarch/x86/power/cpu.c\n\tarch/x86/power/cpu_32.c\n\tkernel/Makefile\n\nSemantic conflict:\n\tarch/x86/kernel/hw_breakpoint.c\n\nMerge reason: Resolve the conflicts, move from put_cpu_no_sched() to\n put_cpu() in arch/x86/kernel/hw_breakpoint.c.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "722f2a6c87f34ee0fd0130a8cf45f81e0705594a", "tree": "50b054df34d2731eb0ba0cf1a6c27e43e7eed428", "parents": [ "7a0aeb14e18ad59394bd9bbc6e57fb345819e748", "45e3e1935e2857c54783291107d33323b3ef33c8" ], "author": { "name": "Vegard Nossum", "email": "vegard.nossum@gmail.com", "time": "Mon Jun 15 15:50:49 2009 +0200" }, "committer": { "name": "Vegard Nossum", "email": "vegard.nossum@gmail.com", "time": "Mon Jun 15 15:50:49 2009 +0200" }, "message": "Merge commit \u0027linus/master\u0027 into HEAD\n\nConflicts:\n\tMAINTAINERS\n\nSigned-off-by: Vegard Nossum \u003cvegard.nossum@gmail.com\u003e\n" }, { "commit": "0a4af3b09309049d8560f8ad558a1337bb4f7f32", "tree": "7b3f627f94a82248146bc19bd3bb4f641b897526", "parents": [ "7d46d9e6dbffe8780aa8430a63543d3f7ba92860" ], "author": { "name": "Pekka Enberg", "email": "penberg@cs.helsinki.fi", "time": "Thu Feb 26 21:38:56 2009 +0200" }, "committer": { "name": "Vegard Nossum", "email": "vegard.nossum@gmail.com", "time": "Mon Jun 15 15:49:17 2009 +0200" }, "message": "kmemcheck: make kconfig accessible for other architectures\n\nThe Kconfig options of kmemcheck are hidden under arch/x86 which makes porting\nto other architectures harder. To fix that, move the Kconfig bits to\nlib/Kconfig.kmemcheck and introduce a CONFIG_HAVE_ARCH_KMEMCHECK config option\nthat architectures can define.\n\nSigned-off-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\n\n[rebased for mainline inclusion]\nSigned-off-by: Vegard Nossum \u003cvegard.nossum@gmail.com\u003e\n" }, { "commit": "0d5959723e1db3fd7323c198a50c16cecf96c7a9", "tree": "802b623fff261ebcbbddadf84af5524398364a18", "parents": [ "62fdac5913f71f8f200bd2c9bd59a02e9a1498e9", "512626a04e72aca60effe111fa0333ed0b195d21" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 23:31:52 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 23:31:52 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into x86/mce3\n\nConflicts:\n\tarch/x86/kernel/cpu/mcheck/mce_64.c\n\tarch/x86/kernel/irq.c\n\nMerge reason: Resolve the conflicts above.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "940010c5a314a7bd9b498593bc6ba1718ac5aec5", "tree": "d141e08ced08c40c6a8e3ab2cdecde5ff14e560f", "parents": [ "8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5", "991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/irqinit.c\n\tarch/x86/kernel/irqinit_64.c\n\tarch/x86/kernel/traps.c\n\tarch/x86/mm/fault.c\n\tinclude/linux/sched.h\n\tkernel/exit.c\n" }, { "commit": "82782ca77d1bfb32b0334cce40a25b91bd8ec016", "tree": "d8c73212af80ed9aa314612e2b8b9e6cf74c47f7", "parents": [ "f0d5e12bd42b7173ebbbf59279c867605f859814", "6799687a53a28536fd027ccb644833f66a778925" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 15:30:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 15:30:41 2009 -0700" }, "message": "Merge branch \u0027x86-kbuild-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-kbuild-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (46 commits)\n x86, boot: add new generated files to the appropriate .gitignore files\n x86, boot: correct the calculation of ZO_INIT_SIZE\n x86-64: align __PHYSICAL_START, remove __KERNEL_ALIGN\n x86, boot: correct sanity checks in boot/compressed/misc.c\n x86: add extension fields for bootloader type and version\n x86, defconfig: update kernel position parameters\n x86, defconfig: update to current, no material changes\n x86: make CONFIG_RELOCATABLE the default\n x86: default CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_ALIGN to 16 MB\n x86: document new bzImage fields\n x86, boot: make kernel_alignment adjustable; new bzImage fields\n x86, boot: remove dead code from boot/compressed/head_*.S\n x86, boot: use LOAD_PHYSICAL_ADDR on 64 bits\n x86, boot: make symbols from the main vmlinux available\n x86, boot: determine compressed code offset at compile time\n x86, boot: use appropriate rep string for move and clear\n x86, boot: zero EFLAGS on 32 bits\n x86, boot: set up the decompression stack as early as possible\n x86, boot: straighten out ranges to copy/zero in compressed/head*.S\n x86, boot: stylistic cleanups for boot/compressed/head_64.S\n ...\n\nFixed trivial conflict in arch/x86/configs/x86_64_defconfig manually\n" }, { "commit": "0067f1297241ea567f2b22a455519752d70fcca9", "tree": "793c8cde0cc4ed0204cc7df82329d5b18808e696", "parents": [ "62a038d34db26771756cf3689e36de638bedd2c4" ], "author": { "name": "K.Prasad", "email": "prasad@linux.vnet.ibm.com", "time": "Mon Jun 01 23:43:57 2009 +0530" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Jun 02 22:46:58 2009 +0200" }, "message": "hw-breakpoints: x86 architecture implementation of Hardware Breakpoint interfaces\n\nThis patch introduces the arch-specific implementation of the generic\nhardware breakpoints in kernel/hw_breakpoint.c inside x86 specific directories.\nIt contains functions which help to validate and serve requests using\nHardware Breakpoint registers on x86 processors.\n\n[ fweisbec@gmail.com: fix conflict against kmemcheck ]\n\nOriginal-patch-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: K.Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nReviewed-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "48b1fddbb100a64f3983ca9768b8ea629a09aa20", "tree": "7cf552c623cb0aa0dd945df55b7eaf5a0697e277", "parents": [ "38736072d45488fd45f076388b6570419bbbc682", "ee4c24a5c9b530481394132c8dbc10572d57c075" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Mon Jun 01 15:13:02 2009 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Mon Jun 01 15:25:31 2009 -0700" }, "message": "Merge branch \u0027irq/numa\u0027 into x86/mce3\n\nMerge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa\nand modified in x86/mce3; this merge resolves the conflict.\n\nConflicts:\n\tarch/x86/kernel/irqinit.c\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "3d58f48ba05caed9118bce62b3047f8683438835", "tree": "94c911034f0e14ded73d3e9e6e9f8e22b6cad822", "parents": [ "abfe0af9813153bae8c85d9bac966bafcb8ddab1", "d9244b5d2fbfe9fa540024b410047af13ceec90f" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jun 01 21:06:21 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jun 01 21:06:21 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into irq/numa\n\nConflicts:\n\tarch/mips/sibyte/bcm1480/irq.c\n\tarch/mips/sibyte/sb1250/irq.c\n\nMerge reason: we gathered a few conflicts plus update to latest upstream fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "23db9f430be9325a861c7762c1ffadad9ca528a8", "tree": "1ebb681611c96f17aa4f96e28d6923824a8b210f", "parents": [ "27b9613b7be39412775d0ab80f57229aa73bb07d", "3218911f839b6c85acbf872ad264ea69aa4d89ad" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jun 01 10:01:03 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jun 01 10:01:39 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nMerge reason: merge almost-rc8 into perfcounters/core, which was -rc6\n based - to pick up the latest upstream fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "cd13adcc823aa421efa4efd995fa7004a58cf38d", "tree": "b7e61d2b82f955247dd62ee5e9f32667c205bf45", "parents": [ "eb2a6ab729ac40a553797703a5a5dba3a74de004" ], "author": { "name": "Hidetoshi Seto", "email": "seto.hidetoshi@jp.fujitsu.com", "time": "Wed May 27 16:57:31 2009 +0900" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu May 28 10:05:21 2009 -0700" }, "message": "x86: trivial clean up for arch/x86/Kconfig\n\nUse tab.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "ea149b36c7f511d17dd89fee734cb09778a91fa0", "tree": "04466a9b92dc5ce01c2ab8661165e3564d99f5c1", "parents": [ "5f8c1a54cab6f449fe04d42d0661bc796fa4e73e" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Wed Apr 29 19:31:00 2009 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu May 28 09:24:14 2009 -0700" }, "message": "x86, mce: add basic error injection infrastructure\n\nAllow user programs to write mce records into /dev/mcelog. When they do\nthat a fake machine check is triggered to test the machine check code.\n\nThis uses the MCE MSR wrappers added earlier.\n\nThe implementation is straight forward. There is a struct mce record\nper CPU and the MCE MSR accesses get data from there if there is valid\ndata injected there. This allows to test the machine check code\nrelatively realistically because only the lowest layer of hardware\naccess is intercepted.\n\nThe test suite and injector are available at\ngit://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git\ngit://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" } ], "next": "de5619dfef76ddb403eb7c6de39c0130166c5dc3" }