From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 05:05:16 +0000 (+1000)
Subject: Merge commit 'refs/next/20120822/kvm'
X-Git-Tag: next-20120824~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f87bec5521f2dd6c241bce1583174bb99e98e640;p=karo-tx-linux.git

Merge commit 'refs/next/20120822/kvm'

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

f87bec5521f2dd6c241bce1583174bb99e98e640
diff --cc arch/s390/include/asm/processor.h
index d4477ba99a16,eac4fb5fb826..01c97b980fa4
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@@ -140,7 -140,7 +140,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 *) \