diff options
| author | Ingo Molnar <[email protected]> | 2021-02-12 12:36:43 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2021-02-12 12:36:43 +0000 |
| commit | a3251c1a36f595046bea03935ebe37a1e1f1f1d7 (patch) | |
| tree | 14b51f8bf1d7e1bb35697cb4704255b51b15baa9 /drivers/pci/controller/pci-host-common.c | |
| parent | x86/softirq/64: Inline do_softirq_own_stack() (diff) | |
| parent | x86/pv: Rework arch_local_irq_restore() to not use popf (diff) | |
| download | kernel-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.tar.gz kernel-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.zip | |
Merge branch 'x86/paravirt' into x86/entry
Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.
Conflicts:
arch/x86/xen/xen-asm.S
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/pci/controller/pci-host-common.c')
0 files changed, 0 insertions, 0 deletions