summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-04-031-1/+2
|\
| * dma/direct: Handle the memory encryption bit in common codeChristoph Hellwig2018-03-201-1/+1
| * x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)Christoph Hellwig2018-03-201-0/+1
* | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2018-04-031-5/+7
|\ \
| * | x86/jailhouse: Allow to use PCI_MMCONFIG without ACPIJan Kiszka2018-03-081-1/+5
| * | x86: Consolidate PCI_MMCONFIG configsJan Kiszka2018-03-081-7/+4Star
| * | x86: Align x86_64 PCI_MMCONFIG with 32-bit variantJan Kiszka2018-03-081-1/+2
* | | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-04-031-6/+11
|\ \ \
| * | | x86/mm/32: Remove unused node_memmap_size_bytes() & CONFIG_NEED_NODE_MEMMAP_S...David Rientjes2018-03-271-4/+0Star
| | |/ | |/|
| * | Merge branch 'x86/pti' into x86/mm, to pick up dependenciesIngo Molnar2018-03-121-10/+2Star
| |\ \
| * \ \ Merge tag 'v4.16-rc3' into x86/mm, to pick up fixesIngo Molnar2018-02-261-18/+59
| |\ \ \ | | | |/ | | |/|
| * | | x86/mm: Allow to boot without LA57 if CONFIG_X86_5LEVEL=yKirill A. Shutemov2018-02-161-2/+2
| * | | x86/mm: Make MAX_PHYSADDR_BITS and MAX_PHYSMEM_BITS dynamicKirill A. Shutemov2018-02-141-0/+1
| * | | x86/mm: Make virtual memory layout dynamic for CONFIG_X86_5LEVEL=yKirill A. Shutemov2018-02-141-0/+8
* | | | x86: Remove FAST_FEATURE_TESTSPeter Zijlstra2018-03-201-11/+0Star
* | | | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-03-111-10/+1Star
|\ \ \ \ | | |_|/ | |/| |
| * | | x86/vsyscall/64: Drop "native" vsyscallsAndy Lutomirski2018-03-081-10/+1Star
* | | | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-02-261-0/+1
|\| | | | |_|/ |/| |
| * | objtool, retpolines: Integrate objtool with retpoline support more closelyPeter Zijlstra2018-02-211-0/+1
| |/
* | x86/Kconfig: Exclude i586-class CPUs lacking PAE support from the HIGHMEM64G ...Matthew Whitehead2018-02-161-1/+1
* | x86/Kconfig: Further simplify the NR_CPUS configIngo Molnar2018-02-111-26/+40
* | x86/Kconfig: Simplify NR_CPUS configRandy Dunlap2018-02-111-15/+42
|/
* Merge branch 'akpm' (patches from Andrew)Linus Torvalds2018-02-071-1/+1
|\
| * Makefile: move stack-protector availability out of KconfigKees Cook2018-02-071-1/+1
* | Merge branch 'linus' into sched/urgent, to resolve conflictsIngo Molnar2018-02-061-4/+6
|\|
| * Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2018-02-041-0/+1
| |\
| | * x86: Implement thread_struct whitelist for hardened usercopyKees Cook2018-01-151-0/+1
| * | Merge tag 'driver-core-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-02-011-3/+3
| |\ \
| | * | firmware: Fix up docs referring to FIRMWARE_IN_KERNELBenjamin Gilbert2018-01-251-3/+3
| * | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2018-02-011-1/+0Star
| |\ \ \
| | * | | mm: relax deferred struct page requirementsPavel Tatashin2018-02-011-1/+0Star
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2018-01-311-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-01-171-1/+14
| | |\ \ \
| | * | | | error-injection: Separate error-injection from kprobeMasami Hiramatsu2018-01-131-1/+1
| | * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-12-291-1/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | bpf: add a bpf_override_function helperJosef Bacik2017-12-121-0/+1
| | | |_|/ | | |/| |
| * | | | Merge tag 'dma-mapping-4.16' of git://git.infradead.org/users/hch/dma-mappingLinus Torvalds2018-01-311-0/+1
| |\ \ \ \
| | * | | | dma-mapping: move swiotlb arch helpers to a new headerChristoph Hellwig2018-01-101-0/+1
| | | |/ / | | |/| |
* | | | | membarrier/x86: Provide core serializing commandMathieu Desnoyers2018-02-051-0/+1
* | | | | lockin/x86: Implement sync_core_before_usermode()Mathieu Desnoyers2018-02-051-0/+1
|/ / / /
* | | | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2018-01-301-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | x86/jailhouse: Add PCI dependencyArnd Bergmann2018-01-151-1/+1
| * | | x86/jailhouse: Enable PMTIMERJan Kiszka2018-01-141-0/+1
| * | | x86/jailhouse: Add infrastructure for running in non-root cellJan Kiszka2018-01-141-0/+8
* | | | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-01-141-0/+14
|\ \ \ \ | |/ / / |/| | |
| * | | x86/retpoline: Add initial retpoline supportDavid Woodhouse2018-01-121-0/+13
| * | | x86/cpu: Implement CPU vulnerabilites sysfs functionsThomas Gleixner2018-01-081-0/+1
* | | | locking/refcounts: Remove stale comment from the ARCH_HAS_REFCOUNT Kconfig entryEric Biggers2018-01-081-1/+0Star
| |/ / |/| |
* | | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2017-12-231-1/+2
|\| | | |/ |/|
| * x86/Kconfig: Limit NR_CPUS on 32-bit to a sane amountThomas Gleixner2017-12-221-1/+2