diff options
author | Anton Blanchard <anton@samba.org> | 2014-08-19 18:00:02 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-09-25 09:14:38 -0400 |
commit | e1802b065d189cdfa25eaf6d019c222a91618b9c (patch) | |
tree | f2d70f072b1b622798bd6489727cf3021eac95ce | |
parent | 4a1b08e84454f9eb46bcb1aaf307421a4df46de2 (diff) |
powerpc: Move more symbol exports next to function definitions
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 14 | ||||
-rw-r--r-- | arch/powerpc/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 3 | ||||
-rw-r--r-- | arch/powerpc/kernel/time.c | 1 | ||||
-rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 1 |
5 files changed, 7 insertions, 14 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 521291db59f8..4a42a1fc09e3 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <linux/elfcore.h> | 5 | #include <linux/elfcore.h> |
6 | #include <linux/string.h> | 6 | #include <linux/string.h> |
7 | #include <linux/interrupt.h> | 7 | #include <linux/interrupt.h> |
8 | #include <linux/screen_info.h> | ||
9 | #include <linux/vt_kern.h> | 8 | #include <linux/vt_kern.h> |
10 | #include <linux/nvram.h> | 9 | #include <linux/nvram.h> |
11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
@@ -96,8 +95,6 @@ EXPORT_SYMBOL(isa_mem_base); | |||
96 | EXPORT_SYMBOL(pci_dram_offset); | 95 | EXPORT_SYMBOL(pci_dram_offset); |
97 | #endif /* CONFIG_PCI */ | 96 | #endif /* CONFIG_PCI */ |
98 | 97 | ||
99 | EXPORT_SYMBOL(start_thread); | ||
100 | |||
101 | #ifdef CONFIG_PPC_FPU | 98 | #ifdef CONFIG_PPC_FPU |
102 | EXPORT_SYMBOL(giveup_fpu); | 99 | EXPORT_SYMBOL(giveup_fpu); |
103 | EXPORT_SYMBOL(load_fp_state); | 100 | EXPORT_SYMBOL(load_fp_state); |
@@ -109,7 +106,6 @@ EXPORT_SYMBOL(load_vr_state); | |||
109 | EXPORT_SYMBOL(store_vr_state); | 106 | EXPORT_SYMBOL(store_vr_state); |
110 | #endif /* CONFIG_ALTIVEC */ | 107 | #endif /* CONFIG_ALTIVEC */ |
111 | #ifdef CONFIG_VSX | 108 | #ifdef CONFIG_VSX |
112 | EXPORT_SYMBOL(giveup_vsx); | ||
113 | EXPORT_SYMBOL_GPL(__giveup_vsx); | 109 | EXPORT_SYMBOL_GPL(__giveup_vsx); |
114 | #endif /* CONFIG_VSX */ | 110 | #endif /* CONFIG_VSX */ |
115 | #ifdef CONFIG_SPE | 111 | #ifdef CONFIG_SPE |
@@ -128,8 +124,6 @@ EXPORT_SYMBOL(smp_hw_index); | |||
128 | #endif | 124 | #endif |
129 | #endif | 125 | #endif |
130 | 126 | ||
131 | EXPORT_SYMBOL(to_tm); | ||
132 | |||
133 | #ifdef CONFIG_PPC32 | 127 | #ifdef CONFIG_PPC32 |
134 | long long __ashrdi3(long long, int); | 128 | long long __ashrdi3(long long, int); |
135 | long long __ashldi3(long long, int); | 129 | long long __ashldi3(long long, int); |
@@ -150,10 +144,6 @@ EXPORT_SYMBOL(memmove); | |||
150 | EXPORT_SYMBOL(memcmp); | 144 | EXPORT_SYMBOL(memcmp); |
151 | EXPORT_SYMBOL(memchr); | 145 | EXPORT_SYMBOL(memchr); |
152 | 146 | ||
153 | #if defined(CONFIG_FB_VGA16_MODULE) | ||
154 | EXPORT_SYMBOL(screen_info); | ||
155 | #endif | ||
156 | |||
157 | #ifdef CONFIG_PPC32 | 147 | #ifdef CONFIG_PPC32 |
158 | EXPORT_SYMBOL(timer_interrupt); | 148 | EXPORT_SYMBOL(timer_interrupt); |
159 | EXPORT_SYMBOL(tb_ticks_per_jiffy); | 149 | EXPORT_SYMBOL(tb_ticks_per_jiffy); |
@@ -189,10 +179,6 @@ EXPORT_SYMBOL(__arch_hweight32); | |||
189 | EXPORT_SYMBOL(__arch_hweight64); | 179 | EXPORT_SYMBOL(__arch_hweight64); |
190 | #endif | 180 | #endif |
191 | 181 | ||
192 | #ifdef CONFIG_PPC_BOOK3S_64 | ||
193 | EXPORT_SYMBOL_GPL(mmu_psize_defs); | ||
194 | #endif | ||
195 | |||
196 | #ifdef CONFIG_EPAPR_PARAVIRT | 182 | #ifdef CONFIG_EPAPR_PARAVIRT |
197 | EXPORT_SYMBOL(epapr_hypercall_start); | 183 | EXPORT_SYMBOL(epapr_hypercall_start); |
198 | #endif | 184 | #endif |
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index bf44ae962ab8..aa1df89c8b2a 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
@@ -228,6 +228,7 @@ void giveup_vsx(struct task_struct *tsk) | |||
228 | giveup_altivec_maybe_transactional(tsk); | 228 | giveup_altivec_maybe_transactional(tsk); |
229 | __giveup_vsx(tsk); | 229 | __giveup_vsx(tsk); |
230 | } | 230 | } |
231 | EXPORT_SYMBOL(giveup_vsx); | ||
231 | 232 | ||
232 | void flush_vsx_to_thread(struct task_struct *tsk) | 233 | void flush_vsx_to_thread(struct task_struct *tsk) |
233 | { | 234 | { |
@@ -1316,6 +1317,7 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) | |||
1316 | current->thread.tm_tfiar = 0; | 1317 | current->thread.tm_tfiar = 0; |
1317 | #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ | 1318 | #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ |
1318 | } | 1319 | } |
1320 | EXPORT_SYMBOL(start_thread); | ||
1319 | 1321 | ||
1320 | #define PR_FP_ALL_EXCEPT (PR_FP_EXC_DIV | PR_FP_EXC_OVF | PR_FP_EXC_UND \ | 1322 | #define PR_FP_ALL_EXCEPT (PR_FP_EXC_DIV | PR_FP_EXC_OVF | PR_FP_EXC_UND \ |
1321 | | PR_FP_EXC_RES | PR_FP_EXC_INV) | 1323 | | PR_FP_EXC_RES | PR_FP_EXC_INV) |
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 1b0e26013a62..c933acd4e2bd 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
@@ -94,6 +94,9 @@ struct screen_info screen_info = { | |||
94 | .orig_video_isVGA = 1, | 94 | .orig_video_isVGA = 1, |
95 | .orig_video_points = 16 | 95 | .orig_video_points = 16 |
96 | }; | 96 | }; |
97 | #if defined(CONFIG_FB_VGA16_MODULE) | ||
98 | EXPORT_SYMBOL(screen_info); | ||
99 | #endif | ||
97 | 100 | ||
98 | /* Variables required to store legacy IO irq routing */ | 101 | /* Variables required to store legacy IO irq routing */ |
99 | int of_i8042_kbd_irq; | 102 | int of_i8042_kbd_irq; |
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 368ab374d33c..055558b953e3 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -1024,6 +1024,7 @@ void to_tm(int tim, struct rtc_time * tm) | |||
1024 | */ | 1024 | */ |
1025 | GregorianDay(tm); | 1025 | GregorianDay(tm); |
1026 | } | 1026 | } |
1027 | EXPORT_SYMBOL(to_tm); | ||
1027 | 1028 | ||
1028 | /* | 1029 | /* |
1029 | * Divide a 128-bit dividend by a 32-bit divisor, leaving a 128 bit | 1030 | * Divide a 128-bit dividend by a 32-bit divisor, leaving a 128 bit |
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index daee7f4e5a14..bc6cc2ad037b 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
@@ -92,6 +92,7 @@ extern unsigned long dart_tablebase; | |||
92 | 92 | ||
93 | static unsigned long _SDR1; | 93 | static unsigned long _SDR1; |
94 | struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; | 94 | struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; |
95 | EXPORT_SYMBOL_GPL(mmu_psize_defs); | ||
95 | 96 | ||
96 | struct hash_pte *htab_address; | 97 | struct hash_pte *htab_address; |
97 | unsigned long htab_size_bytes; | 98 | unsigned long htab_size_bytes; |