Skip to content

Commit 00fc0e0

Browse files
author
Al Viro
committed
alpha: move exports to actual definitions
Signed-off-by: Al Viro <[email protected]>
1 parent 784d569 commit 00fc0e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+99
-131
lines changed

‎arch/alpha/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
generic-y += clkdev.h
44
generic-y += cputime.h
55
generic-y += exec.h
6+
generic-y += export.h
67
generic-y += irq_work.h
78
generic-y += mcs_spinlock.h
89
generic-y += mm-arch-hooks.h

‎arch/alpha/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ccflags-y := -Wno-sign-compare
88

99
obj-y := entry.o traps.o process.o osf_sys.o irq.o \
1010
irq_alpha.o signal.o setup.o ptrace.o time.o \
11-
alpha_ksyms.o systbls.o err_common.o io.o
11+
systbls.o err_common.o io.o
1212

1313
obj-$(CONFIG_VGA_HOSE) += console.o
1414
obj-$(CONFIG_SMP) += smp.o

‎arch/alpha/kernel/alpha_ksyms.c

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎arch/alpha/kernel/machvec_impl.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,11 @@
144144
else beforehand. Fine. We'll do it ourselves. */
145145
#if 0
146146
#define ALIAS_MV(system) \
147-
struct alpha_machine_vector alpha_mv __attribute__((alias(#system "_mv")));
147+
struct alpha_machine_vector alpha_mv __attribute__((alias(#system "_mv"))); \
148+
EXPORT_SYMBOL(alpha_mv);
148149
#else
149150
#define ALIAS_MV(system) \
150-
asm(".global alpha_mv\nalpha_mv = " #system "_mv");
151+
asm(".global alpha_mv\nalpha_mv = " #system "_mv"); \
152+
EXPORT_SYMBOL(alpha_mv);
151153
#endif
152154
#endif /* GENERIC */

‎arch/alpha/kernel/setup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ unsigned long alpha_agpgart_size = DEFAULT_AGP_APER_SIZE;
115115

116116
#ifdef CONFIG_ALPHA_GENERIC
117117
struct alpha_machine_vector alpha_mv;
118+
EXPORT_SYMBOL(alpha_mv);
118119
#endif
119120

120121
#ifndef alpha_using_srm

‎arch/alpha/lib/callback_srm.S

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
#include <asm/console.h>
6+
#include <asm/export.h>
67

78
.text
89
#define HWRPB_CRB_OFFSET 0xc0
@@ -92,6 +93,10 @@ CALLBACK(reset_env, CCB_RESET_ENV, 4)
9293
CALLBACK(save_env, CCB_SAVE_ENV, 1)
9394
CALLBACK(pswitch, CCB_PSWITCH, 3)
9495
CALLBACK(bios_emul, CCB_BIOS_EMUL, 5)
96+
97+
EXPORT_SYMBOL(callback_getenv)
98+
EXPORT_SYMBOL(callback_setenv)
99+
EXPORT_SYMBOL(callback_save_env)
95100

96101
.data
97102
__alpha_using_srm: # For use by bootpheader

‎arch/alpha/lib/checksum.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
4848
(__force u64)saddr + (__force u64)daddr +
4949
(__force u64)sum + ((len + proto) << 8));
5050
}
51+
EXPORT_SYMBOL(csum_tcpudp_magic);
5152

5253
__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
5354
__u32 len, __u8 proto, __wsum sum)
@@ -144,6 +145,7 @@ __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
144145
{
145146
return (__force __sum16)~do_csum(iph,ihl*4);
146147
}
148+
EXPORT_SYMBOL(ip_fast_csum);
147149

148150
/*
149151
* computes the checksum of a memory block at buff, length len,
@@ -178,3 +180,4 @@ __sum16 ip_compute_csum(const void *buff, int len)
178180
{
179181
return (__force __sum16)~from64to16(do_csum(buff,len));
180182
}
183+
EXPORT_SYMBOL(ip_compute_csum);

‎arch/alpha/lib/clear_page.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Zero an entire page.
55
*/
6-
6+
#include <asm/export.h>
77
.text
88
.align 4
99
.global clear_page
@@ -37,3 +37,4 @@ clear_page:
3737
nop
3838

3939
.end clear_page
40+
EXPORT_SYMBOL(clear_page)

‎arch/alpha/lib/clear_user.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* Clobbers:
2525
* $1,$2,$3,$4,$5,$6
2626
*/
27+
#include <asm/export.h>
2728

2829
/* Allow an exception for an insn; exit if we get one. */
2930
#define EX(x,y...) \
@@ -111,3 +112,4 @@ $exception:
111112
ret $31, ($28), 1 # .. e1 :
112113

113114
.end __do_clear_user
115+
EXPORT_SYMBOL(__do_clear_user)

‎arch/alpha/lib/copy_page.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copy an entire page.
55
*/
6-
6+
#include <asm/export.h>
77
.text
88
.align 4
99
.global copy_page
@@ -47,3 +47,4 @@ copy_page:
4747
nop
4848

4949
.end copy_page
50+
EXPORT_SYMBOL(copy_page)

‎arch/alpha/lib/copy_user.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
* $1,$2,$3,$4,$5,$6,$7
2727
*/
2828

29+
#include <asm/export.h>
30+
2931
/* Allow an exception for an insn; exit if we get one. */
3032
#define EXI(x,y...) \
3133
99: x,##y; \
@@ -143,3 +145,4 @@ $101:
143145
ret $31,($28),1
144146

145147
.end __copy_user
148+
EXPORT_SYMBOL(__copy_user)

‎arch/alpha/lib/csum_ipv6_magic.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* added by Ivan Kokshaysky <[email protected]>
1313
*/
1414

15+
#include <asm/export.h>
1516
.globl csum_ipv6_magic
1617
.align 4
1718
.ent csum_ipv6_magic
@@ -113,3 +114,4 @@ csum_ipv6_magic:
113114
ret # .. e1 :
114115

115116
.end csum_ipv6_magic
117+
EXPORT_SYMBOL(csum_ipv6_magic)

‎arch/alpha/lib/csum_partial_copy.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len,
374374
}
375375
return (__force __wsum)checksum;
376376
}
377+
EXPORT_SYMBOL(csum_partial_copy_from_user);
377378

378379
__wsum
379380
csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
@@ -386,3 +387,4 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
386387
set_fs(oldfs);
387388
return checksum;
388389
}
390+
EXPORT_SYMBOL(csum_partial_copy_nocheck);

‎arch/alpha/lib/dec_and_lock.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <linux/spinlock.h>
99
#include <linux/atomic.h>
10+
#include <linux/export.h>
1011

1112
asm (".text \n\
1213
.global _atomic_dec_and_lock \n\
@@ -39,3 +40,4 @@ static int __used atomic_dec_and_lock_1(atomic_t *atomic, spinlock_t *lock)
3940
spin_unlock(lock);
4041
return 0;
4142
}
43+
EXPORT_SYMBOL(_atomic_dec_and_lock);

‎arch/alpha/lib/divide.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
* $28 - compare status
4646
*/
4747

48+
#include <asm/export.h>
4849
#define halt .long 0
4950

5051
/*
@@ -151,6 +152,7 @@ ufunction:
151152
addq $30,STACK,$30
152153
ret $31,($23),1
153154
.end ufunction
155+
EXPORT_SYMBOL(ufunction)
154156

155157
/*
156158
* Uhh.. Ugly signed division. I'd rather not have it at all, but
@@ -193,3 +195,4 @@ sfunction:
193195
addq $30,STACK,$30
194196
ret $31,($23),1
195197
.end sfunction
198+
EXPORT_SYMBOL(sfunction)

‎arch/alpha/lib/ev6-clear_page.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Zero an entire page.
55
*/
6-
6+
#include <asm/export.h>
77
.text
88
.align 4
99
.global clear_page
@@ -52,3 +52,4 @@ clear_page:
5252
nop
5353

5454
.end clear_page
55+
EXPORT_SYMBOL(clear_page)

‎arch/alpha/lib/ev6-clear_user.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
* want to leave a hole (and we also want to avoid repeating lots of work)
4444
*/
4545

46+
#include <asm/export.h>
4647
/* Allow an exception for an insn; exit if we get one. */
4748
#define EX(x,y...) \
4849
99: x,##y; \
@@ -222,4 +223,4 @@ $exception: # Destination for exception recovery(?)
222223
nop # .. E .. .. :
223224
ret $31, ($28), 1 # L0 .. .. .. : L U L U
224225
.end __do_clear_user
225-
226+
EXPORT_SYMBOL(__do_clear_user)

‎arch/alpha/lib/ev6-copy_page.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
destination pages are in the dcache, but it is my guess that this is
5757
less important than the dcache miss case. */
5858

59-
59+
#include <asm/export.h>
6060
.text
6161
.align 4
6262
.global copy_page
@@ -201,3 +201,4 @@ copy_page:
201201
nop
202202

203203
.end copy_page
204+
EXPORT_SYMBOL(copy_page)

‎arch/alpha/lib/ev6-copy_user.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
* L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1
3838
*/
3939

40+
#include <asm/export.h>
4041
/* Allow an exception for an insn; exit if we get one. */
4142
#define EXI(x,y...) \
4243
99: x,##y; \
@@ -256,4 +257,4 @@ $101:
256257
ret $31,($28),1 # L0
257258

258259
.end __copy_user
259-
260+
EXPORT_SYMBOL(__copy_user)

‎arch/alpha/lib/ev6-csum_ipv6_magic.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
* may cause additional delay in rare cases (load-load replay traps).
5353
*/
5454

55+
#include <asm/export.h>
5556
.globl csum_ipv6_magic
5657
.align 4
5758
.ent csum_ipv6_magic
@@ -148,3 +149,4 @@ csum_ipv6_magic:
148149
ret # L0 : L U L U
149150

150151
.end csum_ipv6_magic
152+
EXPORT_SYMBOL(csum_ipv6_magic)

‎arch/alpha/lib/ev6-divide.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
* Try not to change the actual algorithm if possible for consistency.
5656
*/
5757

58+
#include <asm/export.h>
5859
#define halt .long 0
5960

6061
/*
@@ -205,6 +206,7 @@ ufunction:
205206
addq $30,STACK,$30 # E :
206207
ret $31,($23),1 # L0 : L U U L
207208
.end ufunction
209+
EXPORT_SYMBOL(ufunction)
208210

209211
/*
210212
* Uhh.. Ugly signed division. I'd rather not have it at all, but
@@ -257,3 +259,4 @@ sfunction:
257259
addq $30,STACK,$30 # E :
258260
ret $31,($23),1 # L0 : L U U L
259261
.end sfunction
262+
EXPORT_SYMBOL(sfunction)

0 commit comments

Comments
 (0)