leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
07acfc2a93
linux/arch/parisc/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
..
agp.h agp: kill phys_to_gart() and gart_to_phys() 2009-08-03 09:05:00 +01:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
asmregs.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
assembly.h parisc: fix 64bit build 2009-03-13 01:18:56 -04:00
atomic.h parisc: fix missing cmpxchg file error from system.h split 2012-04-02 14:41:26 -07:00
auxvec.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
barrier.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
bitops.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bug.h panic: Allow warnings to set different taint flags 2010-05-19 08:36:48 +01:00
bugs.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00: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 parisc: remove homegrown L1_CACHE_ALIGN macro 2010-10-21 21:20:09 -04:00
cacheflush.h highmem: kill all __kmap_atomic() 2012-03-20 21:48:30 +08:00
checksum.h parisc: fix ipv6 checksum 2009-01-05 19:11:05 +00:00
cmpxchg.h parisc: fix missing cmpxchg file error from system.h split 2012-04-02 14:41:26 -07:00
compat_rt_sigframe.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
compat_signal.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
compat_ucontext.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
compat.h compat: sync compat_stats with statfs. 2011-10-28 14:58:53 +02:00
cputime.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
current.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
delay.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
device.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
div64.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
dma-mapping.h doc: fix broken references 2011-09-27 18:08:04 +02:00
dma.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
eisa_bus.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
eisa_eeprom.h Fix common misspellings 2011-03-31 11:26:23 -03:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
errno.h mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally 2011-03-17 13:08:27 -03:00
exec.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
fb.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
fcntl.h vfs: add nonconflicting values for O_PATH 2011-03-16 09:54:02 -04:00
fixmap.h parisc: rename parisc's vmalloc_start to parisc_vmalloc_start 2009-09-27 23:27:04 -04:00
floppy.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
ftrace.h parisc: add CALLER_ADDR{0-6} macros 2009-12-16 03:48:54 +00:00
futex.h [PARISC] futex: Use same lock set as lws calls 2012-02-27 09:35:08 -06:00
grfioctl.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
hardirq.h parisc: convert to asm-generic/hardirq.h 2009-09-28 00:24:23 -04:00
hardware.h parisc: drop include of asm/pdc.h from asm/hardware.h 2012-05-10 15:12:08 -07:00
hw_irq.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
ide.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2008-10-20 14:40:31 -07:00
io.h parisc: define x->x mmio accessors 2009-03-13 01:20:48 -04:00
ioctl.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
ioctls.h tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys 2011-02-17 14:16:30 -08:00
ipcbuf.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
irq_regs.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
irq.h [PARISC] Convert to new irq_chip functions 2011-02-10 10:22:14 -06:00
irqflags.h Fix IRQ flag handling naming 2010-10-07 14:08:55 +01:00
kbdleds.h keyboard: Use BIOS Keyboard variable to set Numlock 2012-05-08 14:19:41 -07:00
Kbuild archs: replace unifdef-y with header-y 2010-08-14 22:26:51 +02:00
kdebug.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
kmap_types.h kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
kvm_para.h kvmclock: Add functions to check if the host has stopped the vm 2012-04-08 12:48:59 +03:00
ldcw.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
led.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
linkage.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
local.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
machdep.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
mc146818rtc.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
mckinley.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
mman.h coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP 2012-03-23 16:58:42 -07:00
mmu_context.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mmu.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
mmzone.h Fix node_start/end_pfn() definition for mm/page_cgroup.c 2011-06-27 14:13:09 -07:00
module.h parisc: fix module loading failure of large kernel modules 2009-01-05 08:40:14 +10:30
msgbuf.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
mutex.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
page.h parisc: move definition of PAGE0 to asm/page.h 2012-05-10 15:12:08 -07:00
param.h parisc: Simplify param.h by including <asm-generic/param.h> 2010-03-06 22:54:10 +00:00
parisc-device.h parisc: struct device - replace bus_id with dev_name(), dev_set_name() 2008-11-26 22:22:41 +00:00
parport.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
pci.h PCI: collapse pcibios_resource_to_bus 2012-02-23 20:19:04 -07:00
pdc_chassis.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
pdc.h parisc: move definition of PAGE0 to asm/page.h 2012-05-10 15:12:08 -07:00
pdcpat.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
percpu.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
perf_event.h irq_work: Add generic hardirq context callbacks 2010-10-18 19:58:50 +02:00
perf.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
pgalloc.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
pgtable.h parisc: add missing include of asm/page.h to asm/pgtable.h 2012-05-10 15:12:08 -07:00
poll.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
posix_types.h parisc: Use generic posix_types.h 2012-02-14 12:01:29 -08:00
prefetch.h [PARISC] fix panic on prefetch(NULL) on PA7300LC 2012-05-16 13:15:21 +01:00
processor.h fork: move the real prepare_to_copy() users to arch_dup_task_struct() 2012-05-16 15:16:26 -07:00
psw.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
real.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
resource.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
ropes.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
rt_sigframe.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
rtc.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
runway.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
sections.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
segment.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
sembuf.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
serial.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
setup.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
shmbuf.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
shmparam.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
sigcontext.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
siginfo.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2008-10-20 14:40:31 -07:00
signal.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
smp.h Remove unused PROC_CHANGE_PENALTY constant 2011-05-25 08:39:43 -07:00
socket.h net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
sockios.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
special_insns.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
spinlock_types.h locking: Convert raw_rwlock to arch_rwlock 2009-12-14 23:55:32 +01:00
spinlock.h parisc: add missing includes in asm/spinlock.h 2012-05-10 15:12:08 -07:00
stat.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
statfs.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2008-10-20 14:40:31 -07:00
string.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
superio.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
swab.h headers_check fix: parisc, swab.h 2009-02-01 11:01:27 +05:30
switch_to.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
syscall.h parisc: add skeleton syscall.h 2009-09-27 23:07:23 -04:00
termbits.h tty: Add EXTPROC support for LINEMODE 2010-08-10 13:47:39 -07:00
termios.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
thread_info.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
timex.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
tlb.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
tlbflush.h parisc: ensure broadcast tlb purge runs single threaded 2009-07-03 03:34:09 +00:00
topology.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
traps.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
types.h consolidate umode_t declarations 2012-01-03 22:55:17 -05:00
uaccess.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
ucontext.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
unaligned.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
unistd.h [PARISC] wire up sendmmsg syscall 2011-07-31 18:18:08 -05:00
unwind.h parisc: initialize unwinder much earlier 2008-10-10 16:32:30 +00:00
user.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
vga.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00
xor.h parisc: move include/asm-parisc to arch/parisc/include/asm 2008-10-10 16:32:29 +00:00