hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/arch/avr32/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
..
mach avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
Kbuild byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
addrspace.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
asm.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
atomic.h Disintegrate asm/system.h for AVR32 2012-03-28 18:30:01 +01:00
auxvec.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
barrier.h avr32: fix nop compile fails from system.h split up 2012-04-04 08:23:44 -07:00
bitops.h Disintegrate asm/system.h for AVR32 2012-03-28 18:30:01 +01:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bug.h Disintegrate asm/system.h for AVR32 2012-03-28 18:30:01 +01:00
bugs.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
byteorder.h byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
cache.h dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN 2010-08-11 08:59:21 -07:00
cachectl.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
cacheflush.h block: add helpers to run flush_dcache_page() against a bio and a request's pages 2009-11-26 09:16:19 +01:00
checksum.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
cmpxchg.h Disintegrate asm/system.h for AVR32 2012-03-28 18:30:01 +01:00
cputime.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
current.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
delay.h asm-generic: move archictures to common delay.h 2011-07-22 18:46:24 +02:00
device.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
div64.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
errno.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
exec.h Disintegrate asm/system.h for AVR32 2012-03-28 18:30:01 +01:00
fb.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
fcntl.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
ftrace.h tracing: make CALLER_ADDRx overwriteable 2009-03-02 16:49:37 -05:00
futex.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
gpio.h avr32: Use <mach/foo.h> instead of <asm/arch/foo.h> 2008-08-05 14:36:57 +02:00
hardirq.h avr32: convert to asm-generic/hardirq.h 2009-12-14 19:24:28 +01:00
hw_irq.h avr32: remove obsolete hw_interrupt_type 2009-05-13 16:53:48 +02:00
io.h BUG: headers with BUG/BUG_ON etc. need linux/bug.h 2012-03-04 17:54:34 -05:00
ioctl.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
ioctls.h ioctl: Use asm-generic/ioctls.h on avr32 (enables termiox) 2010-10-22 10:19:59 -07:00
ipcbuf.h consolidate a bunch of ipcbuf.h instances 2012-01-03 22:55:18 -05:00
irq.h avr32: Use <mach/foo.h> instead of <asm/arch/foo.h> 2008-08-05 14:36:57 +02:00
irq_regs.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
irqflags.h Fix IRQ flag handling naming 2010-10-07 14:08:55 +01:00
kdebug.h avr32: Define DIE_OOPS 2009-01-07 10:40:30 +01:00
kmap_types.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
kprobes.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +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 avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
local.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
mman.h mm: remove duplicate asm/mman.h files 2009-09-22 07:17:42 -07:00
mmu.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
mmu_context.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
module.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
msgbuf.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
mutex.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
numnodes.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
ocd.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
page.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
param.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
pci.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
percpu.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
pgalloc.h avr32: add missing include causing undefined pgtable_page_* references 2011-01-26 12:35:15 +01:00
pgtable-2level.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
pgtable.h mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
poll.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
posix_types.h avr32: Use generic posix_types.h 2012-02-14 12:01:28 -08: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: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
resource.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
sections.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
sembuf.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
serial.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
setup.h avr32: add ATAG_BOARDINFO 2011-04-13 15:46:59 +02:00
shmbuf.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
shmparam.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
sigcontext.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
siginfo.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
signal.h avr32: struct old_sigaction is never used 2012-05-21 23:59:20 -04:00
socket.h net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
sockios.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
stat.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
statfs.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
string.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
swab.h headers_check fix: avr32, swab.h 2009-02-01 11:01:23 +05:30
switch_to.h Disintegrate asm/system.h for AVR32 2012-03-28 18:30:01 +01:00
syscalls.h avr32: make architecture sys_clone prototype match asm-generic prototype 2011-01-13 20:41:06 +01:00
sysreg.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
termbits.h tty: Add EXTPROC support for LINEMODE 2010-08-10 13:47:39 -07:00
termios.h asm-generic: rename termios.h, signal.h and mman.h 2009-06-11 21:01:52 +02:00
thread_info.h freezer: remove now unused TIF_FREEZE 2011-11-21 12:32:25 -08:00
timex.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
tlb.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
tlbflush.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
topology.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
traps.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
types.h consolidate umode_t declarations 2012-01-03 22:55:17 -05:00
uaccess.h avr32: fix out-of-range rjmp instruction on large kernels 2009-01-16 09:38:05 +01:00
ucontext.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
unaligned.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
unistd.h ns: Wire up the setns system call 2011-05-28 10:48:39 -07:00
user.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00
xor.h avr32: Move include/asm-avr32 to arch/avr32/include/asm 2008-08-05 13:35:07 +02:00