Skip to content

Commit cff52da

Browse files
Al ViroLinus Torvalds
Al Viro
authored and
Linus Torvalds
committed
[PATCH] alpha_ksyms.c cleanup
taken exports to actual definitions of symbols being exported. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
1 parent 9ab6a45 commit cff52da

10 files changed

Lines changed: 44 additions & 94 deletions

File tree

‎arch/alpha/kernel/alpha_ksyms.c‎

Lines changed: 1 addition & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,14 @@
66
*/
77

88
#include <linux/module.h>
9-
#include <linux/string.h>
10-
#include <linux/user.h>
11-
#include <linux/elfcore.h>
12-
#include <linux/socket.h>
13-
#include <linux/syscalls.h>
14-
#include <linux/in.h>
15-
#include <linux/in6.h>
16-
#include <linux/pci.h>
17-
#include <linux/screen_info.h>
18-
#include <linux/tty.h>
19-
#include <linux/mm.h>
20-
#include <linux/delay.h>
21-
#include <linux/dma-mapping.h>
22-
23-
#include <asm/io.h>
249
#include <asm/console.h>
25-
#include <asm/hwrpb.h>
2610
#include <asm/uaccess.h>
27-
#include <asm/processor.h>
2811
#include <asm/checksum.h>
29-
#include <linux/interrupt.h>
3012
#include <asm/fpu.h>
31-
#include <asm/irq.h>
3213
#include <asm/machvec.h>
33-
#include <asm/pgalloc.h>
34-
#include <asm/semaphore.h>
35-
#include <asm/tlbflush.h>
36-
#include <asm/cacheflush.h>
37-
#include <asm/vga.h>
3814

3915
#include <asm/unistd.h>
4016

41-
extern struct hwrpb_struct *hwrpb;
42-
extern spinlock_t rtc_lock;
43-
4417
/* these are C runtime functions with special calling conventions: */
4518
extern void __divl (void);
4619
extern void __reml (void);
@@ -52,14 +25,9 @@ extern void __divqu (void);
5225
extern void __remqu (void);
5326

5427
EXPORT_SYMBOL(alpha_mv);
55-
EXPORT_SYMBOL(screen_info);
56-
EXPORT_SYMBOL(perf_irq);
5728
EXPORT_SYMBOL(callback_getenv);
5829
EXPORT_SYMBOL(callback_setenv);
5930
EXPORT_SYMBOL(callback_save_env);
60-
#ifdef CONFIG_ALPHA_GENERIC
61-
EXPORT_SYMBOL(alpha_using_srm);
62-
#endif /* CONFIG_ALPHA_GENERIC */
6331

6432
/* platform dependent support */
6533
EXPORT_SYMBOL(strcat);
@@ -77,47 +45,14 @@ EXPORT_SYMBOL(__constant_c_memset);
7745
EXPORT_SYMBOL(copy_page);
7846
EXPORT_SYMBOL(clear_page);
7947

80-
EXPORT_SYMBOL(__direct_map_base);
81-
EXPORT_SYMBOL(__direct_map_size);
82-
83-
#ifdef CONFIG_PCI
84-
EXPORT_SYMBOL(pci_alloc_consistent);
85-
EXPORT_SYMBOL(pci_free_consistent);
86-
EXPORT_SYMBOL(pci_map_single);
87-
EXPORT_SYMBOL(pci_map_page);
88-
EXPORT_SYMBOL(pci_unmap_single);
89-
EXPORT_SYMBOL(pci_unmap_page);
90-
EXPORT_SYMBOL(pci_map_sg);
91-
EXPORT_SYMBOL(pci_unmap_sg);
92-
EXPORT_SYMBOL(pci_dma_supported);
93-
EXPORT_SYMBOL(pci_dac_dma_supported);
94-
EXPORT_SYMBOL(pci_dac_page_to_dma);
95-
EXPORT_SYMBOL(pci_dac_dma_to_page);
96-
EXPORT_SYMBOL(pci_dac_dma_to_offset);
97-
EXPORT_SYMBOL(alpha_gendev_to_pci);
98-
#endif
99-
EXPORT_SYMBOL(dma_set_mask);
100-
101-
EXPORT_SYMBOL(dump_thread);
102-
EXPORT_SYMBOL(dump_elf_thread);
103-
EXPORT_SYMBOL(dump_elf_task);
104-
EXPORT_SYMBOL(dump_elf_task_fp);
105-
EXPORT_SYMBOL(hwrpb);
106-
EXPORT_SYMBOL(start_thread);
10748
EXPORT_SYMBOL(alpha_read_fp_reg);
10849
EXPORT_SYMBOL(alpha_read_fp_reg_s);
10950
EXPORT_SYMBOL(alpha_write_fp_reg);
11051
EXPORT_SYMBOL(alpha_write_fp_reg_s);
11152

112-
/* In-kernel system calls. */
53+
/* entry.S */
11354
EXPORT_SYMBOL(kernel_thread);
114-
EXPORT_SYMBOL(sys_dup);
115-
EXPORT_SYMBOL(sys_exit);
116-
EXPORT_SYMBOL(sys_write);
117-
EXPORT_SYMBOL(sys_lseek);
11855
EXPORT_SYMBOL(kernel_execve);
119-
EXPORT_SYMBOL(sys_setsid);
120-
EXPORT_SYMBOL(sys_wait4);
12156

12257
/* Networking helper routines. */
12358
EXPORT_SYMBOL(csum_tcpudp_magic);
@@ -134,10 +69,6 @@ EXPORT_SYMBOL(alpha_fp_emul_imprecise);
13469
EXPORT_SYMBOL(alpha_fp_emul);
13570
#endif
13671

137-
#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
138-
EXPORT_SYMBOL(__min_ipl);
139-
#endif
140-
14172
/*
14273
* The following are specially called from the uaccess assembly stubs.
14374
*/
@@ -160,26 +91,9 @@ EXPORT_SYMBOL(up);
16091
*/
16192

16293
#ifdef CONFIG_SMP
163-
EXPORT_SYMBOL(flush_tlb_mm);
164-
EXPORT_SYMBOL(flush_tlb_range);
165-
EXPORT_SYMBOL(flush_tlb_page);
166-
EXPORT_SYMBOL(smp_imb);
167-
EXPORT_SYMBOL(cpu_data);
168-
EXPORT_SYMBOL(smp_num_cpus);
169-
EXPORT_SYMBOL(smp_call_function);
170-
EXPORT_SYMBOL(smp_call_function_on_cpu);
17194
EXPORT_SYMBOL(_atomic_dec_and_lock);
17295
#endif /* CONFIG_SMP */
17396

174-
/*
175-
* NUMA specific symbols
176-
*/
177-
#ifdef CONFIG_DISCONTIGMEM
178-
EXPORT_SYMBOL(node_data);
179-
#endif /* CONFIG_DISCONTIGMEM */
180-
181-
EXPORT_SYMBOL(rtc_lock);
182-
18397
/*
18498
* The following are special because they're not called
18599
* explicitly (the C compiler or assembler generates them in
@@ -200,8 +114,3 @@ EXPORT_SYMBOL(__remqu);
200114
EXPORT_SYMBOL(memcpy);
201115
EXPORT_SYMBOL(memset);
202116
EXPORT_SYMBOL(memchr);
203-
204-
#ifdef CONFIG_ALPHA_IRONGATE
205-
EXPORT_SYMBOL(irongate_ioremap);
206-
EXPORT_SYMBOL(irongate_iounmap);
207-
#endif

‎arch/alpha/kernel/core_irongate.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ irongate_ioremap(unsigned long addr, unsigned long size)
404404
#endif
405405
return (void __iomem *)vaddr;
406406
}
407+
EXPORT_SYMBOL(irongate_ioremap);
407408

408409
void
409410
irongate_iounmap(volatile void __iomem *xaddr)
@@ -414,3 +415,4 @@ irongate_iounmap(volatile void __iomem *xaddr)
414415
if (addr)
415416
return vfree((void *)(PAGE_MASK & addr));
416417
}
418+
EXPORT_SYMBOL(irongate_iounmap);

‎arch/alpha/kernel/irq_alpha.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/sched.h>
77
#include <linux/irq.h>
88
#include <linux/kernel_stat.h>
9+
#include <linux/module.h>
910

1011
#include <asm/machvec.h>
1112
#include <asm/dma.h>
@@ -16,6 +17,7 @@
1617
/* Hack minimum IPL during interrupt processing for broken hardware. */
1718
#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
1819
int __min_ipl;
20+
EXPORT_SYMBOL(__min_ipl);
1921
#endif
2022

2123
/*
@@ -30,6 +32,7 @@ dummy_perf(unsigned long vector, struct pt_regs *regs)
3032
}
3133

3234
void (*perf_irq)(unsigned long, struct pt_regs *) = dummy_perf;
35+
EXPORT_SYMBOL(perf_irq);
3336

3437
/*
3538
* The main interrupt entry point.

‎arch/alpha/kernel/pci-noop.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ dma_set_mask(struct device *dev, u64 mask)
201201

202202
return 0;
203203
}
204+
EXPORT_SYMBOL(dma_set_mask);
204205

205206
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
206207
{

‎arch/alpha/kernel/pci_iommu.c‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ pci_map_single(struct pci_dev *pdev, void *cpu_addr, size_t size, int dir)
300300
dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
301301
return pci_map_single_1(pdev, cpu_addr, size, dac_allowed);
302302
}
303+
EXPORT_SYMBOL(pci_map_single);
303304

304305
dma_addr_t
305306
pci_map_page(struct pci_dev *pdev, struct page *page, unsigned long offset,
@@ -314,6 +315,7 @@ pci_map_page(struct pci_dev *pdev, struct page *page, unsigned long offset,
314315
return pci_map_single_1(pdev, (char *)page_address(page) + offset,
315316
size, dac_allowed);
316317
}
318+
EXPORT_SYMBOL(pci_map_page);
317319

318320
/* Unmap a single streaming mode DMA translation. The DMA_ADDR and
319321
SIZE must match what was provided for in a previous pci_map_single
@@ -379,13 +381,15 @@ pci_unmap_single(struct pci_dev *pdev, dma_addr_t dma_addr, size_t size,
379381
DBGA2("pci_unmap_single: sg [%lx,%lx] np %ld from %p\n",
380382
dma_addr, size, npages, __builtin_return_address(0));
381383
}
384+
EXPORT_SYMBOL(pci_unmap_single);
382385

383386
void
384387
pci_unmap_page(struct pci_dev *pdev, dma_addr_t dma_addr,
385388
size_t size, int direction)
386389
{
387390
pci_unmap_single(pdev, dma_addr, size, direction);
388391
}
392+
EXPORT_SYMBOL(pci_unmap_page);
389393

390394
/* Allocate and map kernel buffer using consistent mode DMA for PCI
391395
device. Returns non-NULL cpu-view pointer to the buffer if
@@ -427,6 +431,7 @@ pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp)
427431

428432
return cpu_addr;
429433
}
434+
EXPORT_SYMBOL(pci_alloc_consistent);
430435

431436
/* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must
432437
be values that were returned from pci_alloc_consistent. SIZE must
@@ -444,7 +449,7 @@ pci_free_consistent(struct pci_dev *pdev, size_t size, void *cpu_addr,
444449
DBGA2("pci_free_consistent: [%x,%lx] from %p\n",
445450
dma_addr, size, __builtin_return_address(0));
446451
}
447-
452+
EXPORT_SYMBOL(pci_free_consistent);
448453

449454
/* Classify the elements of the scatterlist. Write dma_address
450455
of each element with:
@@ -672,6 +677,7 @@ pci_map_sg(struct pci_dev *pdev, struct scatterlist *sg, int nents,
672677
pci_unmap_sg(pdev, start, out - start, direction);
673678
return 0;
674679
}
680+
EXPORT_SYMBOL(pci_map_sg);
675681

676682
/* Unmap a set of streaming mode DMA translations. Again, cpu read
677683
rules concerning calls here are the same as for pci_unmap_single()
@@ -752,6 +758,7 @@ pci_unmap_sg(struct pci_dev *pdev, struct scatterlist *sg, int nents,
752758

753759
DBGA("pci_unmap_sg: %ld entries\n", nents - (end - sg));
754760
}
761+
EXPORT_SYMBOL(pci_unmap_sg);
755762

756763

757764
/* Return whether the given PCI device DMA address mask can be
@@ -786,6 +793,7 @@ pci_dma_supported(struct pci_dev *pdev, u64 mask)
786793

787794
return 0;
788795
}
796+
EXPORT_SYMBOL(pci_dma_supported);
789797

790798

791799
/*
@@ -908,6 +916,7 @@ pci_dac_dma_supported(struct pci_dev *dev, u64 mask)
908916

909917
return ok;
910918
}
919+
EXPORT_SYMBOL(pci_dac_dma_supported);
911920

912921
dma64_addr_t
913922
pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page,
@@ -917,20 +926,22 @@ pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page,
917926
+ __pa(page_address(page))
918927
+ (dma64_addr_t) offset);
919928
}
929+
EXPORT_SYMBOL(pci_dac_page_to_dma);
920930

921931
struct page *
922932
pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr)
923933
{
924934
unsigned long paddr = (dma_addr & PAGE_MASK) - alpha_mv.pci_dac_offset;
925935
return virt_to_page(__va(paddr));
926936
}
937+
EXPORT_SYMBOL(pci_dac_dma_to_page);
927938

928939
unsigned long
929940
pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr)
930941
{
931942
return (dma_addr & ~PAGE_MASK);
932943
}
933-
944+
EXPORT_SYMBOL(pci_dac_dma_to_offset);
934945

935946
/* Helper for generic DMA-mapping functions. */
936947

@@ -957,6 +968,7 @@ alpha_gendev_to_pci(struct device *dev)
957968
/* This assumes ISA bus master with dma_mask 0xffffff. */
958969
return NULL;
959970
}
971+
EXPORT_SYMBOL(alpha_gendev_to_pci);
960972

961973
int
962974
dma_set_mask(struct device *dev, u64 mask)
@@ -969,3 +981,4 @@ dma_set_mask(struct device *dev, u64 mask)
969981

970982
return 0;
971983
}
984+
EXPORT_SYMBOL(dma_set_mask);

‎arch/alpha/kernel/process.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
205205
regs->ps = 8;
206206
wrusp(sp);
207207
}
208+
EXPORT_SYMBOL(start_thread);
208209

209210
/*
210211
* Free current thread data structures etc..
@@ -376,6 +377,7 @@ dump_thread(struct pt_regs * pt, struct user * dump)
376377
dump->regs[EF_A2] = pt->r18;
377378
memcpy((char *)dump->regs + EF_SIZE, sw->fp, 32 * 8);
378379
}
380+
EXPORT_SYMBOL(dump_thread);
379381

380382
/*
381383
* Fill in the user structure for a ELF core dump.
@@ -424,13 +426,15 @@ dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt, struct thread_info *ti)
424426
useful value of the thread's UNIQUE field. */
425427
dest[32] = ti->pcb.unique;
426428
}
429+
EXPORT_SYMBOL(dump_elf_thread);
427430

428431
int
429432
dump_elf_task(elf_greg_t *dest, struct task_struct *task)
430433
{
431434
dump_elf_thread(dest, task_pt_regs(task), task_thread_info(task));
432435
return 1;
433436
}
437+
EXPORT_SYMBOL(dump_elf_task);
434438

435439
int
436440
dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task)
@@ -439,6 +443,7 @@ dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task)
439443
memcpy(dest, sw->fp, 32 * 8);
440444
return 1;
441445
}
446+
EXPORT_SYMBOL(dump_elf_task_fp);
442447

443448
/*
444449
* sys_execve() executes a new program.

‎arch/alpha/kernel/setup.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static struct notifier_block alpha_panic_block = {
6666

6767

6868
struct hwrpb_struct *hwrpb;
69+
EXPORT_SYMBOL(hwrpb);
6970
unsigned long srm_hae;
7071

7172
int alpha_l1i_cacheshape;
@@ -111,6 +112,7 @@ unsigned long alpha_agpgart_size = DEFAULT_AGP_APER_SIZE;
111112
#ifdef CONFIG_ALPHA_GENERIC
112113
struct alpha_machine_vector alpha_mv;
113114
int alpha_using_srm;
115+
EXPORT_SYMBOL(alpha_using_srm);
114116
#endif
115117

116118
static struct alpha_machine_vector *get_sysvec(unsigned long, unsigned long,
@@ -137,13 +139,17 @@ struct screen_info screen_info = {
137139
.orig_video_points = 16
138140
};
139141

142+
EXPORT_SYMBOL(screen_info);
143+
140144
/*
141145
* The direct map I/O window, if any. This should be the same
142146
* for all busses, since it's used by virt_to_bus.
143147
*/
144148

145149
unsigned long __direct_map_base;
146150
unsigned long __direct_map_size;
151+
EXPORT_SYMBOL(__direct_map_base);
152+
EXPORT_SYMBOL(__direct_map_size);
147153

148154
/*
149155
* Declare all of the machine vectors.

0 commit comments

Comments
 (0)