diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-08 06:48:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-08 06:48:45 +0300 |
| commit | 2c34ff14bf1d03a705f5400888ecac5b6400e981 (patch) | |
| tree | df5ec14776f77122c35b867c3aa539d762caa791 | |
| parent | 07021b43597f506cc525d139ed1a94e79cf184f2 (diff) | |
| parent | 9a2950fe9cb6882063181673846953d44f32cc3a (diff) | |
| download | linux-2c34ff14bf1d03a705f5400888ecac5b6400e981.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull avr32 update from Hans-Christian Noren Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: migrate exception table users off module.h and onto extable.h
| -rw-r--r-- | arch/avr32/kernel/traps.c | 3 | ||||
| -rw-r--r-- | arch/avr32/mm/fault.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c index 682b2478691a..eb4a3fcfbaff 100644 --- a/arch/avr32/kernel/traps.c +++ b/arch/avr32/kernel/traps.c @@ -11,7 +11,8 @@ #include <linux/init.h> #include <linux/kallsyms.h> #include <linux/kdebug.h> -#include <linux/module.h> +#include <linux/extable.h> +#include <linux/module.h> /* print_modules */ #include <linux/notifier.h> #include <linux/sched.h> #include <linux/uaccess.h> diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index a4b7edac8f10..b3977e9208a3 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -10,7 +10,7 @@ */ #include <linux/mm.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/pagemap.h> #include <linux/kdebug.h> #include <linux/kprobes.h> |