From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Oct 2016 00:59:24 +0000 (-0700)
Subject: Merge tag 'm68k-for-v4.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... 
X-Git-Tag: v4.9-rc1~154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5419e783829127dba712be769bce8c6a1ec0057e;hp=-c;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'm68k-for-v4.9-tag1' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:
 - cleanups
 - defconfig updates
 - GPG fingerprint update

* tag 'm68k-for-v4.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Migrate exception table users off module.h and onto extable.h
  CREDITS: Update fingerprint for Geert Uytterhoeven
  m68k: Use IS_ENABLED() instead of checking for built-in or module
  m68k/defconfig: Update defconfigs for v4.8-rc1
---

5419e783829127dba712be769bce8c6a1ec0057e
diff --combined arch/m68k/kernel/signal.c
index 9202f82dfce6,db775322b485..58507edbdf1d
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@@ -42,7 -42,7 +42,7 @@@
  #include <linux/personality.h>
  #include <linux/tty.h>
  #include <linux/binfmts.h>
- #include <linux/module.h>
+ #include <linux/extable.h>
  #include <linux/tracehook.h>
  
  #include <asm/setup.h>
@@@ -213,6 -213,7 +213,6 @@@ static inline int frame_extra_sizes(in
  
  static inline void adjustformat(struct pt_regs *regs)
  {
 -	((struct switch_stack *)regs - 1)->a5 = current->mm->start_data;
  	/*
  	 * set format byte to make stack appear modulo 4, which it will
  	 * be when doing the rte