diff options
| author | Al Viro | 2017-04-07 01:35:03 +0200 |
|---|---|---|
| committer | Al Viro | 2017-04-07 01:35:03 +0200 |
| commit | fccfb9950836524d79260448fba6131f6b1d73c3 (patch) | |
| tree | a6fef32e330852138d9e7bd12d7b3dd97c4360c3 /arch/avr32/oprofile | |
| parent | generic ...copy_..._user primitives (diff) | |
| parent | mm, page_alloc: Add missing check for memory holes (diff) | |
| download | kernel-qcow2-linux-fccfb9950836524d79260448fba6131f6b1d73c3.tar.gz kernel-qcow2-linux-fccfb9950836524d79260448fba6131f6b1d73c3.tar.xz kernel-qcow2-linux-fccfb9950836524d79260448fba6131f6b1d73c3.zip | |
Merge commit 'b4fb8f66f1ae2e167d06c12d018025a8d4d3ba7e' into uaccess.ia64
backmerge of mainline ia64 fix
Diffstat (limited to 'arch/avr32/oprofile')
| -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 |