[linux] 03/04: Revert "Revert "ia64: move exports to definitions""
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Tue Jun 20 19:09:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit 4d907dfd7ac33ee417958c5a31bbd1d99bf32516
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Tue Jun 20 19:35:33 2017 +0100
Revert "Revert "ia64: move exports to definitions""
Can't remember why I ever applied this, as we don't have any support
for ia64 any more. In any case ia64 now has an <asm/asm-prototypes.h>.
---
.../revert-ia64-move-exports-to-definitions.patch | 643 ---------------------
debian/patches/series | 1 -
2 files changed, 644 deletions(-)
diff --git a/debian/patches/bugfix/ia64/revert-ia64-move-exports-to-definitions.patch b/debian/patches/bugfix/ia64/revert-ia64-move-exports-to-definitions.patch
deleted file mode 100644
index dadf2c6..0000000
--- a/debian/patches/bugfix/ia64/revert-ia64-move-exports-to-definitions.patch
+++ /dev/null
@@ -1,643 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Thu, 1 Dec 2016 23:20:31 +0000
-Subject: Revert "ia64: move exports to definitions"
-Forwarded: not-needed
-
-This reverts commit e007c53397acb5554e226693e3bff54a312ccd96 because
-symbols exported from assembly don't automatically get modversions (ABI
-hashes).
----
- arch/ia64/include/asm/export.h | 3 --
- arch/ia64/kernel/entry.S | 3 --
- arch/ia64/kernel/esi_stub.S | 2 -
- arch/ia64/kernel/head.S | 2 -
- arch/ia64/kernel/ia64_ksyms.c | 94 ++++++++++++++++++++++++++++++++++++++-
- arch/ia64/kernel/ivt.S | 2 -
- arch/ia64/kernel/pal.S | 7 ---
- arch/ia64/kernel/setup.c | 4 --
- arch/ia64/lib/clear_page.S | 2 -
- arch/ia64/lib/clear_user.S | 2 -
- arch/ia64/lib/copy_page.S | 2 -
- arch/ia64/lib/copy_page_mck.S | 2 -
- arch/ia64/lib/copy_user.S | 2 -
- arch/ia64/lib/flush.S | 2 -
- arch/ia64/lib/idiv32.S | 2 -
- arch/ia64/lib/idiv64.S | 2 -
- arch/ia64/lib/ip_fast_csum.S | 3 --
- arch/ia64/lib/memcpy.S | 2 -
- arch/ia64/lib/memcpy_mck.S | 3 --
- arch/ia64/lib/memset.S | 2 -
- arch/ia64/lib/strlen.S | 2 -
- arch/ia64/lib/strlen_user.S | 2 -
- arch/ia64/lib/strncpy_from_user.S | 2 -
- arch/ia64/lib/strnlen_user.S | 2 -
- arch/ia64/lib/xor.S | 5 ---
- 25 files changed, 92 insertions(+), 64 deletions(-)
- delete mode 100644 arch/ia64/include/asm/export.h
-
-diff --git a/arch/ia64/include/asm/export.h b/arch/ia64/include/asm/export.h
-deleted file mode 100644
-index ad18c6583252..000000000000
---- a/arch/ia64/include/asm/export.h
-+++ /dev/null
-@@ -1,3 +0,0 @@
--/* EXPORT_DATA_SYMBOL != EXPORT_SYMBOL here */
--#define KSYM_FUNC(name) @fptr(name)
--#include <asm-generic/export.h>
-diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
-index 6f27a663177c..cfaa7b25084c 100644
---- a/arch/ia64/kernel/entry.S
-+++ b/arch/ia64/kernel/entry.S
-@@ -48,7 +48,6 @@
- #include <asm/thread_info.h>
- #include <asm/unistd.h>
- #include <asm/ftrace.h>
--#include <asm/export.h>
-
- #include "minstate.h"
-
-@@ -1346,14 +1345,12 @@ GLOBAL_ENTRY(unw_init_running)
- mov rp=loc0
- br.ret.sptk.many rp
- END(unw_init_running)
--EXPORT_SYMBOL(unw_init_running)
-
- #ifdef CONFIG_FUNCTION_TRACER
- #ifdef CONFIG_DYNAMIC_FTRACE
- GLOBAL_ENTRY(_mcount)
- br ftrace_stub
- END(_mcount)
--EXPORT_SYMBOL(_mcount)
-
- .here:
- br.ret.sptk.many b0
-diff --git a/arch/ia64/kernel/esi_stub.S b/arch/ia64/kernel/esi_stub.S
-index 2c369bf77c4b..6b3d6c1f99b6 100644
---- a/arch/ia64/kernel/esi_stub.S
-+++ b/arch/ia64/kernel/esi_stub.S
-@@ -35,7 +35,6 @@
-
- #include <asm/processor.h>
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- /*
- * Inputs:
-@@ -95,4 +94,3 @@ GLOBAL_ENTRY(esi_call_phys)
- mov gp=loc2
- br.ret.sptk.many rp
- END(esi_call_phys)
--EXPORT_SYMBOL_GPL(esi_call_phys)
-diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
-index c9b5e942f671..bb748c596443 100644
---- a/arch/ia64/kernel/head.S
-+++ b/arch/ia64/kernel/head.S
-@@ -32,7 +32,6 @@
- #include <asm/mca_asm.h>
- #include <linux/init.h>
- #include <linux/linkage.h>
--#include <asm/export.h>
-
- #ifdef CONFIG_HOTPLUG_CPU
- #define SAL_PSR_BITS_TO_SET \
-@@ -169,7 +168,6 @@ RestRR: \
- __PAGE_ALIGNED_DATA
-
- .global empty_zero_page
--EXPORT_DATA_SYMBOL_GPL(empty_zero_page)
- empty_zero_page:
- .skip PAGE_SIZE
-
-diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index d111248af719..096731049538 100644
---- a/arch/ia64/kernel/ia64_ksyms.c
-+++ b/arch/ia64/kernel/ia64_ksyms.c
-@@ -1,11 +1,101 @@
- /*
- * Architecture-specific kernel symbols
-+ *
-+ * Don't put any exports here unless it's defined in an assembler file.
-+ * All other exports should be put directly after the definition.
- */
-
-+#include <linux/module.h>
-+
-+#include <linux/string.h>
-+EXPORT_SYMBOL(memset);
-+EXPORT_SYMBOL(memcpy);
-+EXPORT_SYMBOL(strlen);
-+
-+#include <asm/pgtable.h>
-+EXPORT_SYMBOL_GPL(empty_zero_page);
-+
-+#include <asm/checksum.h>
-+EXPORT_SYMBOL(ip_fast_csum); /* hand-coded assembly */
-+EXPORT_SYMBOL(csum_ipv6_magic);
-+
-+#include <asm/page.h>
-+EXPORT_SYMBOL(clear_page);
-+EXPORT_SYMBOL(copy_page);
-+
- #ifdef CONFIG_VIRTUAL_MEM_MAP
--#include <linux/compiler.h>
--#include <linux/export.h>
- #include <linux/bootmem.h>
- EXPORT_SYMBOL(min_low_pfn); /* defined by bootmem.c, but not exported by generic code */
- EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not exported by generic code */
- #endif
-+
-+#include <asm/processor.h>
-+EXPORT_SYMBOL(ia64_cpu_info);
-+#ifdef CONFIG_SMP
-+EXPORT_SYMBOL(local_per_cpu_offset);
-+#endif
-+
-+#include <asm/uaccess.h>
-+EXPORT_SYMBOL(__copy_user);
-+EXPORT_SYMBOL(__do_clear_user);
-+EXPORT_SYMBOL(__strlen_user);
-+EXPORT_SYMBOL(__strncpy_from_user);
-+EXPORT_SYMBOL(__strnlen_user);
-+
-+/* from arch/ia64/lib */
-+extern void __divsi3(void);
-+extern void __udivsi3(void);
-+extern void __modsi3(void);
-+extern void __umodsi3(void);
-+extern void __divdi3(void);
-+extern void __udivdi3(void);
-+extern void __moddi3(void);
-+extern void __umoddi3(void);
-+
-+EXPORT_SYMBOL(__divsi3);
-+EXPORT_SYMBOL(__udivsi3);
-+EXPORT_SYMBOL(__modsi3);
-+EXPORT_SYMBOL(__umodsi3);
-+EXPORT_SYMBOL(__divdi3);
-+EXPORT_SYMBOL(__udivdi3);
-+EXPORT_SYMBOL(__moddi3);
-+EXPORT_SYMBOL(__umoddi3);
-+
-+#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
-+extern void xor_ia64_2(void);
-+extern void xor_ia64_3(void);
-+extern void xor_ia64_4(void);
-+extern void xor_ia64_5(void);
-+
-+EXPORT_SYMBOL(xor_ia64_2);
-+EXPORT_SYMBOL(xor_ia64_3);
-+EXPORT_SYMBOL(xor_ia64_4);
-+EXPORT_SYMBOL(xor_ia64_5);
-+#endif
-+
-+#include <asm/pal.h>
-+EXPORT_SYMBOL(ia64_pal_call_phys_stacked);
-+EXPORT_SYMBOL(ia64_pal_call_phys_static);
-+EXPORT_SYMBOL(ia64_pal_call_stacked);
-+EXPORT_SYMBOL(ia64_pal_call_static);
-+EXPORT_SYMBOL(ia64_load_scratch_fpregs);
-+EXPORT_SYMBOL(ia64_save_scratch_fpregs);
-+
-+#include <asm/unwind.h>
-+EXPORT_SYMBOL(unw_init_running);
-+
-+#if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE)
-+extern void esi_call_phys (void);
-+EXPORT_SYMBOL_GPL(esi_call_phys);
-+#endif
-+extern char ia64_ivt[];
-+EXPORT_SYMBOL(ia64_ivt);
-+
-+#include <asm/ftrace.h>
-+#ifdef CONFIG_FUNCTION_TRACER
-+/* mcount is defined in assembly */
-+EXPORT_SYMBOL(_mcount);
-+#endif
-+
-+#include <asm/cacheflush.h>
-+EXPORT_SYMBOL_GPL(flush_icache_range);
-diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
-index 44a103a5de2b..b1c3cfc93e71 100644
---- a/arch/ia64/kernel/ivt.S
-+++ b/arch/ia64/kernel/ivt.S
-@@ -57,7 +57,6 @@
- #include <asm/thread_info.h>
- #include <asm/unistd.h>
- #include <asm/errno.h>
--#include <asm/export.h>
-
- #if 0
- # define PSR_DEFAULT_BITS psr.ac
-@@ -86,7 +85,6 @@
-
- .align 32768 // align on 32KB boundary
- .global ia64_ivt
-- EXPORT_DATA_SYMBOL(ia64_ivt)
- ia64_ivt:
- /////////////////////////////////////////////////////////////////////////////////////////
- // 0x0000 Entry 0 (size 64 bundles) VHPT Translation (8,20,47)
-diff --git a/arch/ia64/kernel/pal.S b/arch/ia64/kernel/pal.S
-index 94fb2e395498..0b533441c3c9 100644
---- a/arch/ia64/kernel/pal.S
-+++ b/arch/ia64/kernel/pal.S
-@@ -14,7 +14,6 @@
-
- #include <asm/asmmacro.h>
- #include <asm/processor.h>
--#include <asm/export.h>
-
- .data
- pal_entry_point:
-@@ -88,7 +87,6 @@ GLOBAL_ENTRY(ia64_pal_call_static)
- srlz.d // seralize restoration of psr.l
- br.ret.sptk.many b0
- END(ia64_pal_call_static)
--EXPORT_SYMBOL(ia64_pal_call_static)
-
- /*
- * Make a PAL call using the stacked registers calling convention.
-@@ -124,7 +122,6 @@ GLOBAL_ENTRY(ia64_pal_call_stacked)
- srlz.d // serialize restoration of psr.l
- br.ret.sptk.many b0
- END(ia64_pal_call_stacked)
--EXPORT_SYMBOL(ia64_pal_call_stacked)
-
- /*
- * Make a physical mode PAL call using the static registers calling convention.
-@@ -196,7 +193,6 @@ GLOBAL_ENTRY(ia64_pal_call_phys_static)
- srlz.d // seralize restoration of psr.l
- br.ret.sptk.many b0
- END(ia64_pal_call_phys_static)
--EXPORT_SYMBOL(ia64_pal_call_phys_static)
-
- /*
- * Make a PAL call using the stacked registers in physical mode.
-@@ -254,7 +250,6 @@ GLOBAL_ENTRY(ia64_pal_call_phys_stacked)
- srlz.d // seralize restoration of psr.l
- br.ret.sptk.many b0
- END(ia64_pal_call_phys_stacked)
--EXPORT_SYMBOL(ia64_pal_call_phys_stacked)
-
- /*
- * Save scratch fp scratch regs which aren't saved in pt_regs already
-@@ -280,7 +275,6 @@ GLOBAL_ENTRY(ia64_save_scratch_fpregs)
- stf.spill [r2] = f15,32
- br.ret.sptk.many rp
- END(ia64_save_scratch_fpregs)
--EXPORT_SYMBOL(ia64_save_scratch_fpregs)
-
- /*
- * Load scratch fp scratch regs (fp10-fp15)
-@@ -302,4 +296,3 @@ GLOBAL_ENTRY(ia64_load_scratch_fpregs)
- ldf.fill f15 = [r2],32
- br.ret.sptk.many rp
- END(ia64_load_scratch_fpregs)
--EXPORT_SYMBOL(ia64_load_scratch_fpregs)
-diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
-index 7ec7acc844c2..afddb3e80a29 100644
---- a/arch/ia64/kernel/setup.c
-+++ b/arch/ia64/kernel/setup.c
-@@ -71,11 +71,7 @@ EXPORT_SYMBOL(__per_cpu_offset);
- #endif
-
- DEFINE_PER_CPU(struct cpuinfo_ia64, ia64_cpu_info);
--EXPORT_SYMBOL(ia64_cpu_info);
- DEFINE_PER_CPU(unsigned long, local_per_cpu_offset);
--#ifdef CONFIG_SMP
--EXPORT_SYMBOL(local_per_cpu_offset);
--#endif
- unsigned long ia64_cycles_per_usec;
- struct ia64_boot_param *ia64_boot_param;
- struct screen_info screen_info;
-diff --git a/arch/ia64/lib/clear_page.S b/arch/ia64/lib/clear_page.S
-index 3cf5b76e587f..2d814e7ed191 100644
---- a/arch/ia64/lib/clear_page.S
-+++ b/arch/ia64/lib/clear_page.S
-@@ -11,7 +11,6 @@
-
- #include <asm/asmmacro.h>
- #include <asm/page.h>
--#include <asm/export.h>
-
- #ifdef CONFIG_ITANIUM
- # define L3_LINE_SIZE 64 // Itanium L3 line size
-@@ -75,4 +74,3 @@ GLOBAL_ENTRY(clear_page)
- mov ar.lc = saved_lc // restore lc
- br.ret.sptk.many rp
- END(clear_page)
--EXPORT_SYMBOL(clear_page)
-diff --git a/arch/ia64/lib/clear_user.S b/arch/ia64/lib/clear_user.S
-index 7b40731ee5d8..eecd8577b209 100644
---- a/arch/ia64/lib/clear_user.S
-+++ b/arch/ia64/lib/clear_user.S
-@@ -12,7 +12,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- //
- // arguments
-@@ -208,4 +207,3 @@ GLOBAL_ENTRY(__do_clear_user)
- mov ar.lc=saved_lc
- br.ret.sptk.many rp
- END(__do_clear_user)
--EXPORT_SYMBOL(__do_clear_user)
-diff --git a/arch/ia64/lib/copy_page.S b/arch/ia64/lib/copy_page.S
-index cbdb9e323ffb..127d1d050d78 100644
---- a/arch/ia64/lib/copy_page.S
-+++ b/arch/ia64/lib/copy_page.S
-@@ -16,7 +16,6 @@
- */
- #include <asm/asmmacro.h>
- #include <asm/page.h>
--#include <asm/export.h>
-
- #define PIPE_DEPTH 3
- #define EPI p[PIPE_DEPTH-1]
-@@ -97,4 +96,3 @@ GLOBAL_ENTRY(copy_page)
- mov ar.lc=saved_lc
- br.ret.sptk.many rp
- END(copy_page)
--EXPORT_SYMBOL(copy_page)
-diff --git a/arch/ia64/lib/copy_page_mck.S b/arch/ia64/lib/copy_page_mck.S
-index c13f69036876..3c45d60a81b4 100644
---- a/arch/ia64/lib/copy_page_mck.S
-+++ b/arch/ia64/lib/copy_page_mck.S
-@@ -61,7 +61,6 @@
- */
- #include <asm/asmmacro.h>
- #include <asm/page.h>
--#include <asm/export.h>
-
- #define PREFETCH_DIST 8 // McKinley sustains 16 outstanding L2 misses (8 ld, 8 st)
-
-@@ -184,4 +183,3 @@ GLOBAL_ENTRY(copy_page)
- mov pr = saved_pr, -1
- br.ret.sptk.many rp
- END(copy_page)
--EXPORT_SYMBOL(copy_page)
-diff --git a/arch/ia64/lib/copy_user.S b/arch/ia64/lib/copy_user.S
-index 66facd52e8d0..c952bdc6a093 100644
---- a/arch/ia64/lib/copy_user.S
-+++ b/arch/ia64/lib/copy_user.S
-@@ -30,7 +30,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- //
- // Tuneable parameters
-@@ -609,4 +608,3 @@ GLOBAL_ENTRY(__copy_user)
- mov ar.pfs=saved_pfs
- br.ret.sptk.many rp
- END(__copy_user)
--EXPORT_SYMBOL(__copy_user)
-diff --git a/arch/ia64/lib/flush.S b/arch/ia64/lib/flush.S
-index 9a5a2f9fad13..1d8c88860063 100644
---- a/arch/ia64/lib/flush.S
-+++ b/arch/ia64/lib/flush.S
-@@ -8,7 +8,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
-
- /*
-@@ -61,7 +60,6 @@ GLOBAL_ENTRY(flush_icache_range)
- mov ar.lc=r3 // restore ar.lc
- br.ret.sptk.many rp
- END(flush_icache_range)
--EXPORT_SYMBOL_GPL(flush_icache_range)
-
- /*
- * clflush_cache_range(start,size)
-diff --git a/arch/ia64/lib/idiv32.S b/arch/ia64/lib/idiv32.S
-index 715aed79a9ce..c91b5b0129ff 100644
---- a/arch/ia64/lib/idiv32.S
-+++ b/arch/ia64/lib/idiv32.S
-@@ -15,7 +15,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- #ifdef MODULO
- # define OP mod
-@@ -82,4 +81,3 @@ GLOBAL_ENTRY(NAME)
- getf.sig r8 = f6 // transfer result to result register
- br.ret.sptk.many rp
- END(NAME)
--EXPORT_SYMBOL(NAME)
-diff --git a/arch/ia64/lib/idiv64.S b/arch/ia64/lib/idiv64.S
-index 25840f697753..627573c4ceb1 100644
---- a/arch/ia64/lib/idiv64.S
-+++ b/arch/ia64/lib/idiv64.S
-@@ -15,7 +15,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- #ifdef MODULO
- # define OP mod
-@@ -79,4 +78,3 @@ GLOBAL_ENTRY(NAME)
- getf.sig r8 = f11 // transfer result to result register
- br.ret.sptk.many rp
- END(NAME)
--EXPORT_SYMBOL(NAME)
-diff --git a/arch/ia64/lib/ip_fast_csum.S b/arch/ia64/lib/ip_fast_csum.S
-index 648e0d4a4839..620d9dc5220f 100644
---- a/arch/ia64/lib/ip_fast_csum.S
-+++ b/arch/ia64/lib/ip_fast_csum.S
-@@ -13,7 +13,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- /*
- * Since we know that most likely this function is called with buf aligned
-@@ -93,7 +92,6 @@ GLOBAL_ENTRY(ip_fast_csum)
- mov b0=r34
- br.ret.sptk.many b0
- END(ip_fast_csum)
--EXPORT_SYMBOL(ip_fast_csum)
-
- GLOBAL_ENTRY(csum_ipv6_magic)
- ld4 r20=[in0],4
-@@ -144,4 +142,3 @@ GLOBAL_ENTRY(csum_ipv6_magic)
- andcm r8=r9,r8
- br.ret.sptk.many b0
- END(csum_ipv6_magic)
--EXPORT_SYMBOL(csum_ipv6_magic)
-diff --git a/arch/ia64/lib/memcpy.S b/arch/ia64/lib/memcpy.S
-index ba172fd6acf4..448908d80b69 100644
---- a/arch/ia64/lib/memcpy.S
-+++ b/arch/ia64/lib/memcpy.S
-@@ -14,7 +14,6 @@
- * David Mosberger-Tang <davidm at hpl.hp.com>
- */
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- GLOBAL_ENTRY(memcpy)
-
-@@ -300,4 +299,3 @@ GLOBAL_ENTRY(memcpy)
- COPY(56, 0)
-
- END(memcpy)
--EXPORT_SYMBOL(memcpy)
-diff --git a/arch/ia64/lib/memcpy_mck.S b/arch/ia64/lib/memcpy_mck.S
-index b264b6a7967b..ab0f87639729 100644
---- a/arch/ia64/lib/memcpy_mck.S
-+++ b/arch/ia64/lib/memcpy_mck.S
-@@ -15,7 +15,6 @@
- */
- #include <asm/asmmacro.h>
- #include <asm/page.h>
--#include <asm/export.h>
-
- #define EK(y...) EX(y)
-
-@@ -79,7 +78,6 @@ GLOBAL_ENTRY(memcpy)
- br.cond.sptk .common_code
- ;;
- END(memcpy)
--EXPORT_SYMBOL(memcpy)
- GLOBAL_ENTRY(__copy_user)
- .prologue
- // check dest alignment
-@@ -666,4 +664,3 @@ EK(.ex_handler, (p17) st8 [dst1]=r39,8); \
-
- /* end of McKinley specific optimization */
- END(__copy_user)
--EXPORT_SYMBOL(__copy_user)
-diff --git a/arch/ia64/lib/memset.S b/arch/ia64/lib/memset.S
-index 87b974704075..f26c16aefb1c 100644
---- a/arch/ia64/lib/memset.S
-+++ b/arch/ia64/lib/memset.S
-@@ -18,7 +18,6 @@
- to get peak speed when value = 0. */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
- #undef ret
-
- #define dest in0
-@@ -361,4 +360,3 @@ GLOBAL_ENTRY(memset)
- br.ret.sptk.many rp
- }
- END(memset)
--EXPORT_SYMBOL(memset)
-diff --git a/arch/ia64/lib/strlen.S b/arch/ia64/lib/strlen.S
-index 1a6e17c657b4..e0cdac0a85b8 100644
---- a/arch/ia64/lib/strlen.S
-+++ b/arch/ia64/lib/strlen.S
-@@ -17,7 +17,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- //
- //
-@@ -191,4 +190,3 @@ GLOBAL_ENTRY(strlen)
- mov ar.pfs=saved_pfs // because of ar.ec, restore no matter what
- br.ret.sptk.many rp // end of successful recovery code
- END(strlen)
--EXPORT_SYMBOL(strlen)
-diff --git a/arch/ia64/lib/strlen_user.S b/arch/ia64/lib/strlen_user.S
-index 9d257684e733..c71eded4285e 100644
---- a/arch/ia64/lib/strlen_user.S
-+++ b/arch/ia64/lib/strlen_user.S
-@@ -16,7 +16,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- //
- // int strlen_user(char *)
-@@ -197,4 +196,3 @@ GLOBAL_ENTRY(__strlen_user)
- mov ar.pfs=saved_pfs // because of ar.ec, restore no matter what
- br.ret.sptk.many rp
- END(__strlen_user)
--EXPORT_SYMBOL(__strlen_user)
-diff --git a/arch/ia64/lib/strncpy_from_user.S b/arch/ia64/lib/strncpy_from_user.S
-index ca9ccf280e2e..a504381f31eb 100644
---- a/arch/ia64/lib/strncpy_from_user.S
-+++ b/arch/ia64/lib/strncpy_from_user.S
-@@ -17,7 +17,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- GLOBAL_ENTRY(__strncpy_from_user)
- alloc r2=ar.pfs,3,0,0,0
-@@ -43,4 +42,3 @@ GLOBAL_ENTRY(__strncpy_from_user)
- [.Lexit:]
- br.ret.sptk.many rp
- END(__strncpy_from_user)
--EXPORT_SYMBOL(__strncpy_from_user)
-diff --git a/arch/ia64/lib/strnlen_user.S b/arch/ia64/lib/strnlen_user.S
-index 80a5dfd1d402..d09066b1e49d 100644
---- a/arch/ia64/lib/strnlen_user.S
-+++ b/arch/ia64/lib/strnlen_user.S
-@@ -13,7 +13,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- GLOBAL_ENTRY(__strnlen_user)
- .prologue
-@@ -44,4 +43,3 @@ GLOBAL_ENTRY(__strnlen_user)
- mov ar.lc=r16 // restore ar.lc
- br.ret.sptk.many rp
- END(__strnlen_user)
--EXPORT_SYMBOL(__strnlen_user)
-diff --git a/arch/ia64/lib/xor.S b/arch/ia64/lib/xor.S
-index c83f1c410691..54e3f7eab8e9 100644
---- a/arch/ia64/lib/xor.S
-+++ b/arch/ia64/lib/xor.S
-@@ -14,7 +14,6 @@
- */
-
- #include <asm/asmmacro.h>
--#include <asm/export.h>
-
- GLOBAL_ENTRY(xor_ia64_2)
- .prologue
-@@ -52,7 +51,6 @@ GLOBAL_ENTRY(xor_ia64_2)
- mov pr = r29, -1
- br.ret.sptk.few rp
- END(xor_ia64_2)
--EXPORT_SYMBOL(xor_ia64_2)
-
- GLOBAL_ENTRY(xor_ia64_3)
- .prologue
-@@ -93,7 +91,6 @@ GLOBAL_ENTRY(xor_ia64_3)
- mov pr = r29, -1
- br.ret.sptk.few rp
- END(xor_ia64_3)
--EXPORT_SYMBOL(xor_ia64_3)
-
- GLOBAL_ENTRY(xor_ia64_4)
- .prologue
-@@ -137,7 +134,6 @@ GLOBAL_ENTRY(xor_ia64_4)
- mov pr = r29, -1
- br.ret.sptk.few rp
- END(xor_ia64_4)
--EXPORT_SYMBOL(xor_ia64_4)
-
- GLOBAL_ENTRY(xor_ia64_5)
- .prologue
-@@ -186,4 +182,3 @@ GLOBAL_ENTRY(xor_ia64_5)
- mov pr = r29, -1
- br.ret.sptk.few rp
- END(xor_ia64_5)
--EXPORT_SYMBOL(xor_ia64_5)
diff --git a/debian/patches/series b/debian/patches/series
index ca1a0b6..35c5d2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,7 +148,6 @@ bugfix/all/nfsv4.x-callback-create-the-callback-service-through.patch
bugfix/all/mm-larger-stack-guard-gap-between-vmas.patch
# Fix exported symbol versions
-bugfix/ia64/revert-ia64-move-exports-to-definitions.patch
bugfix/sparc/revert-sparc-move-exports-to-definitions.patch
bugfix/m68k/revert-m68k-move-exports-to-definitions.patch
bugfix/alpha/revert-alpha-move-exports-to-actual-definitions.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list