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

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

Conflicts:
	arch/s390/include/asm/processor.h
---

6e0e5d77973fa78fc09f4f52919e7e84ae9e8fe5
diff --cc arch/s390/include/asm/processor.h
index 7e81ff17a89b,eac4fb5fb826..bbe7940a4cff
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@@ -156,7 -140,7 +156,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 *) \