diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:18:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:18:16 +0200 |
| commit | 9ccd8d744592b594db217b80af651e3f10e6a96e (patch) | |
| tree | 7321748b8c5b1621e618f5fed16216124c44e734 /arch/parisc/kernel/parisc_ksyms.c | |
| parent | tty: serial: fsl_lpuart: lock port on console write (diff) | |
| parent | Linux 4.11-rc5 (diff) | |
| download | linux-9ccd8d744592b594db217b80af651e3f10e6a96e.tar.xz linux-9ccd8d744592b594db217b80af651e3f10e6a96e.zip | |
Merge 4.11-rc5 into tty-next
We want the serial fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/kernel/parisc_ksyms.c')
| -rw-r--r-- | arch/parisc/kernel/parisc_ksyms.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 7484b3d11e0d..c6d6272a934f 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c @@ -47,16 +47,6 @@ EXPORT_SYMBOL(__cmpxchg_u64); EXPORT_SYMBOL(lclear_user); EXPORT_SYMBOL(lstrnlen_user); -/* Global fixups - defined as int to avoid creation of function pointers */ -extern int fixup_get_user_skip_1; -extern int fixup_get_user_skip_2; -extern int fixup_put_user_skip_1; -extern int fixup_put_user_skip_2; -EXPORT_SYMBOL(fixup_get_user_skip_1); -EXPORT_SYMBOL(fixup_get_user_skip_2); -EXPORT_SYMBOL(fixup_put_user_skip_1); -EXPORT_SYMBOL(fixup_put_user_skip_2); - #ifndef CONFIG_64BIT /* Needed so insmod can set dp value */ extern int $global$; |