Commit cff52daffa080eff6353f44df418b080dacefb96

Authored by Al Viro
Committed by Linus Torvalds
1 parent 9ab6a45394

[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>

Showing 10 changed files with 44 additions and 94 deletions Side-by-side Diff

arch/alpha/kernel/alpha_ksyms.c
... ... @@ -6,41 +6,14 @@
6 6 */
7 7  
8 8 #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>
24 9 #include <asm/console.h>
25   -#include <asm/hwrpb.h>
26 10 #include <asm/uaccess.h>
27   -#include <asm/processor.h>
28 11 #include <asm/checksum.h>
29   -#include <linux/interrupt.h>
30 12 #include <asm/fpu.h>
31   -#include <asm/irq.h>
32 13 #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>
38 14  
39 15 #include <asm/unistd.h>
40 16  
41   -extern struct hwrpb_struct *hwrpb;
42   -extern spinlock_t rtc_lock;
43   -
44 17 /* these are C runtime functions with special calling conventions: */
45 18 extern void __divl (void);
46 19 extern void __reml (void);
47 20  
... ... @@ -52,14 +25,9 @@
52 25 extern void __remqu (void);
53 26  
54 27 EXPORT_SYMBOL(alpha_mv);
55   -EXPORT_SYMBOL(screen_info);
56   -EXPORT_SYMBOL(perf_irq);
57 28 EXPORT_SYMBOL(callback_getenv);
58 29 EXPORT_SYMBOL(callback_setenv);
59 30 EXPORT_SYMBOL(callback_save_env);
60   -#ifdef CONFIG_ALPHA_GENERIC
61   -EXPORT_SYMBOL(alpha_using_srm);
62   -#endif /* CONFIG_ALPHA_GENERIC */
63 31  
64 32 /* platform dependent support */
65 33 EXPORT_SYMBOL(strcat);
66 34  
67 35  
68 36  
... ... @@ -77,47 +45,14 @@
77 45 EXPORT_SYMBOL(copy_page);
78 46 EXPORT_SYMBOL(clear_page);
79 47  
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);
107 48 EXPORT_SYMBOL(alpha_read_fp_reg);
108 49 EXPORT_SYMBOL(alpha_read_fp_reg_s);
109 50 EXPORT_SYMBOL(alpha_write_fp_reg);
110 51 EXPORT_SYMBOL(alpha_write_fp_reg_s);
111 52  
112   -/* In-kernel system calls. */
  53 +/* entry.S */
113 54 EXPORT_SYMBOL(kernel_thread);
114   -EXPORT_SYMBOL(sys_dup);
115   -EXPORT_SYMBOL(sys_exit);
116   -EXPORT_SYMBOL(sys_write);
117   -EXPORT_SYMBOL(sys_lseek);
118 55 EXPORT_SYMBOL(kernel_execve);
119   -EXPORT_SYMBOL(sys_setsid);
120   -EXPORT_SYMBOL(sys_wait4);
121 56  
122 57 /* Networking helper routines. */
123 58 EXPORT_SYMBOL(csum_tcpudp_magic);
... ... @@ -134,10 +69,6 @@
134 69 EXPORT_SYMBOL(alpha_fp_emul);
135 70 #endif
136 71  
137   -#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
138   -EXPORT_SYMBOL(__min_ipl);
139   -#endif
140   -
141 72 /*
142 73 * The following are specially called from the uaccess assembly stubs.
143 74 */
144 75  
... ... @@ -160,27 +91,10 @@
160 91 */
161 92  
162 93 #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);
171 94 EXPORT_SYMBOL(_atomic_dec_and_lock);
172 95 #endif /* CONFIG_SMP */
173 96  
174 97 /*
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   -
183   -/*
184 98 * The following are special because they're not called
185 99 * explicitly (the C compiler or assembler generates them in
186 100 * response to division operations). Fortunately, their
... ... @@ -200,9 +114,4 @@
200 114 EXPORT_SYMBOL(memcpy);
201 115 EXPORT_SYMBOL(memset);
202 116 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
... ... @@ -404,6 +404,7 @@
404 404 #endif
405 405 return (void __iomem *)vaddr;
406 406 }
  407 +EXPORT_SYMBOL(irongate_ioremap);
407 408  
408 409 void
409 410 irongate_iounmap(volatile void __iomem *xaddr)
... ... @@ -414,4 +415,5 @@
414 415 if (addr)
415 416 return vfree((void *)(PAGE_MASK & addr));
416 417 }
  418 +EXPORT_SYMBOL(irongate_iounmap);
arch/alpha/kernel/irq_alpha.c
... ... @@ -6,6 +6,7 @@
6 6 #include <linux/sched.h>
7 7 #include <linux/irq.h>
8 8 #include <linux/kernel_stat.h>
  9 +#include <linux/module.h>
9 10  
10 11 #include <asm/machvec.h>
11 12 #include <asm/dma.h>
... ... @@ -16,6 +17,7 @@
16 17 /* Hack minimum IPL during interrupt processing for broken hardware. */
17 18 #ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
18 19 int __min_ipl;
  20 +EXPORT_SYMBOL(__min_ipl);
19 21 #endif
20 22  
21 23 /*
... ... @@ -30,6 +32,7 @@
30 32 }
31 33  
32 34 void (*perf_irq)(unsigned long, struct pt_regs *) = dummy_perf;
  35 +EXPORT_SYMBOL(perf_irq);
33 36  
34 37 /*
35 38 * The main interrupt entry point.
arch/alpha/kernel/pci-noop.c
... ... @@ -201,6 +201,7 @@
201 201  
202 202 return 0;
203 203 }
  204 +EXPORT_SYMBOL(dma_set_mask);
204 205  
205 206 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
206 207 {
arch/alpha/kernel/pci_iommu.c
... ... @@ -300,6 +300,7 @@
300 300 dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
301 301 return pci_map_single_1(pdev, cpu_addr, size, dac_allowed);
302 302 }
  303 +EXPORT_SYMBOL(pci_map_single);
303 304  
304 305 dma_addr_t
305 306 pci_map_page(struct pci_dev *pdev, struct page *page, unsigned long offset,
... ... @@ -314,6 +315,7 @@
314 315 return pci_map_single_1(pdev, (char *)page_address(page) + offset,
315 316 size, dac_allowed);
316 317 }
  318 +EXPORT_SYMBOL(pci_map_page);
317 319  
318 320 /* Unmap a single streaming mode DMA translation. The DMA_ADDR and
319 321 SIZE must match what was provided for in a previous pci_map_single
... ... @@ -379,6 +381,7 @@
379 381 DBGA2("pci_unmap_single: sg [%lx,%lx] np %ld from %p\n",
380 382 dma_addr, size, npages, __builtin_return_address(0));
381 383 }
  384 +EXPORT_SYMBOL(pci_unmap_single);
382 385  
383 386 void
384 387 pci_unmap_page(struct pci_dev *pdev, dma_addr_t dma_addr,
... ... @@ -386,6 +389,7 @@
386 389 {
387 390 pci_unmap_single(pdev, dma_addr, size, direction);
388 391 }
  392 +EXPORT_SYMBOL(pci_unmap_page);
389 393  
390 394 /* Allocate and map kernel buffer using consistent mode DMA for PCI
391 395 device. Returns non-NULL cpu-view pointer to the buffer if
... ... @@ -427,6 +431,7 @@
427 431  
428 432 return cpu_addr;
429 433 }
  434 +EXPORT_SYMBOL(pci_alloc_consistent);
430 435  
431 436 /* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must
432 437 be values that were returned from pci_alloc_consistent. SIZE must
433 438  
... ... @@ -444,8 +449,8 @@
444 449 DBGA2("pci_free_consistent: [%x,%lx] from %p\n",
445 450 dma_addr, size, __builtin_return_address(0));
446 451 }
  452 +EXPORT_SYMBOL(pci_free_consistent);
447 453  
448   -
449 454 /* Classify the elements of the scatterlist. Write dma_address
450 455 of each element with:
451 456 0 : Followers all physically adjacent.
... ... @@ -672,6 +677,7 @@
672 677 pci_unmap_sg(pdev, start, out - start, direction);
673 678 return 0;
674 679 }
  680 +EXPORT_SYMBOL(pci_map_sg);
675 681  
676 682 /* Unmap a set of streaming mode DMA translations. Again, cpu read
677 683 rules concerning calls here are the same as for pci_unmap_single()
... ... @@ -752,6 +758,7 @@
752 758  
753 759 DBGA("pci_unmap_sg: %ld entries\n", nents - (end - sg));
754 760 }
  761 +EXPORT_SYMBOL(pci_unmap_sg);
755 762  
756 763  
757 764 /* Return whether the given PCI device DMA address mask can be
... ... @@ -786,6 +793,7 @@
786 793  
787 794 return 0;
788 795 }
  796 +EXPORT_SYMBOL(pci_dma_supported);
789 797  
790 798  
791 799 /*
... ... @@ -908,6 +916,7 @@
908 916  
909 917 return ok;
910 918 }
  919 +EXPORT_SYMBOL(pci_dac_dma_supported);
911 920  
912 921 dma64_addr_t
913 922 pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page,
... ... @@ -917,6 +926,7 @@
917 926 + __pa(page_address(page))
918 927 + (dma64_addr_t) offset);
919 928 }
  929 +EXPORT_SYMBOL(pci_dac_page_to_dma);
920 930  
921 931 struct page *
922 932 pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr)
923 933  
924 934  
... ... @@ -924,14 +934,15 @@
924 934 unsigned long paddr = (dma_addr & PAGE_MASK) - alpha_mv.pci_dac_offset;
925 935 return virt_to_page(__va(paddr));
926 936 }
  937 +EXPORT_SYMBOL(pci_dac_dma_to_page);
927 938  
928 939 unsigned long
929 940 pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr)
930 941 {
931 942 return (dma_addr & ~PAGE_MASK);
932 943 }
  944 +EXPORT_SYMBOL(pci_dac_dma_to_offset);
933 945  
934   -
935 946 /* Helper for generic DMA-mapping functions. */
936 947  
937 948 struct pci_dev *
... ... @@ -957,6 +968,7 @@
957 968 /* This assumes ISA bus master with dma_mask 0xffffff. */
958 969 return NULL;
959 970 }
  971 +EXPORT_SYMBOL(alpha_gendev_to_pci);
960 972  
961 973 int
962 974 dma_set_mask(struct device *dev, u64 mask)
... ... @@ -969,4 +981,5 @@
969 981  
970 982 return 0;
971 983 }
  984 +EXPORT_SYMBOL(dma_set_mask);
arch/alpha/kernel/process.c
... ... @@ -205,6 +205,7 @@
205 205 regs->ps = 8;
206 206 wrusp(sp);
207 207 }
  208 +EXPORT_SYMBOL(start_thread);
208 209  
209 210 /*
210 211 * Free current thread data structures etc..
... ... @@ -376,6 +377,7 @@
376 377 dump->regs[EF_A2] = pt->r18;
377 378 memcpy((char *)dump->regs + EF_SIZE, sw->fp, 32 * 8);
378 379 }
  380 +EXPORT_SYMBOL(dump_thread);
379 381  
380 382 /*
381 383 * Fill in the user structure for a ELF core dump.
... ... @@ -424,6 +426,7 @@
424 426 useful value of the thread's UNIQUE field. */
425 427 dest[32] = ti->pcb.unique;
426 428 }
  429 +EXPORT_SYMBOL(dump_elf_thread);
427 430  
428 431 int
429 432 dump_elf_task(elf_greg_t *dest, struct task_struct *task)
... ... @@ -431,6 +434,7 @@
431 434 dump_elf_thread(dest, task_pt_regs(task), task_thread_info(task));
432 435 return 1;
433 436 }
  437 +EXPORT_SYMBOL(dump_elf_task);
434 438  
435 439 int
436 440 dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task)
... ... @@ -439,6 +443,7 @@
439 443 memcpy(dest, sw->fp, 32 * 8);
440 444 return 1;
441 445 }
  446 +EXPORT_SYMBOL(dump_elf_task_fp);
442 447  
443 448 /*
444 449 * sys_execve() executes a new program.
arch/alpha/kernel/setup.c
... ... @@ -66,6 +66,7 @@
66 66  
67 67  
68 68 struct hwrpb_struct *hwrpb;
  69 +EXPORT_SYMBOL(hwrpb);
69 70 unsigned long srm_hae;
70 71  
71 72 int alpha_l1i_cacheshape;
... ... @@ -111,6 +112,7 @@
111 112 #ifdef CONFIG_ALPHA_GENERIC
112 113 struct alpha_machine_vector alpha_mv;
113 114 int alpha_using_srm;
  115 +EXPORT_SYMBOL(alpha_using_srm);
114 116 #endif
115 117  
116 118 static struct alpha_machine_vector *get_sysvec(unsigned long, unsigned long,
... ... @@ -137,6 +139,8 @@
137 139 .orig_video_points = 16
138 140 };
139 141  
  142 +EXPORT_SYMBOL(screen_info);
  143 +
140 144 /*
141 145 * The direct map I/O window, if any. This should be the same
142 146 * for all busses, since it's used by virt_to_bus.
... ... @@ -144,6 +148,8 @@
144 148  
145 149 unsigned long __direct_map_base;
146 150 unsigned long __direct_map_size;
  151 +EXPORT_SYMBOL(__direct_map_base);
  152 +EXPORT_SYMBOL(__direct_map_size);
147 153  
148 154 /*
149 155 * Declare all of the machine vectors.
arch/alpha/kernel/smp.c
... ... @@ -52,6 +52,7 @@
52 52  
53 53 /* A collection of per-processor data. */
54 54 struct cpuinfo_alpha cpu_data[NR_CPUS];
  55 +EXPORT_SYMBOL(cpu_data);
55 56  
56 57 /* A collection of single bit ipi messages. */
57 58 static struct {
... ... @@ -74,6 +75,7 @@
74 75  
75 76 int smp_num_probed; /* Internal processor count */
76 77 int smp_num_cpus = 1; /* Number that came online. */
  78 +EXPORT_SYMBOL(smp_num_cpus);
77 79  
78 80 extern void calibrate_delay(void);
79 81  
... ... @@ -790,6 +792,7 @@
790 792  
791 793 return 0;
792 794 }
  795 +EXPORT_SYMBOL(smp_call_function_on_cpu);
793 796  
794 797 int
795 798 smp_call_function (void (*func) (void *info), void *info, int retry, int wait)
... ... @@ -797,6 +800,7 @@
797 800 return smp_call_function_on_cpu (func, info, retry, wait,
798 801 cpu_online_map);
799 802 }
  803 +EXPORT_SYMBOL(smp_call_function);
800 804  
801 805 static void
802 806 ipi_imb(void *ignored)
... ... @@ -811,6 +815,7 @@
811 815 if (on_each_cpu(ipi_imb, NULL, 1, 1))
812 816 printk(KERN_CRIT "smp_imb: timed out\n");
813 817 }
  818 +EXPORT_SYMBOL(smp_imb);
814 819  
815 820 static void
816 821 ipi_flush_tlb_all(void *ignored)
... ... @@ -866,6 +871,7 @@
866 871  
867 872 preempt_enable();
868 873 }
  874 +EXPORT_SYMBOL(flush_tlb_mm);
869 875  
870 876 struct flush_tlb_page_struct {
871 877 struct vm_area_struct *vma;
... ... @@ -918,6 +924,7 @@
918 924  
919 925 preempt_enable();
920 926 }
  927 +EXPORT_SYMBOL(flush_tlb_page);
921 928  
922 929 void
923 930 flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)
... ... @@ -925,6 +932,7 @@
925 932 /* On the Alpha we always flush the whole user tlb. */
926 933 flush_tlb_mm(vma->vm_mm);
927 934 }
  935 +EXPORT_SYMBOL(flush_tlb_range);
928 936  
929 937 static void
930 938 ipi_flush_icache_page(void *x)
arch/alpha/kernel/time.c
... ... @@ -57,6 +57,7 @@
57 57 static int set_rtc_mmss(unsigned long);
58 58  
59 59 DEFINE_SPINLOCK(rtc_lock);
  60 +EXPORT_SYMBOL(rtc_lock);
60 61  
61 62 #define TICK_SIZE (tick_nsec / 1000)
62 63  
arch/alpha/mm/numa.c
... ... @@ -13,12 +13,14 @@
13 13 #include <linux/swap.h>
14 14 #include <linux/initrd.h>
15 15 #include <linux/pfn.h>
  16 +#include <linux/module.h>
16 17  
17 18 #include <asm/hwrpb.h>
18 19 #include <asm/pgalloc.h>
19 20  
20 21 pg_data_t node_data[MAX_NUMNODES];
21 22 bootmem_data_t node_bdata[MAX_NUMNODES];
  23 +EXPORT_SYMBOL(node_data);
22 24  
23 25 #undef DEBUG_DISCONTIG
24 26 #ifdef DEBUG_DISCONTIG