Ingo Molnar e5185a76a2 Merge branch 'x86/boot' into x86/mm, to avoid conflict ...

There's a conflict between ongoing level-5 paging support and
the E820 rewrite. Since the E820 rewrite is essentially ready,
merge it into x86/mm to reduce tree conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-04-11 08:56:05 +02:00

..

acpi

Merge branch 'x86/boot' into x86/mm, to avoid conflict

2017-04-11 08:56:05 +02:00

apic

Merge branch 'x86/boot' into x86/mm, to avoid conflict

2017-04-11 08:56:05 +02:00

cpu

Merge branch 'x86/boot' into x86/mm, to avoid conflict

2017-04-11 08:56:05 +02:00

fpu

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

kprobes

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-07 14:38:16 -08:00

.gitignore

…

alternative.c

x86/alternatives: Do not use sync_core() to serialize I$

2016-12-20 09:36:42 +01:00

amd_gart_64.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h>

2017-03-02 08:42:34 +01:00

amd_nb.c

x86/amd_nb: Add SMN and Indirect Data Fabric access for AMD Fam17h

2016-11-16 20:46:38 +01:00

apb_timer.c

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2016-12-25 14:30:04 -08:00

aperture_64.c

x86/boot/e820: Prefix the E820_* type names with "E820_TYPE_"

2017-01-28 22:55:22 +01:00

apm_32.c

x86: Remap GDT tables in the fixmap section

2017-03-16 09:06:35 +01:00

asm-offsets_32.c

sched/x86: Rewrite the switch_to() code

2016-08-24 12:31:41 +02:00

asm-offsets_64.c

x86/kvm: Provide optimized version of vcpu_is_preempted() for x86-64

2017-02-21 12:48:35 +01:00

asm-offsets.c

efi: Get and store the secure boot status

2017-02-07 10:42:10 +01:00

audit_64.c

…

bootflag.c

x86: don't use module_init for non-modular core bootflag code

2015-06-16 14:12:34 -04:00

check.c

Merge tag 'v4.2-rc8' into x86/mm, before applying new changes

2015-08-25 09:59:19 +02:00

cpuid.c

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2016-12-12 19:25:04 -08:00

crash_dump_32.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

crash_dump_64.c

…

crash.c

x86/boot/e820: Clean up the E820 table size define names

2017-01-28 22:55:23 +01:00

devicetree.c

x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage

2016-04-13 11:37:41 +02:00

doublefault.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h>

2017-03-02 08:42:34 +01:00

dumpstack_32.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h>

2017-03-02 08:42:34 +01:00

dumpstack_64.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h>

2017-03-02 08:42:34 +01:00

dumpstack.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

e820.c

x86/boot: Fix pr_debug() API braindamage

2017-02-01 11:07:23 +01:00

early_printk.c

x86: Fix misspellings in comments

2016-02-24 08:44:58 +01:00

early-quirks.c

x86/boot/e820: Simplify the e820__update_table() interface

2017-01-28 22:55:24 +01:00

ebda.c

x86/boot: Simplify EBDA-vs-BIOS reservation logic

2016-07-22 11:46:01 +02:00

espfix_64.c

x86/espfix: Add support for 5-level paging

2017-04-04 08:22:34 +02:00

ftrace.c

x86/build: Mostly disable '-maccumulate-outgoing-args'

2017-03-30 11:53:04 +02:00

head32.c

x86/boot/e820: Move asm/e820.h to asm/e820/api.h

2017-01-28 09:31:13 +01:00

head64.c

Merge branch 'x86/boot' into x86/mm, to avoid conflict

2017-04-11 08:56:05 +02:00

head_32.S

x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C

2017-01-06 08:39:26 +01:00

head_64.S

x86/boot/64: Rename start_cpu()

2017-03-07 13:57:25 +01:00

hpet.c

x86/hpet: Prevent might sleep splat on resume

2017-03-02 09:33:47 +01:00

hw_breakpoint.c

x86/kernel: Audit and remove any unnecessary uses of module.h

2016-07-14 15:06:41 +02:00

i8237.c

…

i8253.c

x86/kernel: Audit and remove any unnecessary uses of module.h

2016-07-14 15:06:41 +02:00

i8259.c

x86/irq: Probe for PIC presence before allocating descs for legacy IRQs

2015-11-07 10:37:37 +01:00

io_delay.c

x86/kernel: Audit and remove any unnecessary uses of module.h

2016-07-14 15:06:41 +02:00

ioport.c

Merge tag 'kvm-4.11-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2017-03-04 11:36:19 -08:00

irq_32.c

x86/kernel: Audit and remove any unnecessary uses of module.h

2016-07-14 15:06:41 +02:00

irq_64.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

irq_work.c

x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers

2017-01-05 08:58:49 +01:00

irq.c

x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers

2017-01-05 08:58:49 +01:00

irqinit.c

x86/irq: Store irq descriptor in vector array

2015-08-06 00:14:59 +02:00

itmt.c

sched/x86: Remove unnecessary TBM3 check to update topology

2017-01-19 08:42:37 +01:00

jump_label.c

locking/jump_labels: Update bug_at() boot message

2017-01-12 09:43:07 +01:00

kdebugfs.c

x86/kdebugfs: Move boot params hierarchy under (debugfs)/x86/

2017-03-01 09:57:02 +01:00

kexec-bzimage64.c

x86/boot/e820: Clean up the E820 table size define names

2017-01-28 22:55:23 +01:00

kgdb.c

sched/x86: Add 'struct inactive_task_frame' to better document the sleeping task stack frame

2016-08-24 12:27:41 +02:00

ksysfs.c

x86: Apply more __ro_after_init and const

2016-08-10 14:55:05 +02:00

kvm.c

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2017-02-22 18:22:53 -08:00

kvmclock.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>

2017-03-02 08:42:27 +01:00

ldt.c

Merge branch 'akpm' (patches from Andrew)

2016-12-12 20:50:02 -08:00

livepatch.c

livepatch/x86: apply alternatives and paravirt patches after relocations

2016-08-18 23:41:55 +02:00

machine_kexec_32.c

x86/kexec: Add 5-level paging support

2017-03-27 08:56:13 +02:00

machine_kexec_64.c

x86/kexec: Add 5-level paging support

2017-03-27 08:56:13 +02:00

Makefile

mm: add arch-independent testcases for RODATA

2017-02-27 18:43:48 -08:00

mcount_64.S

x86: Fix export for mcount and __fentry__

2016-10-26 12:38:17 +02:00

mmconf-fam10h_64.c

…

module.c

x86/mm: Correct fixmap header usage on adaptable MODULES_END

2017-03-18 09:48:00 +01:00

mpparse.c

x86/boot/e820: Rename early_reserve_e820() to e820__memblock_alloc() and document it

2017-01-28 14:42:30 +01:00

msr.c

x86/msr: Remove bogus cleanup from the error path

2016-12-25 10:47:41 +01:00

nmi_selftest.c

…

nmi.c

x86/platform: Remove warning message for duplicate NMI handlers

2017-03-13 20:45:18 +01:00

paravirt_patch_32.c

x86/paravirt: Mark unused patch_default label

2016-12-22 17:43:35 +01:00

paravirt_patch_64.c

x86/paravirt: Mark unused patch_default label

2016-12-22 17:43:35 +01:00

paravirt-spinlocks.c

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2017-02-22 18:22:53 -08:00

paravirt.c

x86/paravirt: Add 5-level support to the paravirt code

2017-04-04 08:22:34 +02:00

pci-calgary_64.c

Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2017-02-25 13:45:43 -08:00

pci-dma.c

Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2017-02-25 13:45:43 -08:00

pci-iommu_table.c

x86: Fix non-static inlines

2016-04-16 13:21:40 +02:00

pci-nommu.c

treewide: Constify most dma_map_ops structures

2017-01-24 12:23:35 -05:00

pci-swiotlb.c

treewide: Constify most dma_map_ops structures

2017-01-24 12:23:35 -05:00

pcspeaker.c

…

perf_regs.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

platform-quirks.c

x86/init: Add i8042 state to the platform data

2016-12-19 11:34:15 +01:00

pmem.c

x86/kernel: Audit and remove any unnecessary uses of module.h

2016-07-14 15:06:41 +02:00

probe_roms.c

x86/boot/e820: Move asm/e820.h to asm/e820/api.h

2017-01-28 09:31:13 +01:00

process_32.c

x86/syscalls/32: Wire up arch_prctl on x86-32

2017-03-20 16:10:33 +01:00

process_64.c

x86/mm: Make in_compat_syscall() work during exec

2017-03-31 16:53:02 +02:00

process.c

x86/arch_prctl: Add ARCH_[GET|SET]_CPUID

2017-03-20 16:10:34 +01:00

ptrace.c

x86/arch_prctl/64: Rename do_arch_prctl() to do_arch_prctl_64()

2017-03-20 16:10:32 +01:00

pvclock.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/nmi.h>

2017-03-02 08:42:30 +01:00

quirks.c

x86/quirks: Hide maybe-uninitialized warning

2016-10-25 11:45:13 +02:00

reboot_fixups_32.c

…

reboot.c

x86/reboot/quirks: Fix typo in ASUS EeeBook X205TA reboot quirk

2017-03-10 11:58:33 +01:00

relocate_kernel_32.S

…

relocate_kernel_64.S

…

resource.c

x86/boot/e820: Harmonize the 'struct e820_table' fields

2017-01-28 09:33:16 +01:00

rtc.c

timekeeping: Ignore the bogus sleep time if pm_trace is enabled

2016-11-29 18:02:58 +01:00

setup_percpu.c

x86/boot/32: Defer resyncing initial_page_table until per-cpu is set up

2017-03-23 08:25:08 +01:00

setup.c

Merge branch 'x86/boot' into x86/mm, to avoid conflict

2017-04-11 08:56:05 +02:00

signal_compat.c

x86/signal: Remove bogus user_64bit_mode() check from sigaction_compat_abi()

2016-10-20 13:05:15 +02:00

signal.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

smp.c

x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers

2017-01-05 08:58:49 +01:00

smpboot.c

x86: Remap GDT tables in the fixmap section

2017-03-16 09:06:35 +01:00

stacktrace.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

step.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

sys_x86_64.c

x86/hugetlb: Adjust to the new native/compat mmap bases

2017-03-14 16:29:16 +01:00

sysfb_efi.c

Merge branch 'linus' into efi/core, to pick up fixes

2016-05-07 07:00:07 +02:00

sysfb_simplefb.c

x86/sysfb: Fix lfb_size calculation

2016-11-16 09:38:23 +01:00

sysfb.c

…

tboot.c

Merge branch 'x86/boot' into x86/mm, to avoid conflict

2017-04-11 08:56:05 +02:00

tce_64.c

x86/cpufeature: Remove cpu_has_clflush

2016-03-31 13:35:09 +02:00

time.c

…

tls.c

x86/tls: Forcibly set the accessed bit in TLS segments

2017-03-19 12:14:35 +01:00

tls.h

…

topology.c

x86: Drop bogus __ref / __refdata annotations

2015-07-20 18:57:20 +02:00

trace_clock.c

x86/asm/tsc: Add rdtsc_ordered() and use it in trivial call sites

2015-07-06 15:23:29 +02:00

tracepoint.c

tracing: Have the reg function allow to fail

2016-12-09 09:13:30 -05:00

traps.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

tsc_msr.c

x86/tsc: Set TSC_KNOWN_FREQ and TSC_RELIABLE flags on Intel Atom SoCs

2016-11-18 10:58:31 +01:00

tsc_sync.c

x86/tsc: Make the TSC ADJUST sanitizing work for tsc_reliable

2017-02-10 09:47:17 +01:00

tsc.c

sched/clock, x86/perf: Fix "perf test tsc"

2017-03-23 07:31:49 +01:00

unwind_frame.c

x86/unwind: Fix last frame check for aligned function stacks

2017-03-14 21:51:57 +01:00

unwind_guess.c

x86/unwind: Fix guess-unwinder regression

2016-11-28 07:47:54 +01:00

uprobes.c

uprobes/x86: Fix RIP-relative handling of EVEX-encoded instructions

2016-08-12 08:29:24 +02:00

verify_cpu.S

x86/cpufeature: Carve out X86_FEATURE_*

2016-01-30 11:22:17 +01:00

vm86_32.c

x86/mm: Convert trivial cases of page table walk to 5-level paging

2017-03-14 08:45:08 +01:00

vmlinux.lds.S

objtool, modules: Discard objtool annotation sections for modules

2017-03-01 20:32:25 +01:00

vsmp_64.c

x86: replace __init_or_module with __init in non-modular vsmp_64.c

2015-06-16 14:12:41 -04:00

x86_init.c

x86/boot/e820: Rename default_machine_specific_memory_setup() to e820__memory_setup_default()

2017-01-28 14:42:26 +01:00