diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2016-08-10 12:11:15 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2016-08-10 12:11:15 +0200 |
| commit | a44038112d3379f49df8a9db3e1259d9e945faee (patch) | |
| tree | 198f8ef7dcba389b87dbd3cac861d896b5bfd77d /arch/parisc/include/asm/uaccess.h | |
| parent | 590e935df0c94b2d7a4584bb26906666176a6133 (diff) | |
| parent | 0e790100f1c49f32a390d0cc55801230fd04ba56 (diff) | |
Merge remote-tracking branch 'lsk/linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-16.09-rtlinux-linaro-lsk-v3.18-rt-test
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Conflicts:
kernel/futex.c
kernel/printk/printk.c
kernel/softirq.c
mm/slub.c
mm/swap.c
Diffstat (limited to 'arch/parisc/include/asm/uaccess.h')
| -rw-r--r-- | arch/parisc/include/asm/uaccess.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index a5cb070b54bf..df9d8dd72db2 100644 --- a/arch/parisc/include/asm/uaccess.h +++ b/arch/parisc/include/asm/uaccess.h @@ -76,6 +76,7 @@ struct exception_table_entry { */ struct exception_data { unsigned long fault_ip; + unsigned long fault_gp; unsigned long fault_space; unsigned long fault_addr; }; |