UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/score/include/asm
History
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
..
Kbuild score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
asm-offsets.h score: add asm/asm-offsets.h wrapper 2009-12-12 13:08:16 +01:00
asmmacro.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
atomic.h Disintegrate asm/system.h for Score 2012-03-28 18:30:02 +01:00
auxvec.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
barrier.h Disintegrate asm/system.h for Score 2012-03-28 18:30:02 +01:00
bitops.h Disintegrate asm/system.h for Score 2012-03-28 18:30:02 +01:00
bitsperlong.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
bug.h Disintegrate asm/system.h for Score 2012-03-28 18:30:02 +01:00
bugs.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
byteorder.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
cache.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
cacheflush.h score: add flush_dcahce_page and PG_dcache_dirty define 2009-12-17 18:28:31 +08:00
checksum.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
cmpxchg.h Disintegrate asm/system.h for Score 2012-03-28 18:30:02 +01:00
cputime.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
current.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
delay.h score: include asm-generic/param.h in asm/delay.h. 2009-12-17 18:31:23 +08:00
device.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
div64.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
dma-mapping.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
dma.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
errno.h score: update files according to review comments 2009-06-19 11:40:13 +02:00
exec.h Disintegrate asm/system.h for Score 2012-03-28 18:30:02 +01:00
fcntl.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
fixmap.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ftrace.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
futex.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
hardirq.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
hw_irq.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
io.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ioctl.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ioctls.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
ipcbuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
irq.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
irq_regs.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
irqflags.h score: lost a semicolon in asm/irqflags.h 2011-03-28 12:02:20 +08:00
kdebug.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
kmap_types.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02: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 score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
local.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
mman.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
mmu.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
mmu_context.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
module.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
msgbuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
mutex.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
page.h score: fixed pfn_valid define. 2009-12-17 18:28:31 +08:00
param.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
pci.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
percpu.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
pgalloc.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
pgtable-bits.h score: update files according to review comments 2009-06-19 11:40:13 +02:00
pgtable.h mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
poll.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
posix_types.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
processor.h fork: move the real prepare_to_copy() users to arch_dup_task_struct() 2012-05-16 15:16:26 -07:00
ptrace.h ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h 2010-03-12 15:52:38 -08:00
resource.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
scoreregs.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sections.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
segment.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sembuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
setup.h score: add MEMORY_START and MEMORY_SIZE define, to make the code clear 2009-08-30 12:31:58 +08:00
shmbuf.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
shmparam.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sigcontext.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
siginfo.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
signal.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
socket.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
sockios.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
stat.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
statfs.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
string.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
swab.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
switch_to.h Disintegrate asm/system.h for Score 2012-03-28 18:30:02 +01:00
syscalls.h score: add prototypes for wrapped syscalls 2009-06-19 14:10:46 +02:00
termbits.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
termios.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
thread_info.h score: Use common threadinfo allocator 2012-05-08 14:08:46 +02:00
timex.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
tlb.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
tlbflush.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
topology.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
types.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
uaccess.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00
ucontext.h score: add missing #includes 2009-06-27 15:09:46 +02:00
unaligned.h score: Add support for Sunplus S+core architecture 2009-06-19 11:38:47 +02:00
unistd.h score: add old syscall support 2009-08-30 12:33:30 +08:00
user.h score: update inconsistent declare after .c was changed 2009-08-30 12:30:16 +08:00