2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
linux-next/arch/c6x/include/asm
Linus Torvalds 07acfc2a93 Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM changes from Avi Kivity:
 "Changes include additional instruction emulation, page-crossing MMIO,
  faster dirty logging, preventing the watchdog from killing a stopped
  guest, module autoload, a new MSI ABI, and some minor optimizations
  and fixes.  Outside x86 we have a small s390 and a very large ppc
  update.

  Regarding the new (for kvm) rebaseless workflow, some of the patches
  that were merged before we switch trees had to be rebased, while
  others are true pulls.  In either case the signoffs should be correct
  now."

Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
arch/powerpc/kvm/book3s_segment.S and arch/x86/include/asm/kvm_para.h.

I suspect the kvm_para.h resolution ends up doing the "do I have cpuid"
check effectively twice (it was done differently in two different
commits), but better safe than sorry ;)

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (125 commits)
  KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block
  KVM: s390: onereg for timer related registers
  KVM: s390: epoch difference and TOD programmable field
  KVM: s390: KVM_GET/SET_ONEREG for s390
  KVM: s390: add capability indicating COW support
  KVM: Fix mmu_reload() clash with nested vmx event injection
  KVM: MMU: Don't use RCU for lockless shadow walking
  KVM: VMX: Optimize %ds, %es reload
  KVM: VMX: Fix %ds/%es clobber
  KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte()
  KVM: VMX: unlike vmcs on fail path
  KVM: PPC: Emulator: clean up SPR reads and writes
  KVM: PPC: Emulator: clean up instruction parsing
  kvm/powerpc: Add new ioctl to retreive server MMU infos
  kvm/book3s: Make kernel emulated H_PUT_TCE available for "PR" KVM
  KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler
  KVM: PPC: Book3S: Enable IRQs during exit handling
  KVM: PPC: Fix PR KVM on POWER7 bare metal
  KVM: PPC: Fix stbux emulation
  KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields
  ...
2012-05-24 16:17:30 -07:00
..
asm-offsets.h C6X: headers 2011-10-06 19:48:20 -04:00
barrier.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
bitops.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
bug.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
byteorder.h C6X: headers 2011-10-06 19:48:20 -04:00
cache.h C6X: cache control 2011-10-06 19:48:10 -04:00
cacheflush.h C6X: cache control 2011-10-06 19:48:10 -04:00
checksum.h C6X: library code 2011-10-06 19:48:23 -04:00
clkdev.h C6X: clocks 2011-10-06 19:48:07 -04:00
clock.h C6X: clocks 2011-10-06 19:48:07 -04:00
cmpxchg.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
delay.h C6X: headers 2011-10-06 19:48:20 -04:00
dma-mapping.h C6X: memory management and DMA support 2011-10-06 19:47:37 -04:00
dscr.h C6X: DSCR - Device State Configuration Registers 2011-10-06 19:48:36 -04:00
elf.h C6X: add support to build with BINFMT_ELF_FDPIC 2012-05-15 09:17:34 -04:00
exec.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
ftrace.h C6X: headers 2011-10-06 19:48:20 -04:00
hardirq.h C6X: interrupt handling 2011-10-06 19:47:54 -04:00
irq.h irq: Kill pointless irqd_to_hw export 2012-04-10 22:39:17 -06:00
irqflags.h C6X: interrupt handling 2011-10-06 19:47:54 -04:00
Kbuild Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
kvm_para.h kvmclock: Add functions to check if the host has stopped the vm 2012-04-08 12:48:59 +03:00
linkage.h C6X: headers 2011-10-06 19:48:20 -04:00
megamod-pic.h C6X: interrupt handling 2011-10-06 19:47:54 -04:00
mmu.h C6X: add support to build with BINFMT_ELF_FDPIC 2012-05-15 09:17:34 -04:00
module.h C6X: loadable module support 2011-10-06 19:48:13 -04:00
mutex.h C6X: headers 2011-10-06 19:48:20 -04:00
page.h C6X: headers 2011-10-06 19:48:20 -04:00
pgtable.h Remove remaining bits of io_remap_page_range() 2012-03-23 16:58:31 -07:00
processor.h fork: move the real prepare_to_copy() users to arch_dup_task_struct() 2012-05-16 15:16:26 -07:00
procinfo.h C6X: headers 2011-10-06 19:48:20 -04:00
prom.h C6X: headers 2011-10-06 19:48:20 -04:00
ptrace.h C6X: add support to build with BINFMT_ELF_FDPIC 2012-05-15 09:17:34 -04:00
sections.h C6X: headers 2011-10-06 19:48:20 -04:00
setup.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
sigcontext.h C6X: signal management 2011-10-06 19:47:46 -04:00
signal.h C6X: signal management 2011-10-06 19:47:46 -04:00
soc.h C6X: general SoC support 2011-10-06 19:48:26 -04:00
special_insns.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
string.h C6X: headers 2011-10-06 19:48:20 -04:00
swab.h C6X: headers 2011-10-06 19:48:20 -04:00
switch_to.h Disintegrate asm/system.h for C6X 2012-03-28 18:30:02 +01:00
syscall.h C6X: headers 2011-10-06 19:48:20 -04:00
syscalls.h C6X: syscalls 2011-10-06 19:47:58 -04:00
thread_info.h c6x: Use common threadinfo allocator 2012-05-08 14:08:44 +02:00
timer64.h C6X: time management 2011-10-06 19:47:51 -04:00
timex.h C6X: time management 2011-10-06 19:47:51 -04:00
tlb.h C6X: headers 2011-10-06 19:48:20 -04:00
traps.h C6X: build infrastructure 2011-10-06 19:48:02 -04:00
uaccess.h C6X: headers 2011-10-06 19:48:20 -04:00
unaligned.h C6X: headers 2011-10-06 19:48:20 -04:00
unistd.h C6X: syscalls 2011-10-06 19:47:58 -04:00