)]}' { "log": [ { "commit": "64d7155cdfe5546ca0730daf7dd73ee52a74eeaf", "tree": "7d58409a555f89b8fb9c81012809c108b5d32b01", "parents": [ "0238047018d34946c08afc2f9e19053a3c25f0e1" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Oct 17 12:31:15 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Oct 17 12:31:15 2012 +0100" }, "message": "UAPI: Remove empty non-UAPI Kbuild files\n\nRemove non-UAPI Kbuild files that have become empty as a result of UAPI\ndisintegration. They used to have only header-y lines in them and those have\nnow moved to the Kbuild files in the corresponding uapi/ directories.\n\nPossibly these should not be removed but rather have a comment inserted to say\nthey are intentionally left blank. This would make it easier to add generated\nheader lines in future without having to restore the infrastructure.\n\nNote that at this point not all the UAPI disintegration parts have been merged,\nso it is likely that more empty Kbuild files will turn up.\n\nIt is probably necessary to make the files non-empty to prevent the patch\nprogram from automatically deleting them when it reduces them to nothing.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "a5ef3f7dcba17e79c21afec38188c4c6a0baf995", "tree": "1961e2e8c2d30dd7a21b93fa7e70dc62f892651d", "parents": [ "d25282d1c9b9bc4cda7f9d3c0205108e99aa7a9d", "35bafbee4b4732a2820bbd0ef141c8192ff29731" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 14 14:39:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 14 14:39:05 2012 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS update from Ralf Baechle:\n \"Cleanups and fixes for breakage that occured earlier during this merge\n phase. Also a few patches that didn\u0027t make the first pull request.\n Of those is the Alchemy work that merges code for many of the SOCs and\n evaluation boards thus among other code shrinkage, reduces the number\n of MIPS defconfigs by 5.\"\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (22 commits)\n MIPS: SNI: Switch RM400 serial to SCCNXP driver\n MIPS: Remove unused empty_bad_pmd_table[] declaration.\n MIPS: MT: Remove kspd.\n MIPS: Malta: Fix section mismatch.\n MIPS: asm-offset.c: Delete unused irq_cpustat_t struct offsets.\n MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.\n MIPS: Alchemy: merge PB1550 support into DB1550 code\n MIPS: Alchemy: Single kernel for DB1200/1300/1550\n MIPS: Optimize TLB refill for RI/XI configurations.\n MIPS: proc: Cleanup printing of ASEs.\n MIPS: Hardwire detection of DSP ASE Rev 2 for systems, as required.\n MIPS: Add detection of DSP ASE Revision 2.\n MIPS: Optimize pgd_init and pmd_init\n MIPS: perf: Add perf functionality for BMIPS5000\n MIPS: perf: Split the Kconfig option CONFIG_MIPS_MT_SMP\n MIPS: perf: Remove unnecessary #ifdef\n MIPS: perf: Add cpu feature bit for PCI (performance counter interrupt)\n MIPS: perf: Change the \"mips_perf_event\" table unsupported indicator.\n MIPS: Align swapper_pg_dir to 64K for better TLB Refill code.\n vmlinux.lds.h: Allow architectures to add sections to the front of .bss\n ...\n" }, { "commit": "d25282d1c9b9bc4cda7f9d3c0205108e99aa7a9d", "tree": "f414482d768b015a609924293b779b4ad0b8f764", "parents": [ "b6eea87fc6850d3531a64a27d2323a4498cd4e43", "dbadc17683e6c673a69b236c0f041b931cc55c42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 14 13:39:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 14 13:39:34 2012 -0700" }, "message": "Merge branch \u0027modules-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull module signing support from Rusty Russell:\n \"module signing is the highlight, but it\u0027s an all-over David Howells frenzy...\"\n\nHmm \"Magrathea: Glacier signing key\". Somebody has been reading too much HHGTTG.\n\n* \u0027modules-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (37 commits)\n X.509: Fix indefinite length element skip error handling\n X.509: Convert some printk calls to pr_devel\n asymmetric keys: fix printk format warning\n MODSIGN: Fix 32-bit overflow in X.509 certificate validity date checking\n MODSIGN: Make mrproper should remove generated files.\n MODSIGN: Use utf8 strings in signer\u0027s name in autogenerated X.509 certs\n MODSIGN: Use the same digest for the autogen key sig as for the module sig\n MODSIGN: Sign modules during the build process\n MODSIGN: Provide a script for generating a key ID from an X.509 cert\n MODSIGN: Implement module signature checking\n MODSIGN: Provide module signing public keys to the kernel\n MODSIGN: Automatically generate module signing keys if missing\n MODSIGN: Provide Kconfig options\n MODSIGN: Provide gitignore and make clean rules for extra files\n MODSIGN: Add FIPS policy\n module: signature checking hook\n X.509: Add a crypto key parser for binary (DER) X.509 certificates\n MPILIB: Provide a function to read raw data into an MPI\n X.509: Add an ASN.1 decoder\n X.509: Add simple ASN.1 grammar compiler\n ...\n" }, { "commit": "c87728ca82a1057eb8f84e139bf416ca5488b6fb", "tree": "ecf73f882cf210094be75e129bd4071223aca131", "parents": [ "b4f2a17ba96a79f1069a2c0f1c648cf6d497f2f3" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Tue Aug 14 11:08:00 2012 -0700" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Oct 11 11:02:37 2012 +0200" }, "message": "vmlinux.lds.h: Allow architectures to add sections to the front of .bss\n\nFollow-on MIPS patch will put an object here that needs 64K alignment\nto minimize padding.\n\nFor those architectures that don\u0027t define BSS_FIRST_SECTIONS, there is\nno change.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: linux-mips@linux-mips.org\nCc: linux-arch@vger.kernel.org,\nCc: linux-kernel@vger.kernel.org\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nPatchwork: https://patchwork.linux-mips.org/patch/4221/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "9e2d8656f5e8aa214e66b462680cf86b210b74a8", "tree": "f67d62e896cedf75599ea45f9ecf9999c6ad24cd", "parents": [ "1ea4f4f8405cc1ceec23f2d261bc3775785e6712", "9e695d2ecc8451cc2c1603d60b5c8e7f5581923a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:23:15 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:23:15 2012 +0900" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge patches from Andrew Morton:\n \"A few misc things and very nearly all of the MM tree. A tremendous\n amount of stuff (again), including a significant rbtree library\n rework.\"\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (160 commits)\n sparc64: Support transparent huge pages.\n mm: thp: Use more portable PMD clearing sequenece in zap_huge_pmd().\n mm: Add and use update_mmu_cache_pmd() in transparent huge page code.\n sparc64: Document PGD and PMD layout.\n sparc64: Eliminate PTE table memory wastage.\n sparc64: Halve the size of PTE tables\n sparc64: Only support 4MB huge pages and 8KB base pages.\n memory-hotplug: suppress \"Trying to free nonexistent resource \u003cXXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY\u003e\" warning\n mm: memcg: clean up mm_match_cgroup() signature\n mm: document PageHuge somewhat\n mm: use %pK for /proc/vmallocinfo\n mm, thp: fix mlock statistics\n mm, thp: fix mapped pages avoiding unevictable list on mlock\n memory-hotplug: update memory block\u0027s state and notify userspace\n memory-hotplug: preparation to notify memory block\u0027s state at memory hot remove\n mm: avoid section mismatch warning for memblock_type_name\n make GFP_NOTRACK definition unconditional\n cma: decrease cc.nr_migratepages after reclaiming pagelist\n CMA: migrate mlocked pages\n kpageflags: fix wrong KPF_THP on non-huge compound pages\n ...\n" }, { "commit": "2d28a2275c21d04290cfba1555c89a806d2b7706", "tree": "a333aa3c8dd434e8f9ccc6b0f8ff80f9d9b4b357", "parents": [ "e3b4126c556ca3a07699adf202d44bed3f453638" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Oct 08 16:32:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:53 2012 +0900" }, "message": "mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear()\n\nThe CONFIG_TRANSPARENT_HUGEPAGE implementation of pmdp_get_and_clear()\ncalls pmd_clear() with 3 arguments instead of 1.\n\nThis happens only for !__HAVE_ARCH_PMDP_GET_AND_CLEAR which doesn\u0027t seem\nto happen because x86 defines this and it uses pmd_update.\n\n[mhocko@suse.cz: changelog addition]\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Steve Capper \u003csteve.capper@arm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReviewed-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCc: Gerald Schaefer \u003cgerald.schaefer@de.ibm.com\u003e\nReviewed-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "46dcde735c9d8953bbd8d105ca6779e5b5300c28", "tree": "48298fd35d0ef0091541bad482f06202aba97ad3", "parents": [ "e3ebcf64381188a2744a9829a4eb5c2b60f1974c" ], "author": { "name": "Gerald Schaefer", "email": "gerald.schaefer@de.ibm.com", "time": "Mon Oct 08 16:30:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:29 2012 +0900" }, "message": "thp: introduce pmdp_invalidate()\n\nOn s390, a valid page table entry must not be changed while it is attached\nto any CPU. So instead of pmd_mknotpresent() and set_pmd_at(), an IDTE\noperation would be necessary there. This patch introduces the\npmdp_invalidate() function, to allow architecture-specific\nimplementations.\n\nSigned-off-by: Gerald Schaefer \u003cgerald.schaefer@de.ibm.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e3ebcf64381188a2744a9829a4eb5c2b60f1974c", "tree": "6c2bc18729bd6fc12b93d82403fad6afec319c3b", "parents": [ "15626062f4a98279c59a2a5208c496cf65cbf8c0" ], "author": { "name": "Gerald Schaefer", "email": "gerald.schaefer@de.ibm.com", "time": "Mon Oct 08 16:30:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:29 2012 +0900" }, "message": "thp: remove assumptions on pgtable_t type\n\nThe thp page table pre-allocation code currently assumes that pgtable_t is\nof type \"struct page *\". This may not be true for all architectures, so\nthis patch removes that assumption by replacing the functions\nprepare_pmd_huge_pte() and get_pmd_huge_pte() with two new functions that\ncan be defined architecture-specific.\n\nIt also removes two VM_BUG_ON checks for page_count() and page_mapcount()\noperating on a pgtable_t. Apart from the VM_BUG_ON removal, there will be\nno functional change introduced by this patch.\n\nSigned-off-by: Gerald Schaefer \u003cgerald.schaefer@de.ibm.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b3b9c2932c32e0692018ed5f12f3fd8c70eea8ce", "tree": "bca2431f0b0bd2d364f041f0344836cd39b1822c", "parents": [ "5180da410db6369d1f95c9014da1c9bc33fb043e" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Oct 08 16:28:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:16 2012 +0900" }, "message": "mm, x86, pat: rework linear pfn-mmap tracking\n\nReplace the generic vma-flag VM_PFN_AT_MMAP with x86-only VM_PAT.\n\nWe can toss mapping address from remap_pfn_range() into\ntrack_pfn_vma_new(), and collect all PAT-related logic together in\narch/x86/.\n\nThis patch also restores orignal frustration-free is_cow_mapping() check\nin remap_pfn_range(), as it was before commit v2.6.28-rc8-88-g3c8bb73\n(\"x86: PAT: store vm_pgoff for all linear_over_vma_region mappings - v3\")\n\nis_linear_pfn_mapping() checks can be removed from mm/huge_memory.c,\nbecause it already handled by VM_PFNMAP in VM_NO_THP bit-mask.\n\n[suresh.b.siddha@intel.com: Reset the VM_PAT flag as part of untrack_pfn_vma()]\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: James Morris \u003cjames.l.morris@oracle.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Kentaro Takeda \u003ctakedakn@nttdata.co.jp\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5180da410db6369d1f95c9014da1c9bc33fb043e", "tree": "1d92975710b33a90f77f39d0ad33669329dea949", "parents": [ "b1a86e15dc0304366f50ba1720834bc419c801b1" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Mon Oct 08 16:28:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:16 2012 +0900" }, "message": "x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn\n\nWith PAT enabled, vm_insert_pfn() looks up the existing pfn memory\nattribute and uses it. Expectation is that the driver reserves the\nmemory attributes for the pfn before calling vm_insert_pfn().\n\nremap_pfn_range() (when called for the whole vma) will setup a new\nattribute (based on the prot argument) for the specified pfn range.\nThis addresses the legacy usage which typically calls remap_pfn_range()\nwith a desired memory attribute. For ranges smaller than the vma size\n(which is typically not the case), remap_pfn_range() will use the\nexisting memory attribute for the pfn range.\n\nExpose two different API\u0027s for these different behaviors.\ntrack_pfn_insert() for tracking the pfn attribute set by vm_insert_pfn()\nand track_pfn_remap() for the remap_pfn_range().\n\nThis cleanup also prepares the ground for the track/untrack pfn vma\nroutines to take over the ownership of setting PAT specific vm_flag in\nthe \u0027vma\u0027.\n\n[khlebnikov@openvz.org: Clear checks in track_pfn_remap()]\n[akpm@linux-foundation.org: tweak a few comments]\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: James Morris \u003cjames.l.morris@oracle.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Kentaro Takeda \u003ctakedakn@nttdata.co.jp\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "50e0d10232db05c6776afcf6098459bff47e8b15", "tree": "0e89971de6d960c8946cc9351d73b297347a0260", "parents": [ "8711798772641b2f593beebebcab5b1ec2309f0c", "c37d6154c0b9163c27e53cc1d0be3867b4abd760" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 15:58:38 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 15:58:38 2012 +0900" }, "message": "Merge tag \u0027asm-generic\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic\n\nPull asm-generic updates from Arnd Bergmann:\n \"This has three changes for asm-generic that did not really fit into\n any other branch as normal asm-generic changes do. One is a fix for a\n build warning, the other two are more interesting:\n\n * A patch from Mark Brown to allow using the common clock\n infrastructure on all architectures, so we can use the clock API in\n architecture independent device drivers.\n\n * The UAPI split patches from David Howells for the asm-generic\n files. There are other architecture specific series that are going\n through the arch maintainer tree and that depend on this one.\n\n There may be a few small merge conflicts between Mark\u0027s patch and the\n following arch header file split patches. In each case the solution\n will be to keep the new \"generic-y +\u003d clkdev.h\" line, even if it ends\n up being the only line in the Kbuild file.\"\n\n* tag \u0027asm-generic\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:\n UAPI: (Scripted) Disintegrate include/asm-generic\n asm-generic: Add default clkdev.h\n asm-generic: xor: mark static functions as __maybe_unused\n" }, { "commit": "aacf29bf1bf133f6219e6f8969d4ebc2ac76458f", "tree": "b4379ab6617d1e963020365e03cda0b551bc3237", "parents": [ "cf7f601c067994f371ba77721d1e45fce61a4569" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Sep 13 13:09:33 2012 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Oct 08 13:50:11 2012 +1030" }, "message": "MPILIB: Provide count_leading/trailing_zeros() based on arch functions\n\nProvide count_leading/trailing_zeros() macros based on extant arch bit scanning\nfunctions rather than reimplementing from scratch in MPILIB.\n\nWhilst we\u0027re at it, turn count_foo_zeros(n, x) into n \u003d count_foo_zeros(x).\n\nAlso move the definition to asm-generic as other people may be interested in\nusing it.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Dmitry Kasatkin \u003cdmitry.kasatkin@intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "ed5062ddaa71e9f8b2b3aacc264428ce6da93d9e", "tree": "9db3b16d8dd412e2d688f3b5d1c252d2e6b4084d", "parents": [ "125b79d74a63552be757bb49a425b965782e4952", "f3dfd599af993385b40fc7a1c947afc12729bc4d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 07 07:55:10 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 07 07:55:10 2012 +0900" }, "message": "Merge branch \u0027uapi-prep\u0027 of git://git.infradead.org/users/dhowells/linux-headers\n\nPull UAPI disintegration fixes from David Howells:\n \"There are three main parts:\n\n (1) I found I needed some more fixups in the wake of testing Arm64\n (some asm/unistd.h files had weird guards that caused problems -\n mostly in arches for which I don\u0027t have a compiler) and some\n __KERNEL__ splitting needed to take place in Arm64.\n\n (2) I found that c6x was missing some __KERNEL__ guards in its\n asm/signal.h. Mark Salter pointed me at a tree with a patch to\n remove that file entirely and use the asm-generic variant instead.\n\n (3) Lastly, m68k turned out to have a header installation problem due\n to it lacking a kvm_para.h file.\n\n The conditional installation bits for linux/kvm_para.h, linux/kvm.h\n and linux/a.out.h weren\u0027t very well specified - and didn\u0027t work if\n an arch didn\u0027t have the asm/ version of that file, but there *was*\n an asm-generic/ version.\n\n It seems the \"ifneq $((wildcard ...),)\" for each of those three\n headers in include/kernel/Kbuild is invoked twice during header\n installation, and the second time it matches on the just installed\n asm-generic/kvm_para.h file and thus incorrectly installs\n linux/kvm_para.h as well.\n\n Most arches actually have an asm/kvm_para.h, so this wasn\u0027t\n detectable in those.\"\n\n* \u0027uapi-prep\u0027 of git://git.infradead.org/users/dhowells/linux-headers:\n UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)\n c6x: remove c6x signal.h\n UAPI: Split compound conditionals containing __KERNEL__ in Arm64\n UAPI: Fix the guards on various asm/unistd.h files\n c6x: make dsk6455 the default config\n" }, { "commit": "b9034bf1e96fb8b1bf1b22ca2d3ea2aa7467e5a8", "tree": "c7f69d7d56e15efb175befe28ea3b7a9cd1ff753", "parents": [ "459a130838e819d5bc7efc572cba4cdd5c4f2dd2" ], "author": { "name": "Takuya Yoshikawa", "email": "yoshikawa.takuya@oss.ntt.co.jp", "time": "Thu Oct 04 17:13:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:04:55 2012 +0900" }, "message": "bitops: introduce generic {clear,set}_bit_le()\n\nNeeded to replace test_and_set_bit_le() in virt/kvm/kvm_main.c which is\nbeing used for this missing function.\n\nSigned-off-by: Takuya Yoshikawa \u003cyoshikawa.takuya@oss.ntt.co.jp\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c37d6154c0b9163c27e53cc1d0be3867b4abd760", "tree": "7a24522c56d1cb284dff1d3c225bbdaba0901bb5", "parents": [ "e7a570ff7dff9af6e54ff5e580a61ec7652137a0", "8a1ab3155c2ac7fbe5f2038d6e26efeb607a1498" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Oct 04 22:57:00 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Oct 04 22:57:51 2012 +0200" }, "message": "Merge branch \u0027disintegrate-asm-generic\u0027 of git://git.infradead.org/users/dhowells/linux-headers into asm-generic\n\nPatches from David Howells \u003cdhowells@redhat.com\u003e:\n\nThis is to complete part of the UAPI disintegration for which the\npreparatory patches were pulled recently.\n\nNote that there are some fixup patches which are at the base of the\nbranch aimed at you, plus all arches get the asm-generic branch merged in too.\n\n* \u0027disintegrate-asm-generic\u0027 of git://git.infradead.org/users/dhowells/linux-headers:\n UAPI: (Scripted) Disintegrate include/asm-generic\n UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)\n c6x: remove c6x signal.h\n UAPI: Split compound conditionals containing __KERNEL__ in Arm64\n UAPI: Fix the guards on various asm/unistd.h files\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "8a1ab3155c2ac7fbe5f2038d6e26efeb607a1498", "tree": "42ef93e164b8b2a01adab30db4b33f370f4280d7", "parents": [ "f3dfd599af993385b40fc7a1c947afc12729bc4d" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 04 18:20:15 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 04 18:20:15 2012 +0100" }, "message": "UAPI: (Scripted) Disintegrate include/asm-generic\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "890139529d45ebd3c60d541f4eddc60e042fdf98", "tree": "b5a6bc076ca22ce95269544db5c9033496df8b95", "parents": [ "612a9aab56a93533e76e3ad91642db7033e03b69" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 04 12:10:18 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 04 12:10:18 2012 +0100" }, "message": "UAPI: Fix the guards on various asm/unistd.h files\n\nasm-generic/unistd.h and a number of asm/unistd.h files have been given\nreinclusion guards that allow the guard to be overridden if __SYSCALL is\ndefined. Unfortunately, these files define __SYSCALL and don\u0027t undefine it\nwhen they\u0027ve finished with it, thus rendering the guard ineffective.\n\nThe reason for this override is to allow the file to be #included multiple\ntimes with different settings on __SYSCALL for purposes like generating syscall\ntables.\n\nThe following guards are problematic:\n\narch/arm64/include/asm/unistd.h:#if !defined(__ASM_UNISTD_H) || defined(__SYSCALL)\narch/arm64/include/asm/unistd32.h:#if !defined(__ASM_UNISTD32_H) || defined(__SYSCALL)\narch/c6x/include/asm/unistd.h:#if !defined(_ASM_C6X_UNISTD_H) || defined(__SYSCALL)\narch/hexagon/include/asm/unistd.h:#if !defined(_ASM_HEXAGON_UNISTD_H) || defined(__SYSCALL)\narch/openrisc/include/asm/unistd.h:#if !defined(__ASM_OPENRISC_UNISTD_H) || defined(__SYSCALL)\narch/score/include/asm/unistd.h:#if !defined(_ASM_SCORE_UNISTD_H) || defined(__SYSCALL)\narch/tile/include/asm/unistd.h:#if !defined(_ASM_TILE_UNISTD_H) || defined(__SYSCALL)\narch/unicore32/include/asm/unistd.h:#if !defined(__UNICORE_UNISTD_H__) || defined(__SYSCALL)\ninclude/asm-generic/unistd.h:#if !defined(_ASM_GENERIC_UNISTD_H) || defined(__SYSCALL)\n\nOn the assumption that the guards\u0027 ineffectiveness has passed unnoticed, just\nremove these guards entirely.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\n" }, { "commit": "9b2e077c42a97fcbdc0dd71edb1fc9d15c74ad29", "tree": "20bf301d21f6c3776046acada5070630009ceedb", "parents": [ "a54dfb1a845c38a97686268d8c4086a63d9493aa", "10b63956fce7f369cc37fd4d994f09bd5203efe4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 03 13:45:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 03 13:45:43 2012 -0700" }, "message": "Merge tag \u0027uapi-prep-20121002\u0027 of git://git.infradead.org/users/dhowells/linux-headers\n\nPull preparatory patches for user API disintegration from David Howells:\n \"The patches herein prepare for the extraction of the Userspace API\n bits from the various header files named in the Kbuild files.\n\n New subdirectories are created under either include/uapi/ or\n arch/x/include/uapi/ that correspond to the subdirectory containing\n that file under include/ or arch/x/include/.\n\n The new subdirs under the uapi/ directory are populated with Kbuild\n files that mostly do nothing at this time. Further patches will\n disintegrate the headers in each original directory and fill in the\n Kbuild files as they do it.\n\n These patches also:\n\n (1) fix up #inclusions of \"foo.h\" rather than \u003cfoo.h\u003e.\n\n (2) Remove some redundant #includes from the DRM code.\n\n (3) Make the kernel build infrastructure handle Kbuild files both in\n the old places and the new UAPI place that both specify headers\n to be exported.\n\n (4) Fix some kernel tools that #include kernel headers during their\n build.\n\n I have compile tested this with allyesconfig against x86_64,\n allmodconfig against i386 and a scattering of additional defconfigs of\n other arches. Prepared for main script\n\n Signed-off-by: David Howells \u003cdhowells@redhat.com\u003e\n Acked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n Acked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n Acked-by: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\n Acked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n Acked-by: Dave Jones \u003cdavej@redhat.com\u003e\n Acked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\"\n\n* tag \u0027uapi-prep-20121002\u0027 of git://git.infradead.org/users/dhowells/linux-headers:\n UAPI: Plumb the UAPI Kbuilds into the user header installation and checking\n UAPI: x86: Differentiate the generated UAPI and internal headers\n UAPI: Remove the objhdr-y export list\n UAPI: Move linux/version.h\n UAPI: Set up uapi/asm/Kbuild.asm\n UAPI: x86: Fix insn_sanity build failure after UAPI split\n UAPI: x86: Fix the test_get_len tool\n UAPI: (Scripted) Set up UAPI Kbuild files\n UAPI: Partition the header include path sets and add uapi/ header directories\n UAPI: (Scripted) Convert #include \"...\" to #include \u003cpath/...\u003e in kernel system headers\n UAPI: (Scripted) Convert #include \"...\" to #include \u003cpath/...\u003e in drivers/gpu/\n UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/.\n UAPI: Refer to the DRM UAPI headers with \u003c...\u003e and from certain headers only\n" }, { "commit": "e7a570ff7dff9af6e54ff5e580a61ec7652137a0", "tree": "052b4e97b189417de6f1e59ce48fc6126fa34bd3", "parents": [ "720fb1976d38bccf910d477c2df364948abdb359" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Sep 05 12:04:14 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Oct 03 21:33:53 2012 +0200" }, "message": "asm-generic: Add default clkdev.h\n\nEase the deployment of clkdev by providing a default asm/clkdev.h for\nuse if the arch does not have an include/asm/clkdev.h.\n\nDue to limitations in Kbuild we manually add clkdev.h to all\narchitectures that don\u0027t have one rather than having the header appear\nby default.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nReviewed-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "720fb1976d38bccf910d477c2df364948abdb359", "tree": "d47e7fba85d80961a80ce4f01ae4427baac30bde", "parents": [ "a0d271cbfed1dd50278c6b06bead3d00ba0a88f9" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Aug 04 21:53:26 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Oct 03 21:21:06 2012 +0200" }, "message": "asm-generic: xor: mark static functions as __maybe_unused\n\nThe asm-generic/xor.h header file is nasty and defines static functions\nthat are not inline. The header file is include by the ARM version of\nasm/xor.h, which uses some but not all of the symbols defined there.\n\nMarking the extraneous functions as __maybe_unused lets gcc drop them\nwithout complaining.\n\nWithout this patch, building iop13xx_defconfig results in:\n\ninclude/asm-generic/xor.h:696:34: warning: \u0027xor_block_8regs_p\u0027 defined but not used [-Wunused-variable]\ninclude/asm-generic/xor.h:704:34: warning: \u0027xor_block_32regs_p\u0027 defined but not used [-Wunused-variable]\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Dan Williams \u003cdan.j.williams@gmail.com\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\n" }, { "commit": "dff8360a4a079692e65e55fbaa6c5dc605528403", "tree": "0ab8ef7595cdfb918b3fd9a8364c6ea6c9c2798f", "parents": [ "916082b073ebb7f4e064cebce0768e34cacde508", "901acf5b2910434501c221a363bb3486b647b5c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:05:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:05:10 2012 -0700" }, "message": "Merge tag \u0027gpio-for-v3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio\n\nPull GPIO changes from Linus Walleij:\n \"So this is the LW GPIO patch stack for v3.7:\n - refactoring from Thierry Redding at Arnd Bergmann\u0027s request to use\n the seq_file iterator interface in gpiolib.\n - A new driver for Avionic Design\u0027s N-bit GPIO expander.\n - Two instances of mutexes replaced by spinlocks from Axel Lin to\n code that is supposed to be fastpath compliant.\n - IRQ demuxer and gpio_to_irq() support for pcf857x by Kuninori\n Morimoto.\n - Dynamic GPIO numbers, device tree support, daisy chaining and some\n other fixes for the 74x164 driver by Maxime Ripard.\n - IRQ domain and device tree support for the tc3589x driver by Lee\n Jones.\n - Some conversion to use managed resources devm_* code.\n - Some instances of clk_prepare() or clk_prepare_enable() added to\n support the new, stricter common clock framework.\n - Some for_each_set_bit() simplifications.\n - Then a lot of fixes as we fixed up all of the above tripping over\n our own shoelaces and that kind of thing.\"\n\n* tag \u0027gpio-for-v3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (34 commits)\n gpio: pcf857x: select IRQ_DOMAIN\n gpio: Document device_node\u0027s det_debounce\n gpio-lpc32xx: Add GPI_28\n gpio: adnp: dt: Reference generic interrupt binding\n gpio: Add Avionic Design N-bit GPIO expander support\n gpio: pxa: using for_each_set_bit to simplify the code\n gpio_msm: using for_each_set_bit to simplify the code\n gpio: Enable the tc3298x GPIO expander driver for Device Tree\n gpio: Provide the tc3589x GPIO expander driver with an IRQ domain\n ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled\n gpio: pcf857x: fixup smatch WARNING\n gpio: 74x164: Add support for the daisy-chaining\n gpio: 74x164: dts: Add documentation for the dt binding\n dt: Fix incorrect reference in gpio-led documentation\n gpio: 74x164: Add device tree support\n gpio: 74x164: Use dynamic gpio number assignment if no pdata is present\n gpio: 74x164: Use devm_kzalloc\n gpio: 74x164: Use module_spi_driver boiler plate function\n gpio: sx150x: Use irq_data_get_irq_chip_data() at appropriate places\n gpio: em: Use irq_data_get_irq_chip_data() at appropriate places\n ...\n" }, { "commit": "494b3e1c492c29f01eec69f5492aedba6c0ae577", "tree": "bfd0ed3bf52a226458eaa15d5f6da2c85492dc9c", "parents": [ "c0522b6cc1237c935b2cead3fa7b45465df2f839" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 02 18:01:56 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Oct 02 18:01:56 2012 +0100" }, "message": "UAPI: Set up uapi/asm/Kbuild.asm\n\nSet up uapi/asm/Kbuild.asm. This requires the mandatory headers to be\ndynamically detected. The same goes for include/asm/Kbuild.asm. The problem\nis that the header files will be split or moved one at a time, but each header\nfile in Kbuild.asm\u0027s list applies to all arch headers of that name\nsimultaneously.\n\nThe dynamic detection of mandatory files can be undone later.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "81f56e5375e84689b891e0e6c5a02ec12a1f18d9", "tree": "a1e128a71ff24fc705428df86a858076cfe4bc13", "parents": [ "6c09931b3f987898f5c581d267ef269f5e2e9575", "27aa55c5e5123fa8b8ad0156559d34d7edff58ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:51:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:51:57 2012 -0700" }, "message": "Merge tag \u0027arm64-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64\n\nPull arm64 support from Catalin Marinas:\n \"Linux support for the 64-bit ARM architecture (AArch64)\n\n Features currently supported:\n - 39-bit address space for user and kernel (each)\n - 4KB and 64KB page configurations\n - Compat (32-bit) user applications (ARMv7, EABI only)\n - Flattened Device Tree (mandated for all AArch64 platforms)\n - ARM generic timers\"\n\n* tag \u0027arm64-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (35 commits)\n arm64: ptrace: remove obsolete ptrace request numbers from user headers\n arm64: Do not set the SMP/nAMP processor bit\n arm64: MAINTAINERS update\n arm64: Build infrastructure\n arm64: Miscellaneous header files\n arm64: Generic timers support\n arm64: Loadable modules\n arm64: Miscellaneous library functions\n arm64: Performance counters support\n arm64: Add support for /proc/sys/debug/exception-trace\n arm64: Debugging support\n arm64: Floating point and SIMD\n arm64: 32-bit (compat) applications support\n arm64: User access library functions\n arm64: Signal handling support\n arm64: VDSO support\n arm64: System calls handling\n arm64: ELF definitions\n arm64: SMP support\n arm64: DMA mapping API\n ...\n" }, { "commit": "1ae963143e34edaa14ab8855e0b0018c4fc77a83", "tree": "b6328dcfdb8db411429ec51f91dc88ede110ade0", "parents": [ "71fde00095dc25f74a2e7ba013747348ae6883cd" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Tue Sep 25 09:56:14 2012 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Sun Sep 30 10:27:01 2012 +0200" }, "message": "gpio: Document device_node\u0027s det_debounce\n\nThis patch adds documentation for set_debounce in struct device_node.\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "786d35d45cc40b2a51a18f73e14e135d47fdced7", "tree": "df18f4dc3f8a333267e74089760043769b3b6184", "parents": [ "6ede81239e31cfacbb1e2d260530cd80d13cf0db" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Sep 28 14:31:03 2012 +0930" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Sep 28 14:31:03 2012 +0930" }, "message": "Make most arch asm/module.h files use asm-generic/module.h\n\nUse the mapping of Elf_[SPE]hdr, Elf_Addr, Elf_Sym, Elf_Dyn, Elf_Rel/Rela,\nELF_R_TYPE() and ELF_R_SYM() to either the 32-bit version or the 64-bit version\ninto asm-generic/module.h for all arches bar MIPS.\n\nAlso, use the generic definition mod_arch_specific where possible.\n\nTo this end, I\u0027ve defined three new config bools:\n\n (*) HAVE_MOD_ARCH_SPECIFIC\n\n Arches define this if they don\u0027t want to use the empty generic\n mod_arch_specific struct.\n\n (*) MODULES_USE_ELF_RELA\n\n Arches define this if their modules can contain RELA records. This causes\n the Elf_Rela mapping to be emitted and allows apply_relocate_add() to be\n defined by the arch rather than have the core emit an error message.\n\n (*) MODULES_USE_ELF_REL\n\n Arches define this if their modules can contain REL records. This causes\n the Elf_Rel mapping to be emitted and allows apply_relocate() to be\n defined by the arch rather than have the core emit an error message.\n\nNote that it is possible to allow both REL and RELA records: m68k and mips are\ntwo arches that do this.\n\nWith this, some arch asm/module.h files can be deleted entirely and replaced\nwith a generic-y marker in the arch Kbuild file.\n\nAdditionally, I have removed the bits from m32r and score that handle the\nunsupported type of relocation record as that\u0027s now handled centrally.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "11ef4cfac935ab45eb4c7f98d26c78ee69627909", "tree": "d59e23fda3ed03b3a98803b5ad24516a7c8cc95f", "parents": [ "b02d6175859dfbdecb5ea6562867092b5d69d64e" ], "author": { "name": "Mark Salter", "email": "msalter@redhat.com", "time": "Mon Sep 24 15:19:26 2012 -0400" }, "committer": { "name": "Mark Salter", "email": "msalter@redhat.com", "time": "Wed Sep 26 15:26:30 2012 -0400" }, "message": "syscalls: add __NR_kcmp syscall to generic unistd.h\n\nCommit d97b46a64 (\"syscalls, x86: add __NR_kcmp syscall\" ) added a new\nsyscall to support checkpoint restore. It is currently x86-only, but\nthat restriction will be removed in a subsequent patch. Unfortunately,\nthe kernel checksyscalls script had a bug which suppressed any warning\nto other architectures that the kcmp syscall was not implemented. A\npatch to checksyscalls is being tested in linux-next and other\narchitectures are seeing warnings about kcmp being unimplemented.\n\nThis patch adds __NR_kcmp to \u003casm-generic/unistd.h\u003e so that kcmp is\nwired in for architectures using the generic syscall list.\n\nSigned-off-by: Mark Salter \u003cmsalter@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "048fa2df92c325cb4425dccd66c8922c8342b507", "tree": "a76ddbd3f05752f27e0867906a34e102cb76b4e4", "parents": [ "0753f70f07fbbd23a48d61ffea37028bd0bd6c7d" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Wed Sep 12 22:00:53 2012 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Fri Sep 14 17:15:41 2012 +0100" }, "message": "generic: Implement generic ffs/fls using __builtin_* functions\n\nThis patch implements ffs, __ffs, fls, __fls using __builtin_* gcc\nfunctions. These header files can be used by other architectures that\nrely on the gcc builtins.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "0bce9c46bf3b15f485d82d7e81dabed6ebcc24b1", "tree": "2378c052d6a19efaad21eabd58ccf8b8df489bde", "parents": [ "3bf671af14d591ede9251acb0085e8017f3705e7" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Aug 10 15:22:09 2012 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Aug 13 18:46:54 2012 +0200" }, "message": "mutex: Place lock in contended state after fastpath_lock failure\n\nARM recently moved to asm-generic/mutex-xchg.h for its mutex\nimplementation after the previous implementation was found to be missing\nsome crucial memory barriers. However, this has revealed some problems\nrunning hackbench on SMP platforms due to the way in which the\nMUTEX_SPIN_ON_OWNER code operates.\n\nThe symptoms are that a bunch of hackbench tasks are left waiting on an\nunlocked mutex and therefore never get woken up to claim it. This boils\ndown to the following sequence of events:\n\n Task A Task B Task C Lock value\n0 1\n1 lock() 0\n2 lock() 0\n3 spin(A) 0\n4 unlock() 1\n5 lock() 0\n6 cmpxchg(1,0) 0\n7 contended() -1\n8 lock() 0\n9 spin(C) 0\n10 unlock() 1\n11 cmpxchg(1,0) 0\n12 unlock() 1\n\nAt this point, the lock is unlocked, but Task B is in an uninterruptible\nsleep with nobody to wake it up.\n\nThis patch fixes the problem by ensuring we put the lock into the\ncontended state if we fail to acquire it on the fastpath, ensuring that\nany blocked waiters are woken up when the mutex is released.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Chris Mason \u003cchris.mason@fusionio.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nReviewed-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/n/tip-6e9lrw2avczr0617fzl5vqb8@git.kernel.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "27c1ee3f929555b71fa39ec0d81a7e7185de1b16", "tree": "42e40bdfe4efac660d650658019391536ce67a42", "parents": [ "37cd9600a9e20359b0283983c9e3a55d84347168", "086ff4b3a7fb9cdf41e6a5d0ccd99b86d84633a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:34 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge Andrew\u0027s first set of patches:\n \"Non-MM patches:\n\n - lots of misc bits\n\n - tree-wide have_clk() cleanups\n\n - quite a lot of printk tweaks. I draw your attention to \"printk:\n convert the format for KERN_\u003cLEVEL\u003e to a 2 byte pattern\" which\n looks a bit scary. But afaict it\u0027s solid.\n\n - backlight updates\n\n - lib/ feature work (notably the addition and use of memweight())\n\n - checkpatch updates\n\n - rtc updates\n\n - nilfs updates\n\n - fatfs updates (partial, still waiting for acks)\n\n - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc\n\n - new fault-injection feature work\"\n\n* Merge emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (128 commits)\n drivers/misc/lkdtm.c: fix missing allocation failure check\n lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()\n fault-injection: add tool to run command with failslab or fail_page_alloc\n fault-injection: add selftests for cpu and memory hotplug\n powerpc: pSeries reconfig notifier error injection module\n memory: memory notifier error injection module\n PM: PM notifier error injection module\n cpu: rewrite cpu-notifier-error-inject module\n fault-injection: notifier error injection\n c/r: fcntl: add F_GETOWNER_UIDS option\n resource: make sure requested range is included in the root range\n include/linux/aio.h: cpp-\u003eC conversions\n fs: cachefiles: add support for large files in filesystem caching\n pps: return PTR_ERR on error in device_create\n taskstats: check nla_reserve() return\n sysctl: suppress kmemleak messages\n ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION\n ipc: compat: use signed size_t types for msgsnd and msgrcv\n ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC\n ipc: add COMPAT_SHMLBA support\n ...\n" }, { "commit": "1d151c337d79fa3de88654d2514f58fbd916a8e0", "tree": "79f96ea4b081f310aa62246e879224467b092261", "parents": [ "65fed8f6f23070b56d0ed3841173ddd410130a89" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Mon Jul 30 14:43:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:21 2012 -0700" }, "message": "c/r: fcntl: add F_GETOWNER_UIDS option\n\nWhen we restore file descriptors we would like them to look exactly as\nthey were at dumping time.\n\nWith help of fcntl it\u0027s almost possible, the missing snippet is file\nowners UIDs.\n\nTo be able to read their values the F_GETOWNER_UIDS is introduced.\n\nThis option is valid iif CONFIG_CHECKPOINT_RESTORE is turned on, otherwise\nreturning -EINVAL.\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nAcked-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: \"Serge E. Hallyn\" \u003cserge@hallyn.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f51f51582e793ea13e7de7ed6b138f71c51784b", "tree": "211ecbf88cdf2f183e23da3f8f23153ac6133410", "parents": [ "76159c20c0bcf5b38178fbfb61049eeb6380bb54", "97ef952a20853fad72087a53fa556fbec45edd8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 10:11:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 10:11:31 2012 -0700" }, "message": "Merge branch \u0027for-linus-for-3.6-rc1\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nPull DMA-mapping updates from Marek Szyprowski:\n \"Those patches are continuation of my earlier work.\n\n They contains extensions to DMA-mapping framework to remove limitation\n of the current ARM implementation (like limited total size of DMA\n coherent/write combine buffers), improve performance of buffer sharing\n between devices (attributes to skip cpu cache operations or creation\n of additional kernel mapping for some specific use cases) as well as\n some unification of the common code for dma_mmap_attrs() and\n dma_mmap_coherent() functions. All extensions have been implemented\n and tested for ARM architecture.\"\n\n* \u0027for-linus-for-3.6-rc1\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:\n ARM: dma-mapping: add support for DMA_ATTR_SKIP_CPU_SYNC attribute\n common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute\n ARM: dma-mapping: add support for dma_get_sgtable()\n common: dma-mapping: introduce dma_get_sgtable() function\n ARM: dma-mapping: add support for DMA_ATTR_NO_KERNEL_MAPPING attribute\n common: DMA-mapping: add DMA_ATTR_NO_KERNEL_MAPPING attribute\n common: dma-mapping: add support for generic dma_mmap_* calls\n ARM: dma-mapping: fix error path for memory allocation failure\n ARM: dma-mapping: add more sanity checks in arm_dma_mmap()\n ARM: dma-mapping: remove custom consistent dma region\n mm: vmalloc: use const void * for caller argument\n scatterlist: add sg_alloc_table_from_pages function\n" }, { "commit": "d2b7428eb0caa7c66e34b6ac869a43915b294123", "tree": "ad30d28a2078d1d9429c8f19815378c5da2c54f5", "parents": [ "955c757e090f41188764a0e488ba7036f7dbb215" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Wed Jun 13 10:05:52 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon Jul 30 12:25:46 2012 +0200" }, "message": "common: dma-mapping: introduce dma_get_sgtable() function\n\nThis patch adds dma_get_sgtable() function which is required to let\ndrivers to share the buffers allocated by DMA-mapping subsystem. Right\nnow the driver gets a dma address of the allocated buffer and the kernel\nvirtual mapping for it. If it wants to share it with other device (\u003d map\ninto its dma address space) it usually hacks around kernel virtual\naddresses to get pointers to pages or assumes that both devices share\nthe DMA address space. Both solutions are just hacks for the special\ncases, which should be avoided in the final version of buffer sharing.\n\nTo solve this issue in a generic way, a new call to DMA mapping has been\nintroduced - dma_get_sgtable(). It allocates a scatter-list which\ndescribes the allocated buffer and lets the driver(s) to use it with\nother device(s) by calling dma_map_sg() on it.\n\nThis patch provides a generic implementation based on virt_to_page()\ncall. Architectures which require more sophisticated translation might\nprovide their own get_sgtable() methods.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nReviewed-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "64ccc9c033c6089b2d426dad3c56477ab066c999", "tree": "ffaec86ca326dfc83b78ce4005bf46c3ad98ceb9", "parents": [ "9fa8af91f0679f2abbebe1382b937264f3a8b981" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu Jun 14 13:03:04 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon Jul 30 12:25:46 2012 +0200" }, "message": "common: dma-mapping: add support for generic dma_mmap_* calls\n\nCommit 9adc5374 (\u0027common: dma-mapping: introduce mmap method\u0027) added a\ngeneric method for implementing mmap user call to dma_map_ops structure.\n\nThis patch converts ARM and PowerPC architectures (the only providers of\ndma_mmap_coherent/dma_mmap_writecombine calls) to use this generic\ndma_map_ops based call and adds a generic cross architecture\ndefinition for dma_mmap_attrs, dma_mmap_coherent, dma_mmap_writecombine\nfunctions.\n\nThe generic mmap virt_to_page-based fallback implementation is provided for\narchitectures which don\u0027t provide their own implementation for mmap method.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nReviewed-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "cea8f46c36c3f82860b038aa23a46e16757666ba", "tree": "e09dc37d2b6880d86dac09afbc0c686139d86df0", "parents": [ "c1e7179a38919f02dd950801529176b72f5e5a8a", "91b006def384d8f07f9f324ab211fefe2b085c90" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 27 15:14:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 27 15:14:26 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM updates from Russell King:\n \"First ARM push of this merge window, post me coming back from holiday.\n This is what has been in linux-next for the last few weeks. Not much\n to say which isn\u0027t described by the commit summaries.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (32 commits)\n ARM: 7463/1: topology: Update cpu_power according to DT information\n ARM: 7462/1: topology: factorize the update of sibling masks\n ARM: 7461/1: topology: Add arch_scale_freq_power function\n ARM: 7456/1: ptrace: provide separate functions for tracing syscall {entry,exit}\n ARM: 7455/1: audit: move syscall auditing until after ptrace SIGTRAP handling\n ARM: 7454/1: entry: don\u0027t bother with syscall tracing on ret_from_fork path\n ARM: 7453/1: audit: only allow syscall auditing for pure EABI userspace\n ARM: 7452/1: delay: allow timer-based delay implementation to be selected\n ARM: 7451/1: arch timer: implement read_current_timer and get_cycles\n ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs\n ARM: 7449/1: use generic strnlen_user and strncpy_from_user functions\n ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration\n ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines\n ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation\n ARM: 7445/1: mm: update CONTEXTIDR register to contain PID of current process\n ARM: 7444/1: kernel: add arch-timer C3STOP feature\n ARM: 7460/1: remove asm/locks.h\n ARM: 7439/1: head.S: simplify initial page table mapping\n ARM: 7437/1: zImage: Allow DTB command line concatenation with ATAG_CMDLINE\n ARM: 7436/1: Do not map the vectors page as write-through on UP systems\n ...\n" }, { "commit": "91b006def384d8f07f9f324ab211fefe2b085c90", "tree": "55dbdea7b3f9bd9569d12ddb710921e1dbcfcc63", "parents": [ "28a33cbc24e4256c143dce96c7d93bf423229f92", "ad722541147e6e517a2077e3d944105e7bc4fa8e", "d0a533b18235d36206b9b422efadb7cee444dfdb", "ff081e05bfba3461119cd280201d163b6858eda2", "339ca09d7adac80eda8d097ab473c6c23ee86b17", "cb70706c822c06d727b04b2786f6788dbed4ad1e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 27 23:06:32 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 27 23:06:32 2012 +0100" }, "message": "Merge branches \u0027audit\u0027, \u0027delay\u0027, \u0027fixes\u0027, \u0027misc\u0027 and \u0027sta2x11\u0027 into for-linus\n" }, { "commit": "84eda28060f7e7d5f91f81f928532af13b9e44b2", "tree": "f0b7feeca9b6a21a43f279fb3b566eef1c16584d", "parents": [ "b387e41e523c1aa347cff055455d0dd129357df4", "2164d3344693d2d4799fe91836d61f55516cbdf0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 27 11:26:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 27 11:26:48 2012 -0700" }, "message": "Merge branch \u0027kmap_atomic\u0027 of git://github.com/congwang/linux\n\nPull final kmap_atomic cleanups from Cong Wang:\n \"This should be the final round of cleanup, as the definitions of enum\n km_type finally get removed from the whole tree. The patches have\n been in linux-next for a long time.\"\n\n* \u0027kmap_atomic\u0027 of git://github.com/congwang/linux:\n pipe: remove KM_USER0 from comments\n vmalloc: remove KM_USER0 from comments\n feature-removal-schedule.txt: remove kmap_atomic(page, km_type)\n tile: remove km_type definitions\n um: remove km_type definitions\n asm-generic: remove km_type definitions\n avr32: remove km_type definitions\n frv: remove km_type definitions\n powerpc: remove km_type definitions\n arm: remove km_type definitions\n highmem: remove the deprecated form of kmap_atomic\n tile: remove usage of enum km_type\n frv: remove the second parameter of kmap_atomic_primary()\n jbd2: remove the second argument of kmap_atomic\n" }, { "commit": "4cb38750d49010ae72e718d46605ac9ba5a851b4", "tree": "8c991a900fd176288f4acbc340512b90d604374d", "parents": [ "0a2fe19ccc4bc552a8083a595a3aa737b8bea727", "7efa1c87963d23cc57ba40c07316d3e28cc75a3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 26 13:17:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 26 13:17:17 2012 -0700" }, "message": "Merge branch \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86/mm changes from Peter Anvin:\n \"The big change here is the patchset by Alex Shi to use INVLPG to flush\n only the affected pages when we only need to flush a small page range.\n\n It also removes the special INVALIDATE_TLB_VECTOR interrupts (32\n vectors!) and replace it with an ordinary IPI function call.\"\n\nFix up trivial conflicts in arch/x86/include/asm/apic.h (added code next\nto changed line)\n\n* \u0027x86-mm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/tlb: Fix build warning and crash when building for !SMP\n x86/tlb: do flush_tlb_kernel_range by \u0027invlpg\u0027\n x86/tlb: replace INVALIDATE_TLB_VECTOR by CALL_FUNCTION_VECTOR\n x86/tlb: enable tlb flush range support for x86\n mm/mmu_gather: enable tlb flush range in generic mmu_gather\n x86/tlb: add tlb_flushall_shift knob into debugfs\n x86/tlb: add tlb_flushall_shift for specific CPU\n x86/tlb: fall back to flush all when meet a THP large page\n x86/flush_tlb: try flush_tlb_single one by one in flush_tlb_range\n x86/tlb_info: get last level TLB entry number of CPU\n x86: Add read_mostly declaration/definition to variables from smp.h\n x86: Define early read-mostly per-cpu macros\n" }, { "commit": "d801d9e5af1ee18b1d14ee02a5956f171b21a080", "tree": "60f3c32ab2bf5ae28ed987862ab7399e37f91090", "parents": [ "96c557df347231b40e2c7f371f0d77914bd29566" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Fri Nov 25 22:58:05 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Tue Jul 24 15:27:30 2012 +0800" }, "message": "asm-generic: remove km_type definitions\n\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\n" }, { "commit": "cc2caea5b6152b8ce66dc2bbe83dc72b60612da8", "tree": "c39d09978bd8f2f7f29771b80b4064e2aabd5d2d", "parents": [ "6a6dccba2fdc2a69f1f36b8f1c0acc8598e7221b" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Fri Jul 06 12:02:04 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Fri Jul 06 12:02:04 2012 +0200" }, "message": "mm: cma: fix condition check when setting global cma area\n\ndev_set_cma_area incorrectly assigned cma to global area on first call\ndue to incorrect check. This patch fixes this issue.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "dccd2304cc907c4b4d2920eeb24b055320fe942e", "tree": "f5242f8cd7c7ebb396959cdcfc108d15e0f3affe", "parents": [ "f8f5701bdaf9134b1f90e5044a82c66324d2073f" ], "author": { "name": "Alessandro Rubini", "email": "rubini@gnudd.com", "time": "Sun Jun 24 12:46:05 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jun 28 17:14:34 2012 +0100" }, "message": "ARM: 7430/1: sizes.h: move from asm-generic to \u003clinux/sizes.h\u003e\n\nsizes.h is used throughout the AMBA code and drivers, so the header\nshould be available to everyone in order to driver AMBA/PrimeCell\nperipherals behind a PCI bridge where the host can be any platform\n(I\u0027m doing it under x86).\n\nAt this step \u003casm-generic/sizes.h\u003e includes \u003clinux/sizes.h\u003e,\nto allow a grace period for both in-tree and out-of-tree drivers.\n\nSigned-off-by: Alessandro Rubini \u003crubini@gnudd.com\u003e\nAcked-by: Giancarlo Asnaghi \u003cgiancarlo.asnaghi@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "597e1c3580b7cfd95bb0f3167e2b297bf8a5a3ae", "tree": "d67c27b8505af6f7f21fa918599c2e9d37c2e5e1", "parents": [ "3df3212f9722c7e45c723b9ea231a04ba4dbc47c" ], "author": { "name": "Alex Shi", "email": "alex.shi@intel.com", "time": "Thu Jun 28 09:02:21 2012 +0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Jun 27 19:29:11 2012 -0700" }, "message": "mm/mmu_gather: enable tlb flush range in generic mmu_gather\n\nThis patch enabled the tlb flush range support in generic mmu layer.\n\nMost of arch has self tlb flush range support, like ARM/IA64 etc.\nX86 arch has no this support in hardware yet. But another instruction\n\u0027invlpg\u0027 can implement this function in some degree. So, enable this\nfeather in generic layer for x86 now. and maybe useful for other archs\nin further.\n\nGeneric mmu_gather struct is protected by micro\nHAVE_GENERIC_MMU_GATHER. Other archs that has flush range supported\nown self mmu_gather struct. So, now this change is safe for them.\n\nIn future we may unify this struct and related functions on multiple\narchs.\n\nThanks for Peter Zijlstra time and time reminder for multiple\narchitecture code safe!\n\nSigned-off-by: Alex Shi \u003calex.shi@intel.com\u003e\nLink: http://lkml.kernel.org/r/1340845344-27557-7-git-send-email-alex.shi@intel.com\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "c4211f42d3e66875298a5e26a75109878c80f15b", "tree": "5f4db23b52be8eb74f95c35621373df790eacdd2", "parents": [ "d8dfe60d6dcad5989c4558b753b98d657e2813c0" ], "author": { "name": "Alex Shi", "email": "alex.shi@intel.com", "time": "Thu Jun 28 09:02:19 2012 +0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Jun 27 19:29:10 2012 -0700" }, "message": "x86/tlb: add tlb_flushall_shift for specific CPU\n\nTesting show different CPU type(micro architectures and NUMA mode) has\ndifferent balance points between the TLB flush all and multiple invlpg.\nAnd there also has cases the tlb flush change has no any help.\n\nThis patch give a interface to let x86 vendor developers have a chance\nto set different shift for different CPU type.\n\nlike some machine in my hands, balance points is 16 entries on\nRomely-EP; while it is at 8 entries on Bloomfield NHM-EP; and is 256 on\nIVB mobile CPU. but on model 15 core2 Xeon using invlpg has nothing\nhelp.\n\nFor untested machine, do a conservative optimization, same as NHM CPU.\n\nSigned-off-by: Alex Shi \u003calex.shi@intel.com\u003e\nLink: http://lkml.kernel.org/r/1340845344-27557-5-git-send-email-alex.shi@intel.com\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "09682c1dd3820445a27d32dcbeee6a6eafff3dc9", "tree": "7e4b74d59ea2fbcf2a6210c3834f58aceab194e0", "parents": [ "6b16351acbd415e66ba16bf7d473ece1574cf0bc" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Jun 25 17:15:31 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 10:32:49 2012 -0700" }, "message": "bug.h: Fix up CONFIG_BUG\u003dn implicit function declarations.\n\nCommit 2603efa31a03 (\"bug.h: Fix up powerpc build regression\") corrected\nthe powerpc build case and extended the __ASSEMBLY__ guards, but it also\ngot caught in pre-processor hell accidentally matching the else case of\nCONFIG_BUG resulting in the BUG disabled case tripping up on\n-Werror\u003dimplicit-function-declaration.\n\nIt\u0027s not possible to __ASSEMBLY__ guard the entire file as architecture\ncode needs to get at the BUGFLAG_WARNING definition in the GENERIC_BUG\ncase, but the rest of the CONFIG_BUG\u003dy/n case needs to be guarded.\n\nRather than littering endless __ASSEMBLY__ checks in each of the if/else\ncases we just move the BUGFLAG definitions up under their own\nGENERIC_BUG test and then shove everything else under one big\n__ASSEMBLY__ guard.\n\nBuild tested on all of x86 CONFIG_BUG\u003dy, CONFIG_BUG\u003dn, powerpc (due to\nit\u0027s dependence on BUGFLAG definitions in assembly code), and sh (due to\nnot bringing in linux/kernel.h to satisfy the taint flag definitions used\nby the generic bug code).\n\nHopefully that\u0027s the end of the corner cases and I can abstain from ever\nhaving to touch this infernal header ever again.\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nTested-by: Fengguang Wu \u003cwfg@linux.intel.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a2a2609c97c1e21996b9d87d10d2c9ff07277524", "tree": "c9db50783d6727f95d2a6b4c019c2d66952969d9", "parents": [ "a4d7a122385e27bdd91101635c704327d7c0d87f", "48c3b583bbddad2220ca4c22319ca5d1f78b2090" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:41:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:41:57 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (21 patches)\n mm/memblock: fix overlapping allocation when doubling reserved array\n c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place\n pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper\n pidns: guarantee that the pidns init will be the last pidns process reaped\n fault-inject: avoid call to random32() if fault injection is disabled\n Viresh has moved\n get_maintainer: Fix --help warning\n mm/memory.c: fix kernel-doc warnings\n mm: fix kernel-doc warnings\n mm: correctly synchronize rss-counters at exit/exec\n mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range\n h8300: use the declarations provided by \u003casm/sections.h\u003e\n h8300: fix use of extinct _sbss and _ebss\n xtensa: use the declarations provided by \u003casm/sections.h\u003e\n xtensa: use \"test -e\" instead of bashism \"test -a\"\n xtensa: replace xtensa-specific _f{data,text} by _s{data,text}\n memcg: fix use_hierarchy css_is_ancestor oops regression\n mm, oom: fix and cleanup oom score calculations\n nilfs2: ensure proper cache clearing for gc-inodes\n thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE\n ...\n" }, { "commit": "e4eed03fd06578571c01d4f1478c874bb432c815", "tree": "9cfd16247d8208a1fe55ad81b0d4d85c17b80415", "parents": [ "abca7c4965845924f65d40e0aa1092bdd895e314" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Jun 20 12:52:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE\n\nIn the x86 32bit PAE CONFIG_TRANSPARENT_HUGEPAGE\u003dy case while holding the\nmmap_sem for reading, cmpxchg8b cannot be used to read pmd contents under\nXen.\n\nSo instead of dealing only with \"consistent\" pmdvals in\npmd_none_or_trans_huge_or_clear_bad() (which would be conceptually\nsimpler) we let pmd_none_or_trans_huge_or_clear_bad() deal with pmdvals\nwhere the low 32bit and high 32bit could be inconsistent (to avoid having\nto use cmpxchg8b).\n\nThe only guarantee we get from pmd_read_atomic is that if the low part of\nthe pmd was found null, the high part will be null too (so the pmd will be\nconsidered unstable). And if the low part of the pmd is found \"stable\"\nlater, then it means the whole pmd was read atomically (because after a\npmd is stable, neither MADV_DONTNEED nor page faults can alter it anymore,\nand we read the high part after the low part).\n\nIn the 32bit PAE x86 case, it is enough to read the low part of the pmdval\natomically to declare the pmd as \"stable\" and that\u0027s true for THP and no\nTHP, furthermore in the THP case we also have a barrier() that will\nprevent any inconsistent pmdvals to be cached by a later re-read of the\n*pmd.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nCc: Ulrich Obergfell \u003cuobergfe@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Larry Woodman \u003clwoodman@redhat.com\u003e\nCc: Petr Matousek \u003cpmatouse@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nTested-by: Andrew Jones \u003cdrjones@redhat.com\u003e\nCc: \u003cstable@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": "2603efa31a0377eeaa06723bded8a1d644dd4901", "tree": "717894107d06b5ac5a3dfa19fb602555c366b92e", "parents": [ "a1f42beb8e287482d1a802731d4fb7e2bdc2c703" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Jun 18 13:54:17 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 18 11:10:59 2012 -0700" }, "message": "bug.h: Fix up powerpc build regression.\n\nThe asm-generic/bug.h __ASSEMBLY__ guarding is completely bogus, which\ntripped up the powerpc build when the kernel.h include was added:\n\n\tIn file included from include/asm-generic/bug.h:5:0,\n\t\t\t from arch/powerpc/include/asm/bug.h:127,\n\t\t\t from arch/powerpc/kernel/head_64.S:31:\n\tinclude/linux/kernel.h:44:0: warning: \"ALIGN\" redefined [enabled by default]\n\tinclude/linux/linkage.h:57:0: note: this is the location of the previous definition\n\tinclude/linux/sysinfo.h: Assembler messages:\n\tinclude/linux/sysinfo.h:7: Error: Unrecognized opcode: `struct\u0027\n\tinclude/linux/sysinfo.h:8: Error: Unrecognized opcode: `__kernel_long_t\u0027\n\nMoving the __ASSEMBLY__ guard up and stashing the kernel.h include under\nit fixes this up, as well as covering the case the original fix was\nattempting to handle.\n\nTested-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "380622e9ff56201f9c3c1f153d1ca0a24324a1d4", "tree": "8a92b7f84445309383e8551e58e42c968dc736ec", "parents": [ "74ca4313bdd0423a7917bbe74be3f27da8a39fe1", "cba8df4be3bdf10c86a26c458c5fc2ca978eeb2c", "3977407e83129f53e43d3ac44be8702f59fa3f77", "1318002aebadf18217ad3de677b6c96b8140dcff", "d14a5fdc26986f7bac8376a339f336be18ba2a90" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Jun 13 12:01:33 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Jun 13 12:01:33 2012 +0900" }, "message": "Merge branches \u0027sh/urgent\u0027, \u0027sh/core\u0027, \u0027sh/clockevents\u0027, \u0027sh/asm-generic\u0027 and \u0027sh/trivial\u0027 into sh-fixes-for-linus\n" }, { "commit": "3777808873b0c49c5cf27e44c948dfb02675d578", "tree": "62259c039e7c2233d8af72350edb971cbe2ae86f", "parents": [ "3a9485da969c1c23400430470db17c819ef51d7b" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Jun 11 14:29:58 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Jun 11 14:29:58 2012 +0900" }, "message": "bug.h: need linux/kernel.h for TAINT_WARN.\n\nasm-generic/bug.h uses taint flags that are only defined in\nlinux/kernel.h, resulting in build failures on platforms that\ndon\u0027t include linux/kernel.h some other way:\n\n arch/sh/include/asm/thread_info.h:172:2: error: \u0027TAINT_WARN\u0027 undeclared (first use in this function)\n\nCaused by commit edd63a2763bd (\"set_restore_sigmask() is never called\nwithout SIGPENDING (and never should be)\").\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "1193755ac6328ad240ba987e6ec41d5e8baf0680", "tree": "40bf847d7e3ebaa57b107151d14e6cd1d280cc6d", "parents": [ "4edebed86690eb8db9af3ab85baf4a34e73266cc", "0ef97dcfce4179a2eba046b855ee2f91d6f1b414" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 10:34:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 10:34:35 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs changes from Al Viro.\n \"A lot of misc stuff. The obvious groups:\n * Miklos\u0027 atomic_open series; kills the damn abuse of\n -\u003ed_revalidate() by NFS, which was the major stumbling block for\n all work in that area.\n * ripping security_file_mmap() and dealing with deadlocks in the\n area; sanitizing the neighborhood of vm_mmap()/vm_munmap() in\n general.\n * -\u003eencode_fh() switched to saner API; insane fake dentry in\n mm/cleancache.c gone.\n * assorted annotations in fs (endianness, __user)\n * parts of Artem\u0027s -\u003es_dirty work (jff2 and reiserfs parts)\n * -\u003eupdate_time() work from Josef.\n * other bits and pieces all over the place.\n\n Normally it would\u0027ve been in two or three pull requests, but\n signal.git stuff had eaten a lot of time during this cycle ;-/\"\n\nFix up trivial conflicts in Documentation/filesystems/vfs.txt (the\n\u0027truncate_range\u0027 inode method was removed by the VM changes, the VFS\nupdate adds an \u0027update_time()\u0027 method), and in fs/btrfs/ulist.[ch] (due\nto sparse fix added twice, with other changes nearby).\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (95 commits)\n nfs: don\u0027t open in -\u003ed_revalidate\n vfs: retry last component if opening stale dentry\n vfs: nameidata_to_filp(): don\u0027t throw away file on error\n vfs: nameidata_to_filp(): inline __dentry_open()\n vfs: do_dentry_open(): don\u0027t put filp\n vfs: split __dentry_open()\n vfs: do_last() common post lookup\n vfs: do_last(): add audit_inode before open\n vfs: do_last(): only return EISDIR for O_CREAT\n vfs: do_last(): check LOOKUP_DIRECTORY\n vfs: do_last(): make ENOENT exit RCU safe\n vfs: make follow_link check RCU safe\n vfs: do_last(): use inode variable\n vfs: do_last(): inline walk_component()\n vfs: do_last(): make exit RCU safe\n vfs: split do_lookup()\n Btrfs: move over to use -\u003eupdate_time\n fs: introduce inode operation -\u003eupdate_time\n reiserfs: get rid of resierfs_sync_super\n reiserfs: mark the superblock as dirty a bit later\n ...\n" }, { "commit": "08615d7d85e5aa02c05bf6c4dde87d940e7f85f6", "tree": "18906149d313d25914160aca21cedf54b3a7e818", "parents": [ "9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702", "0a4dd35c67b144d8ef9432120105f1aab9293ee9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge misc patches from Andrew Morton:\n\n - the \"misc\" tree - stuff from all over the map\n\n - checkpatch updates\n\n - fatfs\n\n - kmod changes\n\n - procfs\n\n - cpumask\n\n - UML\n\n - kexec\n\n - mqueue\n\n - rapidio\n\n - pidns\n\n - some checkpoint-restore feature work. Reluctantly. Most of it\n delayed a release. I\u0027m still rather worried that we don\u0027t have a\n clear roadmap to completion for this work.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (78 patches)\n kconfig: update compression algorithm info\n c/r: prctl: add ability to set new mm_struct::exe_file\n c/r: prctl: extend PR_SET_MM to set up more mm_struct entries\n c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat\n syscalls, x86: add __NR_kcmp syscall\n fs, proc: introduce /proc/\u003cpid\u003e/task/\u003ctid\u003e/children entry\n sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE\n aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()\n eventfd: change int to __u64 in eventfd_signal()\n fs/nls: add Apple NLS\n pidns: make killed children autoreap\n pidns: use task_active_pid_ns in do_notify_parent\n rapidio/tsi721: add DMA engine support\n rapidio: add DMA engine support for RIO data transfers\n ipc/mqueue: add rbtree node caching support\n tools/selftests: add mq_perf_tests\n ipc/mqueue: strengthen checks on mqueue creation\n ipc/mqueue: correct mq_attr_ok test\n ipc/mqueue: improve performance of send/recv\n selftests: add mq_open_tests\n ...\n" }, { "commit": "133fd9f5cda2d86904126f4b9fa4e8f4330c9569", "tree": "0e60bfcec85f123243cf1ffe735264527efd6d0e", "parents": [ "725fe002d315c2501c110b7245d3eb4f4535f4d6" ], "author": { "name": "Denys Vlasenko", "email": "vda.linux@googlemail.com", "time": "Thu May 31 16:26:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:27 2012 -0700" }, "message": "vsprintf: further optimize decimal conversion\n\nPrevious code was using optimizations which were developed to work well\neven on narrow-word CPUs (by today\u0027s standards). But Linux runs only on\n32-bit and wider CPUs. We can use that.\n\nFirst: using 32x32-\u003e64 multiply and trivial 32-bit shift, we can correctly\ndivide by 10 much larger numbers, and thus we can print groups of 9 digits\ninstead of groups of 5 digits.\n\nNext: there are two algorithms to print larger numbers. One is generic:\ndivide by 1000000000 and repeatedly print groups of (up to) 9 digits.\nIt\u0027s conceptually simple, but requires an (unsigned long long) /\n1000000000 division.\n\nSecond algorithm splits 64-bit unsigned long long into 16-bit chunks,\nmanipulates them cleverly and generates groups of 4 decimal digits. It so\nhappens that it does NOT require long long division.\n\nIf long is \u003e 32 bits, division of 64-bit values is relatively easy, and we\nwill use the first algorithm. If long long is \u003e 64 bits (strange\narchitecture with VERY large long long), second algorithm can\u0027t be used,\nand we again use the first one.\n\nElse (if long is 32 bits and long long is 64 bits) we use second one.\n\nAnd third: there is a simple optimization which takes fast path not only\nfor zero as was done before, but for all one-digit numbers.\n\nIn all tested cases new code is faster than old one, in many cases by 30%,\nin few cases by more than 50% (for example, on x86-32, conversion of\n12345678). Code growth is ~0 in 32-bit case and ~130 bytes in 64-bit\ncase.\n\nThis patch is based upon an original from Michal Nazarewicz.\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nSigned-off-by: Denys Vlasenko \u003cvda.linux@googlemail.com\u003e\nCc: Douglas W Jones \u003cjones@cs.uiowa.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bd0e162d0312aa95e8b85ba883efddebf27be121", "tree": "5401fd64650a2c5965e43dccaa636bc814072043", "parents": [ "054552272e6e152ff40f8b7f164dd390a5a62097", "56457f38f212344fb38b250cfa7e7311c065022f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:09:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 12:09:07 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull two small kvm fixes from Avi Kivity:\n \"A build fix for non-kvm archs and a transparent hugepage refcount\n bugfix on hosts with 4M pages.\"\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: Export asm-generic/kvm_para.h\n KVM: MMU: fix huge page adapted on non-PAE host\n" }, { "commit": "bb8ac181a5cf50458a0d83b4460790badc9fdc16", "tree": "d55493f9ca94516a0aa83dd8ee1d87c2a88d637b", "parents": [ "1dfb5751a4de7c6a57a5602e8e2b87267cfc8c81" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 19 10:25:23 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 30 21:04:50 2012 -0400" }, "message": "bury __kernel_nlink_t, make internal nlink_t consistent\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "26c191788f18129af0eb32a358cdaea0c7479626", "tree": "21d30812d2e092a940ba81750f75080ce5eb5ae4", "parents": [ "a7f638f999ff42310e9582273b1fe25ea6e469ba" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Tue May 29 15:06:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:24 2012 -0700" }, "message": "mm: pmd_read_atomic: fix 32bit PAE pmd walk vs pmd_populate SMP race condition\n\nWhen holding the mmap_sem for reading, pmd_offset_map_lock should only\nrun on a pmd_t that has been read atomically from the pmdp pointer,\notherwise we may read only half of it leading to this crash.\n\nPID: 11679 TASK: f06e8000 CPU: 3 COMMAND: \"do_race_2_panic\"\n #0 [f06a9dd8] crash_kexec at c049b5ec\n #1 [f06a9e2c] oops_end at c083d1c2\n #2 [f06a9e40] no_context at c0433ded\n #3 [f06a9e64] bad_area_nosemaphore at c043401a\n #4 [f06a9e6c] __do_page_fault at c0434493\n #5 [f06a9eec] do_page_fault at c083eb45\n #6 [f06a9f04] error_code (via page_fault) at c083c5d5\n EAX: 01fb470c EBX: fff35000 ECX: 00000003 EDX: 00000100 EBP:\n 00000000\n DS: 007b ESI: 9e201000 ES: 007b EDI: 01fb4700 GS: 00e0\n CS: 0060 EIP: c083bc14 ERR: ffffffff EFLAGS: 00010246\n #7 [f06a9f38] _spin_lock at c083bc14\n #8 [f06a9f44] sys_mincore at c0507b7d\n #9 [f06a9fb0] system_call at c083becd\n start len\n EAX: ffffffda EBX: 9e200000 ECX: 00001000 EDX: 6228537f\n DS: 007b ESI: 00000000 ES: 007b EDI: 003d0f00\n SS: 007b ESP: 62285354 EBP: 62285388 GS: 0033\n CS: 0073 EIP: 00291416 ERR: 000000da EFLAGS: 00000286\n\nThis should be a longstanding bug affecting x86 32bit PAE without THP.\nOnly archs with 64bit large pmd_t and 32bit unsigned long should be\naffected.\n\nWith THP enabled the barrier() in pmd_none_or_trans_huge_or_clear_bad()\nwould partly hide the bug when the pmd transition from none to stable,\nby forcing a re-read of the *pmd in pmd_offset_map_lock, but when THP is\nenabled a new set of problem arises by the fact could then transition\nfreely in any of the none, pmd_trans_huge or pmd_trans_stable states.\nSo making the barrier in pmd_none_or_trans_huge_or_clear_bad()\nunconditional isn\u0027t good idea and it would be a flakey solution.\n\nThis should be fully fixed by introducing a pmd_read_atomic that reads\nthe pmd in order with THP disabled, or by reading the pmd atomically\nwith cmpxchg8b with THP enabled.\n\nLuckily this new race condition only triggers in the places that must\nalready be covered by pmd_none_or_trans_huge_or_clear_bad() so the fix\nis localized there but this bug is not related to THP.\n\nNOTE: this can trigger on x86 32bit systems with PAE enabled with more\nthan 4G of ram, otherwise the high part of the pmd will never risk to be\ntruncated because it would be zero at all times, in turn so hiding the\nSMP race.\n\nThis bug was discovered and fully debugged by Ulrich, quote:\n\n----\n[..]\npmd_none_or_trans_huge_or_clear_bad() loads the content of edx and\neax.\n\n 496 static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t\n *pmd)\n 497 {\n 498 /* depend on compiler for an atomic pmd read */\n 499 pmd_t pmdval \u003d *pmd;\n\n // edi \u003d pmd pointer\n0xc0507a74 \u003csys_mincore+548\u003e: mov 0x8(%esp),%edi\n...\n // edx \u003d PTE page table high address\n0xc0507a84 \u003csys_mincore+564\u003e: mov 0x4(%edi),%edx\n...\n // eax \u003d PTE page table low address\n0xc0507a8e \u003csys_mincore+574\u003e: mov (%edi),%eax\n\n[..]\n\nPlease note that the PMD is not read atomically. These are two \"mov\"\ninstructions where the high order bits of the PMD entry are fetched\nfirst. Hence, the above machine code is prone to the following race.\n\n- The PMD entry {high|low} is 0x0000000000000000.\n The \"mov\" at 0xc0507a84 loads 0x00000000 into edx.\n\n- A page fault (on another CPU) sneaks in between the two \"mov\"\n instructions and instantiates the PMD.\n\n- The PMD entry {high|low} is now 0x00000003fda38067.\n The \"mov\" at 0xc0507a8e loads 0xfda38067 into eax.\n----\n\nReported-by: Ulrich Obergfell \u003cuobergfe@redhat.com\u003e\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Larry Woodman \u003clwoodman@redhat.com\u003e\nCc: Petr Matousek \u003cpmatouse@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: \u003cstable@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": "56457f38f212344fb38b250cfa7e7311c065022f", "tree": "a507984aba15733966a9db135870b4e39169bafc", "parents": [ "c35866678391861942b3836c219a8898a259255a" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Mon May 28 17:35:22 2012 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Tue May 29 12:31:01 2012 +0300" }, "message": "KVM: Export asm-generic/kvm_para.h\n\nPrevents build failures on non-KVM archs.\n\nTested-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "1e2aec873ad6d16538512dbb96853caa1fa076af", "tree": "d792b19ac47be44debd24610ae27f1330fa490e4", "parents": [ "ae32adc1e06d096399f195eeda12d443d53539c4", "2c66f623631709aa5f2e4c14c7e089682e7394a3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 16:57:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 16:57:16 2012 -0700" }, "message": "Merge branch \u0027generic-string-functions\u0027\n\nThis makes \u003casm/word-at-a-time.h\u003e actually live up to its promise of\nallowing architectures to help tune the string functions that do their\nwork a word at a time.\n\nDavid had already taken the x86 strncpy_from_user() function, modified\nit to work on sparc, and then done the extra work to make it generically\nuseful. This then expands on that work by making x86 use that generic\nversion, completing the circle.\n\nBut more importantly, it fixes up the word-at-a-time interfaces so that\nit\u0027s now easy to also support things like strnlen_user(), and pretty\nmuch most random string functions.\n\nDavid reports that it all works fine on sparc, and Jonas Bonn reported\nthat an earlier version of this worked on OpenRISC too. It\u0027s pretty\neasy for architectures to add support for this and just replace their\nprivate versions with the generic code.\n\n* generic-string-functions:\n sparc: use the new generic strnlen_user() function\n x86: use the new generic strnlen_user() function\n lib: add generic strnlen_user() function\n word-at-a-time: make the interfaces truly generic\n x86: use generic strncpy_from_user routine\n" }, { "commit": "36126f8f2ed8168eb13aa0662b9b9585cba100a9", "tree": "543f6b6ab60dd3e47af931142aa84f0ba7749d43", "parents": [ "4ae73f2d53255c388d50bf83c1681112a6f9cba1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 10:43:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 11:33:40 2012 -0700" }, "message": "word-at-a-time: make the interfaces truly generic\n\nThis changes the interfaces in \u003casm/word-at-a-time.h\u003e to be a bit more\ncomplicated, but a lot more generic.\n\nIn particular, it allows us to really do the operations efficiently on\nboth little-endian and big-endian machines, pretty much regardless of\nmachine details. For example, if you can rely on a fast population\ncount instruction on your architecture, this will allow you to make your\noptimized \u003casm/word-at-a-time.h\u003e file with that.\n\nNOTE! The \"generic\" version in include/asm-generic/word-at-a-time.h is\nnot truly generic, it actually only works on big-endian. Why? Because\non little-endian the generic algorithms are wasteful, since you can\ninevitably do better. The x86 implementation is an example of that.\n\n(The only truly non-generic part of the asm-generic implementation is\nthe \"find_zero()\" function, and you could make a little-endian version\nof it. And if the Kbuild infrastructure allowed us to pick a particular\nheader file, that would be lovely)\n\nThe \u003casm/word-at-a-time.h\u003e functions are as follows:\n\n - WORD_AT_A_TIME_CONSTANTS: specific constants that the algorithm\n uses.\n\n - has_zero(): take a word, and determine if it has a zero byte in it.\n It gets the word, the pointer to the constant pool, and a pointer to\n an intermediate \"data\" field it can set.\n\n This is the \"quick-and-dirty\" zero tester: it\u0027s what is run inside\n the hot loops.\n\n - \"prep_zero_mask()\": take the word, the data that has_zero() produced,\n and the constant pool, and generate an *exact* mask of which byte had\n the first zero. This is run directly *outside* the loop, and allows\n the \"has_zero()\" function to answer the \"is there a zero byte\"\n question without necessarily getting exactly *which* byte is the\n first one to contain a zero.\n\n If you do multiple byte lookups concurrently (eg \"hash_name()\", which\n looks for both NUL and \u0027/\u0027 bytes), after you\u0027ve done the prep_zero_mask()\n phase, the result of those can be or\u0027ed together to get the \"either\n or\" case.\n\n - The result from \"prep_zero_mask()\" can then be fed into \"find_zero()\"\n (to find the byte offset of the first byte that was zero) or into\n \"zero_bytemask()\" (to find the bytemask of the bytes preceding the\n zero byte).\n\n The existence of zero_bytemask() is optional, and is not necessary\n for the normal string routines. But dentry name hashing needs it, so\n if you enable DENTRY_WORD_AT_A_TIME you need to expose it.\n\nThis changes the generic strncpy_from_user() function and the dentry\nhashing functions to use these modified word-at-a-time interfaces. This\ngets us back to the optimized state of the x86 strncpy that we lost in\nthe previous commit when moving over to the generic version.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fa2af6e4fe0c4d2f8875d42625b25675e8584010", "tree": "ef9a92949858ab763aa1bfda7cb11a5f7b84d123", "parents": [ "109b9b0408e5f1dd327a44f446841a9fbe0bcd83", "1fcb78e9da714d96f65edd37b29dae3b1f7df508" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 15:59:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 15:59:38 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull tile updates from Chris Metcalf:\n \"These changes cover a range of new arch/tile features and\n optimizations. They\u0027ve been through LKML review and on linux-next for\n a month or so. There\u0027s also one bug-fix that just missed 3.4, which\n I\u0027ve marked for stable.\"\n\nFixed up trivial conflict in arch/tile/Kconfig (new added tile Kconfig\nentries clashing with the generic timer/clockevents changes).\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n tile: default to tilegx_defconfig for ARCH\u003dtile\n tile: fix bug where fls(0) was not returning 0\n arch/tile: mark TILEGX as not EXPERIMENTAL\n tile/mm/fault.c: Port OOM changes to handle_page_fault\n arch/tile: add descriptive text if the kernel reports a bad trap\n arch/tile: allow querying cpu module information from the hypervisor\n arch/tile: fix hardwall for tilegx and generalize for idn and ipi\n arch/tile: support multiple huge page sizes dynamically\n mm: add new arch_make_huge_pte() method for tile support\n arch/tile: support kexec() for tilegx\n arch/tile: support \u003casm/cachectl.h\u003e header for cacheflush() syscall\n arch/tile: Allow tilegx to build with either 16K or 64K page size\n arch/tile: optimize get_user/put_user and friends\n arch/tile: support building big-endian kernel\n arch/tile: allow building Linux with transparent huge pages enabled\n arch/tile: use interrupt critical sections less\n" }, { "commit": "73636b1aacb1a07e6fbe0d25e560e69b024a8e25", "tree": "9531c202c6b3f67fba1cd7ac2b83fa32c31fe197", "parents": [ "51007004f44c9588d70ffb77e1f52479bd5b0e37" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Wed Mar 28 13:59:18 2012 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri May 25 12:48:21 2012 -0400" }, "message": "arch/tile: allow building Linux with transparent huge pages enabled\n\nThe change adds some infrastructure for managing tile pmd\u0027s more generally,\nusing pte_pmd() and pmd_pte() methods to translate pmd values to and\nfrom ptes, since on TILEPro a pmd is really just a nested structure\nholding a pgd (aka pte). Several existing pmd methods are moved into\nthis framework, and a whole raft of additional pmd accessors are defined\nthat are used by the transparent hugepage framework.\n\nThe tile PTE now has a \"client2\" bit. The bit is used to indicate a\ntransparent huge page is in the process of being split into subpages.\n\nThis change also fixes a generic bug where the return value of the\ngeneric pmdp_splitting_flush() was incorrect.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "d484864dd96e1830e7689510597707c1df8cd681", "tree": "51551708ba3f26d05575fa91daaf0c0d970a77c3", "parents": [ "be87cfb47c5c740f7b17929bcd7c480b228513e0", "0f51596bd39a5c928307ffcffc9ba07f90f42a8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nPull CMA and ARM DMA-mapping updates from Marek Szyprowski:\n \"These patches contain two major updates for DMA mapping subsystem\n (mainly for ARM architecture). First one is Contiguous Memory\n Allocator (CMA) which makes it possible for device drivers to allocate\n big contiguous chunks of memory after the system has booted.\n\n The main difference from the similar frameworks is the fact that CMA\n allows to transparently reuse the memory region reserved for the big\n chunk allocation as a system memory, so no memory is wasted when no\n big chunk is allocated. Once the alloc request is issued, the\n framework migrates system pages to create space for the required big\n chunk of physically contiguous memory.\n\n For more information one can refer to nice LWN articles:\n\n - \u0027A reworked contiguous memory allocator\u0027:\n\t\thttp://lwn.net/Articles/447405/\n\n - \u0027CMA and ARM\u0027:\n\t\thttp://lwn.net/Articles/450286/\n\n - \u0027A deep dive into CMA\u0027:\n\t\thttp://lwn.net/Articles/486301/\n\n - and the following thread with the patches and links to all previous\n versions:\n\t\thttps://lkml.org/lkml/2012/4/3/204\n\n The main client for this new framework is ARM DMA-mapping subsystem.\n\n The second part provides a complete redesign in ARM DMA-mapping\n subsystem. The core implementation has been changed to use common\n struct dma_map_ops based infrastructure with the recent updates for\n new dma attributes merged in v3.4-rc2. This allows to use more than\n one implementation of dma-mapping calls and change/select them on the\n struct device basis. The first client of this new infractructure is\n dmabounce implementation which has been completely cut out of the\n core, common code.\n\n The last patch of this redesign update introduces a new, experimental\n implementation of dma-mapping calls on top of generic IOMMU framework.\n This lets ARM sub-platform to transparently use IOMMU for DMA-mapping\n calls if one provides required IOMMU hardware.\n\n For more information please refer to the following thread:\n\t\thttp://www.spinics.net/lists/arm-kernel/msg175729.html\n\n The last patch merges changes from both updates and provides a\n resolution for the conflicts which cannot be avoided when patches have\n been applied on the same files (mainly arch/arm/mm/dma-mapping.c).\"\n\nAcked by Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n \"Yup, this one please. It\u0027s had much work, plenty of review and I\n think even Russell is happy with it.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: (28 commits)\n ARM: dma-mapping: use PMD size for section unmap\n cma: fix migration mode\n ARM: integrate CMA with DMA-mapping subsystem\n X86: integrate CMA with DMA-mapping subsystem\n drivers: add Contiguous Memory Allocator\n mm: trigger page reclaim in alloc_contig_range() to stabilise watermarks\n mm: extract reclaim code from __alloc_pages_direct_reclaim()\n mm: Serialize access to min_free_kbytes\n mm: page_isolation: MIGRATE_CMA isolation functions added\n mm: mmzone: MIGRATE_CMA migration type added\n mm: page_alloc: change fallbacks array handling\n mm: page_alloc: introduce alloc_contig_range()\n mm: compaction: export some of the functions\n mm: compaction: introduce isolate_freepages_range()\n mm: compaction: introduce map_pages()\n mm: compaction: introduce isolate_migratepages_range()\n mm: page_alloc: remove trailing whitespace\n ARM: dma-mapping: add support for IOMMU mapper\n ARM: dma-mapping: use alloc, mmap, free from dma_ops\n ARM: dma-mapping: remove redundant code and do the cleanup\n ...\n\nConflicts:\n\tarch/x86/include/asm/dma-mapping.h\n" }, { "commit": "07acfc2a9349a8ce45b236c2624dad452001966b", "tree": "c40f3eaac18a8320e65af220979223b5cd632b1b", "parents": [ "b5f4035adfffbcc6b478de5b8c44b618b3124aff", "322728e55aa7834e2fab2786b76df183c4843a12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM changes from Avi Kivity:\n \"Changes include additional instruction emulation, page-crossing MMIO,\n faster dirty logging, preventing the watchdog from killing a stopped\n guest, module autoload, a new MSI ABI, and some minor optimizations\n and fixes. Outside x86 we have a small s390 and a very large ppc\n update.\n\n Regarding the new (for kvm) rebaseless workflow, some of the patches\n that were merged before we switch trees had to be rebased, while\n others are true pulls. In either case the signoffs should be correct\n now.\"\n\nFix up trivial conflicts in Documentation/feature-removal-schedule.txt\narch/powerpc/kvm/book3s_segment.S and arch/x86/include/asm/kvm_para.h.\n\nI suspect the kvm_para.h resolution ends up doing the \"do I have cpuid\"\ncheck effectively twice (it was done differently in two different\ncommits), but better safe than sorry ;)\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (125 commits)\n KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block\n KVM: s390: onereg for timer related registers\n KVM: s390: epoch difference and TOD programmable field\n KVM: s390: KVM_GET/SET_ONEREG for s390\n KVM: s390: add capability indicating COW support\n KVM: Fix mmu_reload() clash with nested vmx event injection\n KVM: MMU: Don\u0027t use RCU for lockless shadow walking\n KVM: VMX: Optimize %ds, %es reload\n KVM: VMX: Fix %ds/%es clobber\n KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte()\n KVM: VMX: unlike vmcs on fail path\n KVM: PPC: Emulator: clean up SPR reads and writes\n KVM: PPC: Emulator: clean up instruction parsing\n kvm/powerpc: Add new ioctl to retreive server MMU infos\n kvm/book3s: Make kernel emulated H_PUT_TCE available for \"PR\" KVM\n KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler\n KVM: PPC: Book3S: Enable IRQs during exit handling\n KVM: PPC: Fix PR KVM on POWER7 bare metal\n KVM: PPC: Fix stbux emulation\n KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields\n ...\n" }, { "commit": "b1bf7d4d1b3911352cf1ec63c1de06214288ccd0", "tree": "0fd27c638977cb5c7e6e3f95085ce842b57a4ae3", "parents": [ "0708500d49e8439d9fe5529795bdc1485f0f46c3", "3e11f7b840b4671213c66817294ad7dd0b572756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO driver changes from Grant Likely:\n \"Lots of gpio changes, both to core code and drivers.\n\n Changes do touch architecture code to remove the need for separate\n arm/gpio.h includes in most architectures.\n\n Some new drivers are added, and a number of gpio drivers are converted\n to use irq_domains for gpio inputs used as interrupts. Device tree\n support has been amended to allow multiple gpio_chips to use the same\n device tree node.\n\n Remaining changes are primarily bug fixes.\"\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (33 commits)\n gpio/generic: initialize basic_mmio_gpio shadow variables properly\n gpiolib: Remove \u0027const\u0027 from data argument of gpiochip_find()\n gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583\n gpiolib: quiet gpiochip_add boot message noise\n gpio: mpc8xxx: Prevent NULL pointer deref in demux handler\n gpio/lpc32xx: Add device tree support\n gpio: Adjust of_xlate API to support multiple GPIO chips\n gpiolib: Implement devm_gpio_request_one()\n gpio-mcp23s08: dbg_show: fix pullup configuration display\n Add support for TCA6424A\n gpio/omap: (re)fix wakeups on level-triggered GPIOs\n gpio/omap: fix broken context restore for non-OFF mode transitions\n gpio/omap: fix missing check in *_runtime_suspend()\n gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()\n gpio/omap: remove suspend/resume callbacks\n gpio/omap: remove retrigger variable in gpio_irq_handler\n gpio/omap: remove saved_wakeup field from struct gpio_bank\n gpio/omap: remove suspend_wakeup field from struct gpio_bank\n gpio/omap: remove saved_fallingdetect, saved_risingdetect\n gpio/omap: remove virtual_irq_start variable\n ...\n\nConflicts:\n\tdrivers/gpio/gpio-samsung.c\n" }, { "commit": "2ff2b289a695807e291e1ed9f639d8a3ba5f4254", "tree": "e4b7f44e5cc1582ba2be8aeba221f4841f4c86a6", "parents": [ "88d6ae8dc33af12fe1c7941b1fae2767374046fd", "73787190d04a34e6da745da893b3ae8bedde418f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf changes from Ingo Molnar:\n \"Lots of changes:\n\n - (much) improved assembly annotation support in perf report, with\n jump visualization, searching, navigation, visual output\n improvements and more.\n\n - kernel support for AMD IBS PMU hardware features. Notably \u0027perf\n record -e cycles:p\u0027 and \u0027perf top -e cycles:p\u0027 should work without\n skid now, like PEBS does on the Intel side, because it takes\n advantage of IBS transparently.\n\n - the libtracevents library: it is the first step towards unifying\n tracing tooling and perf, and it also gives a tracing library for\n external tools like powertop to rely on.\n\n - infrastructure: various improvements and refactoring of the UI\n modules and related code\n\n - infrastructure: cleanup and simplification of the profiling\n targets code (--uid, --pid, --tid, --cpu, --all-cpus, etc.)\n\n - tons of robustness fixes all around\n\n - various ftrace updates: speedups, cleanups, robustness\n improvements.\n\n - typing \u0027make\u0027 in tools/ will now give you a menu of projects to\n build and a short help text to explain what each does.\n\n - ... and lots of other changes I forgot to list.\n\n The perf record make bzImage + perf report regression you reported\n should be fixed.\"\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (166 commits)\n tracing: Remove kernel_lock annotations\n tracing: Fix initial buffer_size_kb state\n ring-buffer: Merge separate resize loops\n perf evsel: Create events initially disabled -- again\n perf tools: Split term type into value type and term type\n perf hists: Fix callchain ip printf format\n perf target: Add uses_mmap field\n ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER\n ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()\n ftrace: Make ftrace_modify_all_code() global for archs to use\n ftrace: Return record ip addr for ftrace_location()\n ftrace: Consolidate ftrace_location() and ftrace_text_reserved()\n ftrace: Speed up search by skipping pages by address\n ftrace: Remove extra helper functions\n ftrace: Sort all function addresses, not just per page\n tracing: change CPU ring buffer state from tracing_cpumask\n tracing: Check return value of tracing_dentry_percpu()\n ring-buffer: Reset head page before running self test\n ring-buffer: Add integrity check at end of iter read\n ring-buffer: Make addition of pages in ring buffer atomic\n ...\n" }, { "commit": "0f51596bd39a5c928307ffcffc9ba07f90f42a8b", "tree": "b636403815316ecad2170092b70f1079df260a95", "parents": [ "61f6c7a47a2f84b7ba4b65240ffe9247df772b06", "4ce63fcd919c32d22528e54dcd89506962933719" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "message": "Merge branch \u0027for-next-arm-dma\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/dma-mapping.c\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b", "tree": "4322be35db678f6299348a76ad60a2023954af7d", "parents": [ "99262a3dafa3290866512ddfb32609198f8973e9", "ff2bb047c4bce9742e94911eeb44b4d6ff4734ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates from James Morris:\n \"New notable features:\n - The seccomp work from Will Drewry\n - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski\n - Longer security labels for Smack from Casey Schaufler\n - Additional ptrace restriction modes for Yama by Kees Cook\"\n\nFix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)\n apparmor: fix long path failure due to disconnected path\n apparmor: fix profile lookup for unconfined\n ima: fix filename hint to reflect script interpreter name\n KEYS: Don\u0027t check for NULL key pointer in key_validate()\n Smack: allow for significantly longer Smack labels v4\n gfp flags for security_inode_alloc()?\n Smack: recursive tramsmute\n Yama: replace capable() with ns_capable()\n TOMOYO: Accept manager programs which do not start with / .\n KEYS: Add invalidation support\n KEYS: Do LRU discard in full keyrings\n KEYS: Permit in-place link replacement in keyring list\n KEYS: Perform RCU synchronisation on keys prior to key destruction\n KEYS: Announce key type (un)registration\n KEYS: Reorganise keys Makefile\n KEYS: Move the key config into security/keys/Kconfig\n KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat\n Yama: remove an unused variable\n samples/seccomp: fix dependencies on arch macros\n Yama: add additional ptrace scopes\n ...\n" }, { "commit": "3bb07f1b73ea6313b843807063e183e168c9182a", "tree": "f0e2ab77b8bc993a843a0edede00668c589863cc", "parents": [ "6326c71fd2fb3bef5fa33951479298b683da35fe", "5420e46d4d79bcd5d5952df98d022c8412385d32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:24:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:24:54 2012 -0700" }, "message": "Merge tag \u0027pci-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI changes from Bjorn Helgaas:\n - Host bridge cleanups from Yinghai\n - Disable Bus Master bit on PCI device shutdown (kexec-related)\n - Stratus ftServer fix\n - pci_dev_reset() locking fix\n - IvyBridge graphics erratum workaround\n\n* tag \u0027pci-for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)\n microblaze/PCI: fix \"io_offset undeclared\" error\n x86/PCI: only check for spinlock being held in SMP kernels\n resources: add resource_overlaps()\n PCI: fix uninitialized variable \u0027cap_mask\u0027\n MAINTAINERS: update PCI git tree and patchwork\n PCI: disable Bus Master on PCI device shutdown\n PCI: work around IvyBridge internal graphics FLR erratum\n x86/PCI: fix unused variable warning in amd_bus.c\n PCI: move mutex locking out of pci_dev_reset function\n PCI: work around Stratus ftServer broken PCIe hierarchy\n x86/PCI: merge pcibios_scan_root() and pci_scan_bus_on_node()\n x86/PCI: dynamically allocate pci_root_info for native host bridge drivers\n x86/PCI: embed pci_sysdata into pci_root_info on ACPI path\n x86/PCI: embed name into pci_root_info struct\n x86/PCI: add host bridge resource release for _CRS path\n x86/PCI: refactor get_current_resources()\n PCI: add host bridge release support\n PCI: add generic device into pci_host_bridge struct\n PCI: rename pci_host_bridge() to find_pci_root_bridge()\n x86/PCI: fix memleak with get_current_resources()\n ...\n" }, { "commit": "322728e55aa7834e2fab2786b76df183c4843a12", "tree": "ccd2211d5f88d8875155d693a776f68efb03c2d5", "parents": [ "46a6dd1c87c4ff17202574127daf70cc0bb38d6d" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 18 13:59:39 2012 -0400" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Mon May 21 17:47:52 2012 +0300" }, "message": "KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block\n\nThere are two functions in this asm-generic file. Looking at\nother arch which do not use the generic version, these two fcns\nare within an #ifdef __KERNEL__ block, so make the generic one\nconsistent with those.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "c64be2bb1c6eb43c838b2c6d57b074078be208dd", "tree": "d0720eda4a440ff91f3296b0f90cc53ac514d4b9", "parents": [ "49f223a9cd96c7293d7258ff88c2bdf83065f69c" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu Dec 29 13:09:51 2011 +0100" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:09:37 2012 +0200" }, "message": "drivers: add Contiguous Memory Allocator\n\nThe Contiguous Memory Allocator is a set of helper functions for DMA\nmapping framework that improves allocations of contiguous memory chunks.\n\nCMA grabs memory on system boot, marks it with MIGRATE_CMA migrate type\nand gives back to the system. Kernel is allowed to allocate only movable\npages within CMA\u0027s managed memory so that it can be used for example for\npage cache when DMA mapping do not use it. On\ndma_alloc_from_contiguous() request such pages are migrated out of CMA\narea to free required contiguous block and fulfill the request. This\nallows to allocate large contiguous chunks of memory at any time\nassuming that there is enough free memory available in the system.\n\nThis code is heavily based on earlier works by Michal Nazarewicz.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nTested-by: Rob Clark \u003crob.clark@linaro.org\u003e\nTested-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nTested-by: Benjamin Gaignard \u003cbenjamin.gaignard@linaro.org\u003e\nTested-by: Robert Nelson \u003crobertcnelson@gmail.com\u003e\nTested-by: Barry Song \u003cBaohua.Song@csr.com\u003e\n" }, { "commit": "bca0fa5f12a6744a2b2e53154af65a51402b3426", "tree": "3da5a3098d9a9139e7a027cdab1a8ae5386f6be0", "parents": [ "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Fri Mar 23 13:05:14 2012 +0100" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:06:09 2012 +0200" }, "message": "common: add dma_mmap_from_coherent() function\n\nAdd a common helper for dma-mapping core for mapping a coherent buffer\nto userspace.\n\nReported-by: Subash Patel \u003csubashrp@gmail.com\u003e\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nAcked-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nTested-By: Subash Patel \u003csubash.ramaswamy@linaro.org\u003e\n" }, { "commit": "bb27f55eb9405257a59c82550dbb0d684cc3a665", "tree": "bdab5866709e6ac7eeef7493d7d73bbd3d6231b6", "parents": [ "b732d439cb43336cd6d7e804ecb2c81193ef63b0", "5e1c81d98a5621007824b49dde556fead5ff9c6c" ], "author": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Mon May 21 09:17:31 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Mon May 21 09:17:50 2012 +0200" }, "message": "Merge branch \u0027perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core\n\nFixes for perf/core:\n\n - Rename some perf_target methods to avoid double negation, from Namhyung Kim.\n - Revert change to use per task events with inheritance, from Namhyung Kim.\n - Events should start disabled till children starts running, from David Ahern.\n\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "07ce8ec7308ab3fa55fe2861671b157f857fff58", "tree": "4e0b2fa2f61bbae54ecfc5be7d88e4501ca497ec", "parents": [ "e9fe32bcadb8a7a40411d77f168abd45941b049b" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 18 23:01:05 2012 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 18 23:01:05 2012 -0600" }, "message": "gpiolib: Remove \u0027const\u0027 from data argument of gpiochip_find()\n\nCommit 3d0f7cf0 \"gpio: Adjust of_xlate API to support multiple GPIO\nchips\" changed the api of gpiochip_find to drop const from the data\nparameter of the match hook, but didn\u0027t also drop const from data\ncausing a build warning.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "3d0f7cf0f3633f92ddeb767eb59cab73963d4dee", "tree": "be23f5d9657d558d690adc84b16bdd6d91668f47", "parents": [ "09d71ff19404b3957fab6de942fb8026ccfd8524" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu May 17 13:54:40 2012 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 18 16:48:36 2012 -0600" }, "message": "gpio: Adjust of_xlate API to support multiple GPIO chips\n\nThis patch changes the of_xlate API to make it possible for multiple\ngpio_chips to refer to the same device tree node. This is useful for\nbanked GPIO controllers that use multiple gpio_chips for a single\ndevice. With this change the core code will try calling of_xlate on\neach gpio_chip that references the device_node and will return the\ngpio number for the first one to return \u0027true\u0027.\n\nTested-by: Roland Stigge \u003cstigge@antcom.de\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "09d71ff19404b3957fab6de942fb8026ccfd8524", "tree": "ba3680f5b79ea1fbeae073ab7cb28c9bdcad7e60", "parents": [ "eb1567f7ad0032ba7b02b878e352f191d53dc228" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed May 02 12:46:46 2012 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 18 16:48:35 2012 -0600" }, "message": "gpiolib: Implement devm_gpio_request_one()\n\nAllow drivers to use the modern request and configure idiom together\nwith devres.\n\nAs with plain gpio_request() and gpio_request_one() we can\u0027t implement\nthe old school version in terms of _one() as this would force the\nexplicit selection of a direction in gpio_request() which could break\nsystems if we pick the wrong one. Implementing devm_gpio_request_one()\nin terms of devm_gpio_request() would needlessly complicate things or\nlead to duplication from the unmanaged version depending on how it\u0027s\ndone.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "9fd49328fc2a1cbfea542bcbcf004b5c81dc495b", "tree": "da8f42d3483da2b1b224d422db074cbe954b5cd3", "parents": [ "71babb2705e2203a64c27ede13ae3508a0d2c16c" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Apr 24 22:32:06 2012 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Wed May 16 19:58:44 2012 -0400" }, "message": "ftrace: Sort all function addresses, not just per page\n\nInstead of just sorting the ip\u0027s of the functions per ftrace page,\nsort the entire list before adding them to the ftrace pages.\n\nThis will allow the bsearch algorithm to be sped up as it can\nalso sort by pages, not just records within a page.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3", "tree": "e6e666085abe674dbf6292555961fe0a0f2e2d2f", "parents": [ "08162e6a23d476544adfe1164afe9ea8b34ab859", "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Fri May 04 12:46:40 2012 +1000" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Fri May 04 12:46:40 2012 +1000" }, "message": "Merge tag \u0027v3.4-rc5\u0027 into next\n\nLinux 3.4-rc5\n\nMerge to pull in prerequisite change for Smack:\n86812bb0de1a3758dc6c7aa01a763158a7c0638a\n\nRequested by Casey.\n" }, { "commit": "284f5f9dbac170b054c1e386ef92cbf654e91bba", "tree": "74cacc94070d5590378c368fa7378d37319d07be", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Mon Apr 30 15:21:02 2012 -0600" }, "committer": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Mon Apr 30 15:21:02 2012 -0600" }, "message": "PCI: work around Stratus ftServer broken PCIe hierarchy\n\nA PCIe downstream port is a P2P bridge. Its secondary interface is\na link that should lead only to device 0 (unless ARI is enabled)[1], so\nwe don\u0027t probe for non-zero device numbers.\n\nSome Stratus ftServer systems have a PCIe downstream port (02:00.0) that\nleads to both an upstream port (03:00.0) and a downstream port (03:01.0),\nand 03:01.0 has important devices below it:\n\n [0000:02]-+-00.0-[03-3c]--+-00.0-[04-09]--...\n \\-01.0-[0a-0d]--+-[USB]\n +-[NIC]\n +-...\n\nPreviously, we didn\u0027t enumerate device 03:01.0, so USB and the network\ndidn\u0027t work. This patch adds a DMI quirk to scan all device numbers,\nnot just 0, below a downstream port.\n\nBased on a patch by Prarit Bhargava.\n\n[1] PCIe spec r3.0, sec 7.3.1\n\nCC: Myron Stowe \u003cmstowe@redhat.com\u003e\nCC: Don Dutile \u003cddutile@redhat.com\u003e\nCC: James Paradis \u003cjames.paradis@stratus.com\u003e\nCC: Matthew Wilcox \u003cmatthew.r.wilcox@intel.com\u003e\nCC: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCC: Prarit Bhargava \u003cprarit@redhat.com\u003e\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e" }, { "commit": "f5c2347ee20a8d6964d6a6b1ad04f200f8d4dfa7", "tree": "88fc7d201dfa1e14b1689cccee512c3852a8c346", "parents": [ "f7f286a910221ae18b21c18d9d0f4cd88965829f" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Apr 26 11:45:16 2012 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Apr 30 12:55:15 2012 -0700" }, "message": "asm-generic: Use __BITS_PER_LONG in statfs.h\n\n\u003casm-generic/statfs.h\u003e is exported to userspace, so using\nBITS_PER_LONG is invalid. We need to use __BITS_PER_LONG instead.\n\nThis is kernel bugzilla 43165.\n\nReported-by: H.J. Lu \u003chjl.tools@gmail.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nLink: http://lkml.kernel.org/r/1335465916-16965-1-git-send-email-hpa@linux.intel.com\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "d643bdca8ab9cd333da1b68267d0e47328e56f56", "tree": "59fa93e4f8e51fcbd862aeeef25d026d19c18459", "parents": [ "98e5272fe70d62e193f70acf9951667beab27aba" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Apr 23 16:29:18 2012 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Mon Apr 23 16:29:18 2012 -0700" }, "message": "asm-generic: Allow overriding clock_t and add attributes to siginfo_t\n\nFor the particular issue of x32, which shares code with i386 in the\nhandling of compat_siginfo_t, the use of a 64-bit clock_t bumps the\nsigchld structure out of alignment, which triggers a messy cascade of\npadding.\n\nThis was already handled on the kernel compat side, but it needs\nhandling on the user space side, which uses the generic header. To\nmake that possible:\n\n1. Allow __kernel_clock_t to be overridden in struct siginfo;\n2. Allow there to be attributes added to struct siginfo.\n\nReported-by: H.J. Lu \u003chjl.rools@gmail.com\u003e\nCc: Bruce J. Beare \u003cbruce.j.beare@intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nLink: http://lkml.kernel.org/r/CAMe9rOqF6Kh6-NK7oP0Fpzkd4SBAWU%2BG53hwBbSD4iA2UzyxuA@mail.gmail.com\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "1f15d10984c854e077da5aa1a23f901496b49773", "tree": "38b0c6fb2bf22413c02e83d9e3b8f28333131cf8", "parents": [ "8281715b4109b5ee26032ff7b77c0d575c4150f7" ], "author": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Fri Apr 20 18:21:46 2012 -0300" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Fri Apr 20 18:24:54 2012 -0300" }, "message": "KVM: add kvm_arch_para_features stub to asm-generic/kvm_para.h\n\nNeeded by kvm_para_has_feature().\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "bb6ea4301a1109afdacaee576fedbfcd7152fc86", "tree": "5412219057d8e0ec2a30d0a1ad4f6b7dd398c754", "parents": [ "a0727e8ce513fe6890416da960181ceb10fbfae6" ], "author": { "name": "Will Drewry", "email": "wad@chromium.org", "time": "Thu Apr 12 16:48:01 2012 -0500" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Sat Apr 14 11:13:21 2012 +1000" }, "message": "seccomp: Add SECCOMP_RET_TRAP\n\nAdds a new return value to seccomp filters that triggers a SIGSYS to be\ndelivered with the new SYS_SECCOMP si_code.\n\nThis allows in-process system call emulation, including just specifying\nan errno or cleanly dumping core, rather than just dying.\n\nSuggested-by: Markus Gutschke \u003cmarkus@chromium.org\u003e\nSuggested-by: Julien Tinnes \u003cjln@chromium.org\u003e\nSigned-off-by: Will Drewry \u003cwad@chromium.org\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\n\nv18: - acked-by, rebase\n - don\u0027t mention secure_computing_int() anymore\nv15: - use audit_seccomp/skip\n - pad out error spacing; clean up switch (indan@nul.nu)\nv14: - n/a\nv13: - rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc\nv12: - rebase on to linux-next\nv11: - clarify the comment (indan@nul.nu)\n - s/sigtrap/sigsys\nv10: - use SIGSYS, syscall_get_arch, updates arch/Kconfig\n note suggested-by (though original suggestion had other behaviors)\nv9: - changes to SIGILL\nv8: - clean up based on changes to dependent patches\nv7: - introduction\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\n" }, { "commit": "a0727e8ce513fe6890416da960181ceb10fbfae6", "tree": "300fc5c620c4e90915985504007d9e66bc896d14", "parents": [ "acf3b2c71ed20c53dc69826683417703c2a88059" ], "author": { "name": "Will Drewry", "email": "wad@chromium.org", "time": "Thu Apr 12 16:48:00 2012 -0500" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Sat Apr 14 11:13:21 2012 +1000" }, "message": "signal, x86: add SIGSYS info and make it synchronous.\n\nThis change enables SIGSYS, defines _sigfields._sigsys, and adds\nx86 (compat) arch support. _sigsys defines fields which allow\na signal handler to receive the triggering system call number,\nthe relevant AUDIT_ARCH_* value for that number, and the address\nof the callsite.\n\nSIGSYS is added to the SYNCHRONOUS_MASK because it is desirable for it\nto have setup_frame() called for it. The goal is to ensure that\nucontext_t reflects the machine state from the time-of-syscall and not\nfrom another signal handler.\n\nThe first consumer of SIGSYS would be seccomp filter. In particular,\na filter program could specify a new return value, SECCOMP_RET_TRAP,\nwhich would result in the system call being denied and the calling\nthread signaled. This also means that implementing arch-specific\nsupport can be dependent upon HAVE_ARCH_SECCOMP_FILTER.\n\nSuggested-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Will Drewry \u003cwad@chromium.org\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nReviewed-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\n\nv18: - added acked by, rebase\nv17: - rebase and reviewed-by addition\nv14: - rebase/nochanges\nv13: - rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc\nv12: - reworded changelog (oleg@redhat.com)\nv11: - fix dropped words in the change description\n - added fallback copy_siginfo support.\n - added __ARCH_SIGSYS define to allow stepped arch support.\nv10: - first version based on suggestion\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\n" }, { "commit": "07bd18d00d5dcf84eb22f8120f47f09c3d8fe27d", "tree": "ac0d755afdba978932ad530901acf1619431b266", "parents": [ "932ecebb0405b9a41cd18946e6cff8a17d434e23" ], "author": { "name": "Will Drewry", "email": "wad@chromium.org", "time": "Thu Apr 12 16:47:55 2012 -0500" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Sat Apr 14 11:13:19 2012 +1000" }, "message": "asm/syscall.h: add syscall_get_arch\n\nAdds a stub for a function that will return the AUDIT_ARCH_* value\nappropriate to the supplied task based on the system call convention.\n\nFor audit\u0027s use, the value can generally be hard-coded at the\naudit-site. However, for other functionality not inlined into syscall\nentry/exit, this makes that information available. seccomp_filter is\nthe first planned consumer and, as such, the comment indicates a tie to\nCONFIG_HAVE_ARCH_SECCOMP_FILTER.\n\nSuggested-by: Roland McGrath \u003cmcgrathr@chromium.org\u003e\nSigned-off-by: Will Drewry \u003cwad@chromium.org\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\n\nv18: comment and change reword and rebase.\nv14: rebase/nochanges\nv13: rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc\nv12: rebase on to linux-next\nv11: fixed improper return type\nv10: introduced\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\n" }, { "commit": "3b5d56b9317fa7b5407dff1aa7b115bf6cdbd494", "tree": "d733bab15dcf193c3364d14fc2d973aa20a28fe3", "parents": [ "eae3ee7d8a7c59cf63441dedf28674889f5fc477" ], "author": { "name": "Eric B Munson", "email": "emunson@mgebm.net", "time": "Sat Mar 10 14:37:26 2012 -0500" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Apr 08 12:48:59 2012 +0300" }, "message": "kvmclock: Add functions to check if the host has stopped the vm\n\nWhen a host stops or suspends a VM it will set a flag to show this. The\nwatchdog will use these functions to determine if a softlockup is real, or the\nresult of a suspended VM.\n\nSigned-off-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nasm-generic changes Acked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n\n" }, { "commit": "80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8", "tree": "4f2826dadc1daa16058d4505f3d24ac98b45a397", "parents": [ "f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:47 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:27 2012 -0700" }, "message": "asm-generic: add linux/types.h to cmpxchg.h\n\nBuilds of the openrisc or1ksim_defconfig show the following:\n\n In file included from arch/openrisc/include/generated/asm/cmpxchg.h:1:0,\n from include/asm-generic/atomic.h:18,\n from arch/openrisc/include/generated/asm/atomic.h:1,\n from include/linux/atomic.h:4,\n from include/linux/dcache.h:4,\n from fs/notify/fsnotify.c:19:\n include/asm-generic/cmpxchg.h: In function \u0027__xchg\u0027:\n include/asm-generic/cmpxchg.h:34:20: error: expected \u0027)\u0027 before \u0027u8\u0027\n include/asm-generic/cmpxchg.h:34:20: warning: type defaults to \u0027int\u0027 in type name\n\nand many more lines of similar errors. It seems specific to the or32\nbecause most other platforms have an arch specific component that would\nhave already included types.h ahead of time, but the o32 does not.\n\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a591afc01d9e48affbacb365558a31e53c85af45", "tree": "9bb91f4eb94ec69fc4706c4944788ec5f3586063", "parents": [ "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "31796ac4e8f0e88f5c10f1ad6dab8f19bebe44a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "message": "Merge branch \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x32 support for x86-64 from Ingo Molnar:\n \"This tree introduces the X32 binary format and execution mode for x86:\n 32-bit data space binaries using 64-bit instructions and 64-bit kernel\n syscalls.\n\n This allows applications whose working set fits into a 32 bits address\n space to make use of 64-bit instructions while using a 32-bit address\n space with shorter pointers, more compressed data structures, etc.\"\n\nFix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}\n\n* \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)\n x32: Fix alignment fail in struct compat_siginfo\n x32: Fix stupid ia32/x32 inversion in the siginfo format\n x32: Add ptrace for x32\n x32: Switch to a 64-bit clock_t\n x32: Provide separate is_ia32_task() and is_x32_task() predicates\n x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls\n x86/x32: Fix the binutils auto-detect\n x32: Warn and disable rather than error if binutils too old\n x32: Only clear TIF_X32 flag once\n x32: Make sure TS_COMPAT is cleared for x32 tasks\n fs: Remove missed -\u003efds_bits from cessation use of fd_set structs internally\n fs: Fix close_on_exec pointer in alloc_fdtable\n x32: Drop non-__vdso weak symbols from the x32 VDSO\n x32: Fix coding style violations in the x32 VDSO code\n x32: Add x32 VDSO support\n x32: Allow x32 to be configured\n x32: If configured, add x32 system calls to system call tables\n x32: Handle process creation\n x32: Signal-related system calls\n x86: Add #ifdef CONFIG_COMPAT to \u003casm/sys_ia32.h\u003e\n ...\n" }, { "commit": "50483c3268918ee51a56d1baa39b9149d2d0d521", "tree": "2fb9c927c319628ebddfd118c10df3e626bdd1c4", "parents": [ "7fda0412c5f7afdd1a5ff518f98dee5157266d8a", "1631fcea8399da5e80a80084b3b8c5bfd99d21e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 14:49:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 14:49:45 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull arch/tile (really asm-generic) update from Chris Metcalf:\n \"These are a couple of asm-generic changes that apply to tile.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n compat: use sys_sendfile64() implementation for sendfile syscall\n [PATCH v3] ipc: provide generic compat versions of IPC syscalls\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "d25413efa9536e2f425ea45c7720598035c597bc", "tree": "97dcd459a7ec23c9438983fe14a23aef03b09bad", "parents": [ "683c5e853ebe2d1ac72128f1828421de7fc3a23c", "f946eeb9313ff1470758e171a60fe7438a2ded3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 14:27:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 14:27:09 2012 -0700" }, "message": "Merge git://github.com/rustyrussell/linux\n\nPull module and param updates from Rusty Russell:\n \"I\u0027m getting married next week, and then honeymoon until 6th May. I\u0027ll\n be offline from next week, except to post the compulsory pictures if\n Alex shaves her head...\"\n\nI\u0027m sure Rusty can take time off from his honeymoon if something comes\nup. And here\u0027s the explanation about head shaving:\n\n\thttp://baldalex.org/\n\nin case you wondered and wanted to support another insane caper or\nRusty\u0027s involving shaving.\n\nWhat *is* it with Rusty and shaving, anyway?\n\n* git://github.com/rustyrussell/linux:\n module: Remove module size limit\n module: move __module_get and try_module_get() out of line.\n params: \u003clevel\u003e_initcall-like kernel parameters\n module_param: remove support for bool parameters which are really int.\n module: add kernel param to force disable module load\n" }, { "commit": "7bf97e1d5a94b6a71815771bb9452fc2c022c966", "tree": "f89082dbd33a51a79c9a9c0dddb29e2b11b8207e", "parents": [ "30304e5a79d424eb2c8707b3ff0e9b8bf6ab3e8f", "c77c8a6fd3d57b586ff5ecb5ab5b32ca4f54fe75" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 14:08:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 14:08:46 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO changes for v3.4 from Grant Likely:\n \"Primarily gpio device driver changes with some minor side effects\n under arch/arm and arch/x86. Also includes a few core changes such as\n explicitly supporting (electrical) open source and open drain outputs\n and some help for parsing gpio devicetree properties.\"\n\nFix up context conflict due to Laxman Dewangan adding sleep control for\nthe tps65910 driver separately for gpio\u0027s and regulators.\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (34 commits)\n gpio/ep93xx: Remove unused inline function and useless pr_err message\n gpio/sodaville: Mark broken due to core irqdomain migration\n gpio/omap: fix redundant decoding of gpio offset\n gpio/omap: fix incorrect update to context.irqenable1\n gpio/omap: fix incorrect context restore logic in omap_gpio_runtime_*\n gpio/omap: fix missing dataout context save in _set_gpio_dataout_reg\n gpio/omap: fix _set_gpio_irqenable implementation\n gpio/omap: fix trigger type to unsigned\n gpio/omap: fix wakeup_en register update in _set_gpio_wakeup()\n gpio: tegra: tegra_gpio_config shouldn\u0027t be __init\n gpio/davinci: fix enabling unbanked GPIO IRQs\n gpio/davinci: fix oops on unbanked gpio irq request\n gpio/omap: Fix section warning for omap_mpuio_alloc_gc()\n ARM: tegra: export tegra_gpio_{en,dis}able\n gpio/gpio-stmpe: Fix the value returned by _get_value routine\n Documentation/gpio.txt: Explain expected pinctrl interaction\n GPIO: LPC32xx: Add output reading to GPO P3\n GPIO: LPC32xx: Fix missing bit selection mask\n gpio/omap: fix wakeups on level-triggered GPIOs\n gpio/omap: Fix IRQ handling for SPARSE_IRQ\n ...\n" }, { "commit": "141124c02059eee9dbc5c86ea797b1ca888e77f7", "tree": "ee5feb86df07f0f0de1350dd569767ec31537869", "parents": [ "9ffc93f203c18a70623f21950f1dd473c9ec48cd" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Delete all instances of asm/system.h\n\nDelete all instances of asm/system.h as they should be redundant by this\npoint.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "9ffc93f203c18a70623f21950f1dd473c9ec48cd", "tree": "1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2", "parents": [ "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Remove all #inclusions of asm/system.h\n\nRemove all #inclusions of asm/system.h preparatory to splitting and killing\nit. Performed with the following command:\n\nperl -p -i -e \u0027s!^#\\s*include\\s*\u003casm/system[.]h\u003e.*\\n!!\u0027 `grep -Irl \u0027^#\\s*include\\s*\u003casm/system[.]h\u003e\u0027 *`\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae", "tree": "c109d45d3fb8ccad461cfe6d9a4aa4d6005b38e1", "parents": [ "49a7f04a4b9d45cd794741ce3d5d66524b37bdd0" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Add #includes needed to permit the removal of asm/system.h\n\nasm/system.h is a cause of circular dependency problems because it contains\ncommonly used primitive stuff like barrier definitions and uncommonly used\nstuff like switch_to() that might require MMU definitions.\n\nasm/system.h has been disintegrated by this point on all arches into the\nfollowing common segments:\n\n (1) asm/barrier.h\n\n Moved memory barrier definitions here.\n\n (2) asm/cmpxchg.h\n\n Moved xchg() and cmpxchg() here. #included in asm/atomic.h.\n\n (3) asm/bug.h\n\n Moved die() and similar here.\n\n (4) asm/exec.h\n\n Moved arch_align_stack() here.\n\n (5) asm/elf.h\n\n Moved AT_VECTOR_SIZE_ARCH here.\n\n (6) asm/switch_to.h\n\n Moved switch_to() here.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "5d1250660a476c588361fb5cb9cbfa52768540c2", "tree": "7bac3068c68feb4eb8e96d069e190ae27eb65de7", "parents": [ "158bc507c2f53109bed51c806acf5bfd48d95f1a" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Split arch_align_stack() out from asm-generic/system.h\n\nSplit arch_align_stack() out from asm-generic/system.h into its own header of\nasm-generic/exec.h as part of the asm/system.h disintegration.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "158bc507c2f53109bed51c806acf5bfd48d95f1a", "tree": "8c5f98ca9ccfd4362fe50c46038988794e96795b", "parents": [ "b4816afa3986704d1404fc48e931da5135820472" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Split the switch_to() wrapper out of asm-generic/system.h\n\nSplit the switch_to() wrapper out of asm-generic/system.h into its own\nasm-generic/system.h as part of the asm/system.h disintegration.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "b4816afa3986704d1404fc48e931da5135820472", "tree": "e2d0d5779c55528e0439eee359d46bc9a2c017f7", "parents": [ "885df91ca3571afd4b3f50f3391329bbf3c9e262" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n\nMove the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\nto simplify disintegration of asm/system.h.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "885df91ca3571afd4b3f50f3391329bbf3c9e262", "tree": "e66773beb0fb84fc4a43037ba829719b3cbabe47", "parents": [ "34484277b173d0af1bb00532a264940b57920429" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Create asm-generic/barrier.h\n\nCreate asm-generic/barrier.h and move the barrier definitions from\nasm-generic/system.h to it.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "34484277b173d0af1bb00532a264940b57920429", "tree": "d3cb2984acf58bfcd08a1f1a67c8e291272418a0", "parents": [ "f9aa7e1882f3ceec919b30f64a2ce6e66a2571b1" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n\nMake asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h as all arch\nfiles that #include the former also #include the latter. See:\n\n\tgrep -rl asm-generic/cmpxchg-local[.]h arch/ | sort \u003e b\n\tgrep -rl asm-generic/cmpxchg[.]h arch/ | sort \u003e a\n\tcomm a b\n\nThis simplifies the disintegration of asm-generic/system.h for arches that\ndon\u0027t have their own.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "1631fcea8399da5e80a80084b3b8c5bfd99d21e7", "tree": "97dbf61e224142068842d1ab5391e8c46a950bba", "parents": [ "48b25c43e6eebb6c0edf72935e8720385beca76b" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Mon Mar 26 16:26:12 2012 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Tue Mar 27 13:36:57 2012 -0400" }, "message": "compat: use sys_sendfile64() implementation for sendfile syscall\n\n\u003casm-generic/unistd.h\u003e was set up to use sys_sendfile() for the 32-bit\ncompat API instead of sys_sendfile64(), but in fact the right thing to\ndo is to use sys_sendfile64() in all cases. The 32-bit sendfile64() API\nin glibc uses the sendfile64 syscall, so it has to be capable of doing\nfull 64-bit operations. But the sys_sendfile() kernel implementation\nhas a MAX_NON_LFS test in it which explicitly limits the offset to 2^32.\nSo, we need to use the sys_sendfile64() implementation in the kernel\nfor this case.\n\nCc: \u003cstable@kernel.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "026cee0086fe1df4cf74691cf273062cc769617d", "tree": "22735ecd2132de4570fbad81e5716f7fee3448d5", "parents": [ "8b8252813dee8e8cd453bb219731c36b268c69a7" ], "author": { "name": "Pawel Moll", "email": "pawel.moll@arm.com", "time": "Mon Mar 26 12:50:51 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Mar 26 12:50:51 2012 +1030" }, "message": "params: \u003clevel\u003e_initcall-like kernel parameters\n\nThis patch adds a set of macros that can be used to declare\nkernel parameters to be parsed _before_ initcalls at a chosen\nlevel are executed. We rename the now-unused \"flags\" field of\nstruct kernel_param as the level. It\u0027s signed, for when we\nuse this for early params as well, in future.\n\nLinker macro collating init calls had to be modified in order\nto add additional symbols between levels that are later used\nby the init code to split the calls into blocks.\n\nSigned-off-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "ed2d265d1266736bd294332d7f649003943ae36e", "tree": "860e5b7bb72933e4a9abacdc2f2d75a0e6254e32", "parents": [ "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "6c03438edeb5c359af35f060ea016ca65671c269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "message": "Merge tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/bug.h\u003e cleanup from Paul Gortmaker:\n \"The changes shown here are to unify linux\u0027s BUG support under the one\n \u003clinux/bug.h\u003e file. Due to historical reasons, we have some BUG code\n in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in\n linux/kernel.h predates the addition of linux/bug.h, but old code in\n kernel.h wasn\u0027t moved to bug.h at that time. As a band-aid, kernel.h\n was including \u003casm/bug.h\u003e to pseudo link them.\n\n This has caused confusion[1] and general yuck/WTF[2] reactions. Here\n is an example that violates the principle of least surprise:\n\n CC lib/string.o\n lib/string.c: In function \u0027strlcat\u0027:\n lib/string.c:225:2: error: implicit declaration of function \u0027BUILD_BUG_ON\u0027\n make[2]: *** [lib/string.o] Error 1\n $\n $ grep linux/bug.h lib/string.c\n #include \u003clinux/bug.h\u003e\n $\n\n We\u0027ve included \u003clinux/bug.h\u003e for the BUG infrastructure and yet we\n still get a compile fail! [We\u0027ve not kernel.h for BUILD_BUG_ON.] Ugh -\n very confusing for someone who is new to kernel development.\n\n With the above in mind, the goals of this changeset are:\n\n 1) find and fix any include/*.h files that were relying on the\n implicit presence of BUG code.\n 2) find and fix any C files that were consuming kernel.h and hence\n relying on implicitly getting some/all BUG code.\n 3) Move the BUG related code living in kernel.h to \u003clinux/bug.h\u003e\n 4) remove the asm/bug.h from kernel.h to finally break the chain.\n\n During development, the order was more like 3-4, build-test, 1-2. But\n to ensure that git history for bisect doesn\u0027t get needless build\n failures introduced, the commits have been reorderd to fix the problem\n areas in advance.\n\n\t[1] https://lkml.org/lkml/2012/1/3/90\n\t[2] https://lkml.org/lkml/2012/1/17/414\"\n\nFix up conflicts (new radeon file, reiserfs header cleanups) as per Paul\nand linux-next.\n\n* tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n kernel.h: doesn\u0027t explicitly use bug.h, so don\u0027t include it.\n bug: consolidate BUILD_BUG_ON with other bug code\n BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n bug.h: add include of it to various implicit C users\n lib: fix implicit users of kernel.h for TAINT_WARN\n spinlock: macroize assert_spin_locked to avoid bug.h dependency\n x86: relocate get/set debugreg fcns to include/asm/debugreg.\n" } ], "next": "8e3ade251bc7c0a4f0777df4dd34343a03efadba" }