diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 09:07:33 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 09:07:33 +0300 |
| commit | 054838bc019c90511d034fb796dc8c7715460fc2 (patch) | |
| tree | a04b9fa86e3cfb8adb285fcd33bd47983f75d8fb /arch/avr32 | |
| parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
| parent | fc69910f329d61821897871e0e957eda39beb3d8 (diff) | |
| download | linux-054838bc019c90511d034fb796dc8c7715460fc2.tar.xz | |
Merge commit 'fc69910f329d' into uaccess.mips
backmerge of a build fix from mainline
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/oprofile/backtrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/oprofile/backtrace.c b/arch/avr32/oprofile/backtrace.c index 75d9ad6f99cf..29cf2f191bfd 100644 --- a/arch/avr32/oprofile/backtrace.c +++ b/arch/avr32/oprofile/backtrace.c @@ -14,7 +14,7 @@ */ #include <linux/oprofile.h> -#include <linux/sched.h> +#include <linux/ptrace.h> #include <linux/uaccess.h> /* The first two words of each frame on the stack look like this if we have |