leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
07acfc2a93
linux/arch/blackfin/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
..
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
barrier.h Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
bfin5xx_spi.h spi/bfin_spi: drop bits_per_word from client data 2012-03-21 11:00:07 +08:00
bfin6xx_spi.h blackfin: add spi/sport3/ppi head file for bf60x 2012-05-21 14:54:18 +08:00
bfin_can.h Blackfin: bfin_can.h: add missing VERSION/VERSION2 MMRs 2010-10-22 16:30:03 -04:00
bfin_crc.h blackfin: bf60x: add head file for crc controller 2012-05-21 14:55:04 +08:00
bfin_dma.h blackfin: add bf60x to current framework 2012-05-21 14:54:12 +08:00
bfin_pfmon.h blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
bfin_ppi.h blackfin: add spi/sport3/ppi head file for bf60x 2012-05-21 14:54:18 +08:00
bfin_rotary.h blackfin: rotary: Add pm_wakeup flag to platform data structure. 2012-05-21 14:54:43 +08:00
bfin_sdh.h Blackfin: unify SDH/RSI bitmasks 2010-08-06 12:55:56 -04:00
bfin_serial.h blackfin: bf60x: anomaly: Add a temporary anomaly 0501001 2012-05-21 14:54:58 +08:00
bfin_simple_timer.h blackfin: timer: refine bfin simple timer driver 2012-03-21 11:00:06 +08:00
bfin_sport3.h blackfin: add spi/sport3/ppi head file for bf60x 2012-05-21 14:54:18 +08:00
bfin_sport.h blackfin: bf537-stamp: update board file for platform bfin_sport device 2012-05-21 14:54:28 +08:00
bfin_twi.h blackfin: twi: include linux/i2c.h 2012-05-21 14:55:05 +08:00
bfin_watchdog.h Blackfin: split watchdog definitions into a dedicated header file 2010-03-09 00:30:50 -05:00
bfin-global.h blackfin: bf60x: make clock changeable in kernel menuconfig 2012-05-21 14:54:49 +08:00
bfin-lq035q1.h Blackfin: extend bfin-lq035q1-fb resources to include PPI mode 2010-03-09 00:30:46 -05:00
bfrom.h Blackfin arch: Update some inline assembly, tweak some register constraints 2009-01-07 23:14:39 +08:00
bitops.h Blackfin: bitops: fix include order after little endian inclusion 2011-03-25 16:54:13 -04:00
blackfin.h blackfin: asm: fix blackfin.h broken 2012-05-21 14:54:08 +08:00
bug.h Blackfin: change the BUG opcode to an unused 16-bit opcode 2010-05-22 14:19:04 -04:00
byteorder.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
cache.h Blackfin: SMP: fix build breakage in cache.h 2011-01-10 07:18:14 -05:00
cachectl.h Blackfin: add new cacheflush syscall 2010-10-22 03:48:59 -04:00
cacheflush.h Blackfin: don't attempt to flush on-chip L1 SRAM regions 2011-05-25 08:13:41 -04:00
cdef_LPBlackfin.h Blackfin: fix inverted anomaly 05000481 logic 2010-10-25 17:24:00 -04:00
checksum.h Blackfin: convert to generic checksum code 2009-12-15 00:13:32 -05:00
clkdev.h blackfin: bf60x: add clock support 2012-05-21 14:54:13 +08:00
clocks.h blackfin: bf60x: add clock support 2012-05-21 14:54:13 +08:00
cmpxchg.h blackfin: fix cmpxchg build fails from system.h fallout 2012-04-02 14:41:25 -07:00
context.S Blackfin: add support for irqflags tracing 2010-03-09 00:30:49 -05:00
cplb.h blackfin: cplb: add support for bf60x 2012-05-21 14:54:16 +08:00
cplbinit.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
cpu.h blackfin: smp: cleanup smp code 2012-01-09 10:26:15 +08:00
def_LPBlackfin.h blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
delay.h Blackfin: implement ndelay() 2010-03-09 00:30:50 -05:00
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h blackfin: add bf60x to current framework 2012-05-21 14:54:12 +08:00
dpmc.h blackfin: bf60x: pm: Add a debug option to calculate kernel wakeup time. 2012-05-21 14:54:52 +08:00
early_printk.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
elf.h Blackfin: stub fpregs dumping 2010-08-06 12:55:44 -04:00
entry.h m68k{nommu}/blackfin : remove old assembler-only flags bit definitions 2010-10-26 16:52:12 -07:00
exec.h Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
fcntl.h vfs: Implement proper O_SYNC semantics 2009-12-10 15:02:50 +01:00
fixed_code.h blackfin: add bf60x to current framework 2012-05-21 14:54:12 +08:00
flat.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
ftrace.h Blackfin: add support for dynamic ftrace 2010-08-06 12:55:54 -04:00
gpio.h blackfin: GPIO: Implement more GPIO APIs 2012-05-21 14:54:34 +08:00
gptimers.h blackfin: bf60x: enable gptimer clock source 2012-05-21 14:54:20 +08:00
hardirq.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
io.h Blackfin: switch to asm-generic/io.h 2011-01-10 07:18:04 -05:00
ioctls.h Blackfin: convert asm/ioctls.h to asm-generic/ioctls.h 2009-06-18 21:40:53 -04:00
ipipe_base.h Blackfin/ipipe: upgrade to I-pipe mainline 2011-03-18 04:01:10 -04:00
ipipe.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
irq_handler.h Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
irq.h nmi watchdog: do not use cpp symbol in Kconfig 2012-03-23 16:58:31 -07:00
irqflags.h blackfin: mach-common: add sec support for bf60x 2012-05-21 14:54:15 +08:00
Kbuild Blackfin: merge asm/mutex.h into kbuild too 2011-10-25 19:51:47 -04:00
kgdb.h blackfin: kgdb: skip hardware watchpoint test 2012-03-21 11:00:07 +08:00
kvm_para.h kvmclock: Add functions to check if the host has stopped the vm 2012-04-08 12:48:59 +03:00
l1layout.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
linkage.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
mem_init.h Blackfin: remove CONFIG_MEM_GENERIC_BOARD 2010-08-06 12:55:57 -04:00
mem_map.h Blackfin: unify memory map headers 2009-06-22 21:16:07 -04:00
mmu_context.h blackfin: restore L1 base address and length 2012-03-21 11:00:06 +08:00
mmu.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
module.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
nand.h mtd: Blackfin NFC: fix handling of page sizes 2010-08-05 16:14:38 +01:00
nmi.h Blackfin: implement nmi_watchdog for SMP on BF561 2010-03-09 00:30:49 -05:00
page_offset.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
page.h blackfin: add bf60x to current framework 2012-05-21 14:54:12 +08:00
pci.h PCI: Pull PCI 'latency timer' setup up into the core 2012-01-06 12:10:42 -08:00
pda.h blackfin: SMP: pda: "next" field of blackfin_pda only used in SMP kernel 2012-05-21 14:54:36 +08:00
perf_event.h Blackfin: initial perf_event support 2011-05-25 08:24:09 -04:00
pgtable.h Blackfin: drop unused bad_page pages and move zero_page to the bss 2010-05-21 09:03:15 -04:00
pm.h blackfin: fix build after add bf60x mach/pm.h 2012-05-21 14:55:07 +08:00
poll.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
portmux.h Blackfin: gpio/portmux: clean up whitespace corruption 2010-08-06 12:55:51 -04:00
posix_types.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
processor.h fork: move the real prepare_to_copy() users to arch_dup_task_struct() 2012-05-16 15:16:26 -07:00
pseudo_instructions.h Blackfin: add support for the DBG (debug output) pseudo insn 2010-05-22 14:19:05 -04:00
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
reboot.h Blackfin arch: Fix bug - Run "reboot" hangs bf518-ezbrd 2009-02-04 16:49:45 +08:00
rwlock.h Blackfin arch: SMP supporting patchset: Blackfin header files and machine common code 2009-01-07 23:14:39 +08:00
sections.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
segment.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
sigcontext.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
siginfo.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
signal.h Blackfin: convert signal/mmap to asm-generic 2009-06-18 21:41:26 -04:00
smp.h blackfin: smp: cleanup smp code 2012-01-09 10:26:15 +08:00
spinlock_types.h locking: Convert raw_rwlock to arch_rwlock 2009-12-14 23:55:32 +01:00
spinlock.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
stat.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
string.h Blackfin: move string functions to normal lib/ assembly 2010-05-22 14:19:09 -04:00
swab.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
switch_to.h Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
syscall.h Blackfin: initial tracehook support 2010-03-09 00:30:51 -05:00
thread_info.h blackfin: thread_info: add suspend flag 2012-03-21 11:00:07 +08:00
time.h Blackfin: add support for cpufreq on SMP systems 2010-03-09 00:30:50 -05:00
timex.h Blackfin arch: make sure cycles is marked as volatile so gcc doesnt reorder on us 2008-10-16 23:55:41 +08:00
tlb.h Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
tlbflush.h Blackfin: SMP: add flush_tlb_kernel_range stub 2010-05-21 09:40:20 -04:00
trace.h Blackfin: make hardware trace output a little more useful 2010-05-21 09:40:19 -04:00
traps.h Fix common misspellings 2011-03-31 11:26:23 -03:00
uaccess.h Blackfin: fix sparse warnings in copy_to/from_user 2011-10-25 19:51:35 -04:00
unistd.h Blackfin: delete fork func 2012-05-21 14:54:39 +08:00