summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'efi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mfle...Ingo Molnar2012-10-261-0/+12
|\
| * x86: efi: Turn off efi_enabled after setup on mixed fw/kernelOlof Johansson2012-10-251-0/+12
* | x86, mm: Use memblock memory loop instead of e820_RAMYinghai Lu2012-10-241-7/+8
* | Merge commit '5bc66170dc486556a1e36fd384463536573f4b82' into x86/urgentH. Peter Anvin2012-10-191-4/+5
|\|
| * Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-10-121-0/+3
| |\
| | * jiffies: Remove compile time assumptions about CLOCK_TICK_RATEJohn Stultz2012-09-241-0/+3
| * | Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2012-10-041-1/+1
| |\ \
| | * | x86: KVM guest: merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUESTMarcelo Tosatti2012-08-231-1/+1
| | |/
| * | x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done()Attilio Rao2012-09-121-1/+0Star
| * | x86: Move paging_init() call to x86_init.paging.pagetable_init()Attilio Rao2012-09-121-1/+0Star
| * | x86: Rename pagetable_setup_start() to pagetable_init()Attilio Rao2012-09-121-1/+1
| * | x86: Remove base argument from x86_init.paging.pagetable_setup_startAttilio Rao2012-09-121-1/+1
| |/
* / x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct ma...Jacob Shin2012-10-171-2/+15
|/
* Merge branch 'x86/cleanups' into x86/apicIngo Molnar2012-06-151-2/+0Star
|\
| * Revert "x86/platform: Add a wallclock_init func to x86_platforms ops"Feng Tang2012-05-241-2/+0Star
* | Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2012-05-301-2/+4
|\ \
| * | x86, realmode: read cr4 and EFER from kernel for 64-bit trampolineJarkko Sakkinen2012-05-091-0/+2
| * | x86, realmode: Move ACPI wakeup to unified realmode codeJarkko Sakkinen2012-05-081-2/+0Star
| * | x86, realmode: Relocator for realmode codeJarkko Sakkinen2012-05-081-0/+2
* | | x86: print physical addresses consistently with other parts of kernelBjorn Helgaas2012-05-301-8/+8
* | | Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-05-251-0/+2
|\ \ \ | |_|/ |/| |
| * | X86: integrate CMA with DMA-mapping subsystemMarek Szyprowski2012-05-211-0/+2
| |/
* | Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/pa...Linus Torvalds2012-05-241-8/+0Star
|\ \
| * | MCA: delete all remaining traces of microchannel bus support.Paul Gortmaker2012-05-181-8/+0Star
| |/
| |
| \
*-. \ Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-li...Linus Torvalds2012-05-231-4/+3Star
|\ \ \ | | |/ | |/|
| | * x86: Don't continue booting if we can't load the specified initrdPeter Jones2012-05-161-4/+3Star
| |/
* | x86/apic: Fix UP boot crashIngo Molnar2012-05-071-1/+2
* | x86/apic: Replace io_apic_ops with x86_io_apic_ops.Konrad Rzeszutek Wilk2012-05-011-1/+1
|/
* Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-03-291-10/+1Star
|\
| * kdump x86: fix total mem size calculation for reservationDave Young2012-03-291-10/+1Star
* | Disintegrate asm/system.h for X86David Howells2012-03-281-1/+0Star
|/
* x86, efi: Allow basic init with mixed 32/64-bit efi/kernelOlof Johansson2012-02-241-2/+8
* Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-01-121-6/+1Star
|\
| * x86: Don't use magic strings for EFI loader signatureMatt Fleming2011-12-101-6/+1Star
| * x86, efi: Calling __pa() with an ioremap()ed address is invalidMatt Fleming2011-12-091-1/+20
* | Merge branch 'master' into x86/memblockTejun Heo2011-11-281-0/+2
|\|
| * x86/platform: Add a wallclock_init func to x86_platforms opsFeng Tang2011-11-101-0/+2
* | memblock, x86: Replace memblock_x86_reserve/free_range() with generic onesTejun Heo2011-07-141-9/+8Star
* | memblock: Kill MEMBLOCK_ERRORTejun Heo2011-07-141-2/+2
|/
* Merge branch 'linus' into x86/urgentIngo Molnar2011-05-261-0/+2
|\
| * printk: allocate kernel log buffer earlierMike Travis2011-05-251-0/+2
* | x86, efi: Retain boot service code until after switching to virtual modeMatthew Garrett2011-05-261-0/+7
|/
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-05-241-1/+0Star
|\
| * x86/PCI: Remove dma32_reserve_bootmemYinghai Lu2011-05-111-1/+0Star
* | Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-05-201-5/+1Star
|\ \ | |/ |/|
| * x86, cpu: Clean up and unify the NOP selection infrastructureH. Peter Anvin2011-04-191-5/+1Star
* | x86, hibernate: Initialize mmu_cr4_features during bootH. Peter Anvin2011-04-061-0/+5
|/
* crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, s...Olaf Hering2011-03-241-22/+0Star
* Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-03-221-22/+3Star
|\
| * x86: Cleanup highmap after brk is concludedYinghai Lu2011-03-191-22/+3Star