From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Sep 2012 04:54:32 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvm/linux-next'
X-Git-Tag: next-20120925~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cfbc6d5895ca8d08872a02261d81d976ae40c4ec;p=karo-tx-linux.git

Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
	arch/s390/include/asm/processor.h
	arch/x86/kvm/i8259.c
---

cfbc6d5895ca8d08872a02261d81d976ae40c4ec
diff --cc arch/s390/include/asm/processor.h
index f3e0aabfc6bc,eac4fb5fb826..56831dfa9198
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@@ -158,7 -140,7 +158,8 @@@ extern int kernel_thread(int (*fn)(voi
  extern unsigned long thread_saved_pc(struct task_struct *t);
  
  extern void show_code(struct pt_regs *regs);
 +extern void print_fn_code(unsigned char *code, unsigned long len);
+ extern int insn_to_mnemonic(unsigned char *instruction, char buf[8]);
  
  unsigned long get_wchan(struct task_struct *p);
  #define task_pt_regs(tsk) ((struct pt_regs *) \