diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-04-23 07:20:56 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-24 17:15:44 -0400 |
commit | a4928cffe6435caf427ae673131a633c1329dbf3 (patch) | |
tree | a432bd0e757c547487d19bc30c1b134ad098656b /arch/x86 | |
parent | f8dc5a186c19a029f8eac0b1d2c426690e58efdb (diff) |
"make namespacecheck" fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/apic_64.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/process_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/process_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/setup_32.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/smpboot.c | 12 | ||||
-rw-r--r-- | arch/x86/kernel/tlb_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/dump_pagetables.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/pageattr.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/srat_64.c | 2 |
11 files changed, 18 insertions, 18 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 687208190b06..8317401170b8 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -902,7 +902,7 @@ void __init init_bsp_APIC(void) | |||
902 | apic_write_around(APIC_LVT1, value); | 902 | apic_write_around(APIC_LVT1, value); |
903 | } | 903 | } |
904 | 904 | ||
905 | void __cpuinit lapic_setup_esr(void) | 905 | static void __cpuinit lapic_setup_esr(void) |
906 | { | 906 | { |
907 | unsigned long oldvalue, value, maxlvt; | 907 | unsigned long oldvalue, value, maxlvt; |
908 | if (lapic_is_integrated() && !esr_disable) { | 908 | if (lapic_is_integrated() && !esr_disable) { |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 9e8e5c050c55..bf83157337e4 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -429,7 +429,7 @@ void __init setup_boot_APIC_clock(void) | |||
429 | * set the DUMMY flag again and force the broadcast mode in the | 429 | * set the DUMMY flag again and force the broadcast mode in the |
430 | * clockevents layer. | 430 | * clockevents layer. |
431 | */ | 431 | */ |
432 | void __cpuinit check_boot_apic_timer_broadcast(void) | 432 | static void __cpuinit check_boot_apic_timer_broadcast(void) |
433 | { | 433 | { |
434 | if (!disable_apic_timer || | 434 | if (!disable_apic_timer || |
435 | (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY)) | 435 | (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY)) |
@@ -834,7 +834,7 @@ void __cpuinit setup_local_APIC(void) | |||
834 | preempt_enable(); | 834 | preempt_enable(); |
835 | } | 835 | } |
836 | 836 | ||
837 | void __cpuinit lapic_setup_esr(void) | 837 | static void __cpuinit lapic_setup_esr(void) |
838 | { | 838 | { |
839 | unsigned maxlvt = lapic_get_maxlvt(); | 839 | unsigned maxlvt = lapic_get_maxlvt(); |
840 | 840 | ||
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 7adad088e373..77de848bd1fb 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -550,7 +550,7 @@ static void hard_enable_TSC(void) | |||
550 | write_cr4(read_cr4() & ~X86_CR4_TSD); | 550 | write_cr4(read_cr4() & ~X86_CR4_TSD); |
551 | } | 551 | } |
552 | 552 | ||
553 | void enable_TSC(void) | 553 | static void enable_TSC(void) |
554 | { | 554 | { |
555 | preempt_disable(); | 555 | preempt_disable(); |
556 | if (test_and_clear_thread_flag(TIF_NOTSC)) | 556 | if (test_and_clear_thread_flag(TIF_NOTSC)) |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 891af1a1b48a..131c2ee7ac56 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -562,7 +562,7 @@ static void hard_enable_TSC(void) | |||
562 | write_cr4(read_cr4() & ~X86_CR4_TSD); | 562 | write_cr4(read_cr4() & ~X86_CR4_TSD); |
563 | } | 563 | } |
564 | 564 | ||
565 | void enable_TSC(void) | 565 | static void enable_TSC(void) |
566 | { | 566 | { |
567 | preempt_disable(); | 567 | preempt_disable(); |
568 | if (test_and_clear_thread_flag(TIF_NOTSC)) | 568 | if (test_and_clear_thread_flag(TIF_NOTSC)) |
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 78828b0f604f..455d3c80960b 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -442,7 +442,7 @@ static void __init reserve_ebda_region(void) | |||
442 | } | 442 | } |
443 | 443 | ||
444 | #ifndef CONFIG_NEED_MULTIPLE_NODES | 444 | #ifndef CONFIG_NEED_MULTIPLE_NODES |
445 | void __init setup_bootmem_allocator(void); | 445 | static void __init setup_bootmem_allocator(void); |
446 | static unsigned long __init setup_memory(void) | 446 | static unsigned long __init setup_memory(void) |
447 | { | 447 | { |
448 | /* | 448 | /* |
@@ -477,7 +477,7 @@ static unsigned long __init setup_memory(void) | |||
477 | return max_low_pfn; | 477 | return max_low_pfn; |
478 | } | 478 | } |
479 | 479 | ||
480 | void __init zone_sizes_init(void) | 480 | static void __init zone_sizes_init(void) |
481 | { | 481 | { |
482 | unsigned long max_zone_pfns[MAX_NR_ZONES]; | 482 | unsigned long max_zone_pfns[MAX_NR_ZONES]; |
483 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); | 483 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 6a925394bc7e..ade371f9663a 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -184,7 +184,7 @@ static void unmap_cpu_to_node(int cpu) | |||
184 | u8 cpu_2_logical_apicid[NR_CPUS] __read_mostly = | 184 | u8 cpu_2_logical_apicid[NR_CPUS] __read_mostly = |
185 | { [0 ... NR_CPUS-1] = BAD_APICID }; | 185 | { [0 ... NR_CPUS-1] = BAD_APICID }; |
186 | 186 | ||
187 | void map_cpu_to_logical_apicid(void) | 187 | static void map_cpu_to_logical_apicid(void) |
188 | { | 188 | { |
189 | int cpu = smp_processor_id(); | 189 | int cpu = smp_processor_id(); |
190 | int apicid = logical_smp_processor_id(); | 190 | int apicid = logical_smp_processor_id(); |
@@ -197,7 +197,7 @@ void map_cpu_to_logical_apicid(void) | |||
197 | map_cpu_to_node(cpu, node); | 197 | map_cpu_to_node(cpu, node); |
198 | } | 198 | } |
199 | 199 | ||
200 | void unmap_cpu_to_logical_apicid(int cpu) | 200 | static void unmap_cpu_to_logical_apicid(int cpu) |
201 | { | 201 | { |
202 | cpu_2_logical_apicid[cpu] = BAD_APICID; | 202 | cpu_2_logical_apicid[cpu] = BAD_APICID; |
203 | unmap_cpu_to_node(cpu); | 203 | unmap_cpu_to_node(cpu); |
@@ -211,7 +211,7 @@ void unmap_cpu_to_logical_apicid(int cpu) | |||
211 | * Report back to the Boot Processor. | 211 | * Report back to the Boot Processor. |
212 | * Running on AP. | 212 | * Running on AP. |
213 | */ | 213 | */ |
214 | void __cpuinit smp_callin(void) | 214 | static void __cpuinit smp_callin(void) |
215 | { | 215 | { |
216 | int cpuid, phys_id; | 216 | int cpuid, phys_id; |
217 | unsigned long timeout; | 217 | unsigned long timeout; |
@@ -436,7 +436,7 @@ valid_k7: | |||
436 | #endif | 436 | #endif |
437 | } | 437 | } |
438 | 438 | ||
439 | void __cpuinit smp_checks(void) | 439 | static void __cpuinit smp_checks(void) |
440 | { | 440 | { |
441 | if (smp_b_stepping) | 441 | if (smp_b_stepping) |
442 | printk(KERN_WARNING "WARNING: SMP operation may be unreliable" | 442 | printk(KERN_WARNING "WARNING: SMP operation may be unreliable" |
@@ -565,7 +565,7 @@ void __init smp_alloc_memory(void) | |||
565 | } | 565 | } |
566 | #endif | 566 | #endif |
567 | 567 | ||
568 | void impress_friends(void) | 568 | static void impress_friends(void) |
569 | { | 569 | { |
570 | int cpu; | 570 | int cpu; |
571 | unsigned long bogosum = 0; | 571 | unsigned long bogosum = 0; |
@@ -1287,7 +1287,7 @@ void cpu_exit_clear(void) | |||
1287 | } | 1287 | } |
1288 | # endif /* CONFIG_X86_32 */ | 1288 | # endif /* CONFIG_X86_32 */ |
1289 | 1289 | ||
1290 | void remove_siblinginfo(int cpu) | 1290 | static void remove_siblinginfo(int cpu) |
1291 | { | 1291 | { |
1292 | int sibling; | 1292 | int sibling; |
1293 | struct cpuinfo_x86 *c = &cpu_data(cpu); | 1293 | struct cpuinfo_x86 *c = &cpu_data(cpu); |
diff --git a/arch/x86/kernel/tlb_64.c b/arch/x86/kernel/tlb_64.c index 1558e513757e..df224a8774cb 100644 --- a/arch/x86/kernel/tlb_64.c +++ b/arch/x86/kernel/tlb_64.c | |||
@@ -191,7 +191,7 @@ void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm, | |||
191 | spin_unlock(&f->tlbstate_lock); | 191 | spin_unlock(&f->tlbstate_lock); |
192 | } | 192 | } |
193 | 193 | ||
194 | int __cpuinit init_smp_flush(void) | 194 | static int __cpuinit init_smp_flush(void) |
195 | { | 195 | { |
196 | int i; | 196 | int i; |
197 | 197 | ||
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index edff4c985485..61efa2f7d564 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -216,7 +216,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) | |||
216 | return 0; | 216 | return 0; |
217 | } | 217 | } |
218 | 218 | ||
219 | long __vsyscall(3) venosys_1(void) | 219 | static long __vsyscall(3) venosys_1(void) |
220 | { | 220 | { |
221 | return -ENOSYS; | 221 | return -ENOSYS; |
222 | } | 222 | } |
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 6791b8334bc6..2c24bea92c66 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c | |||
@@ -324,7 +324,7 @@ static const struct file_operations ptdump_fops = { | |||
324 | .release = single_release, | 324 | .release = single_release, |
325 | }; | 325 | }; |
326 | 326 | ||
327 | int pt_dump_init(void) | 327 | static int pt_dump_init(void) |
328 | { | 328 | { |
329 | struct dentry *pe; | 329 | struct dentry *pe; |
330 | 330 | ||
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index f7823a172868..c29ebd037254 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
@@ -993,7 +993,7 @@ static const struct file_operations dpa_fops = { | |||
993 | .release = single_release, | 993 | .release = single_release, |
994 | }; | 994 | }; |
995 | 995 | ||
996 | int __init debug_pagealloc_proc_init(void) | 996 | static int __init debug_pagealloc_proc_init(void) |
997 | { | 997 | { |
998 | struct dentry *de; | 998 | struct dentry *de; |
999 | 999 | ||
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index fb43d89f46f3..3890234e5b26 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
@@ -163,7 +163,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) | |||
163 | pxm, apic_id, node); | 163 | pxm, apic_id, node); |
164 | } | 164 | } |
165 | 165 | ||
166 | int update_end_of_memory(unsigned long end) {return -1;} | 166 | static int update_end_of_memory(unsigned long end) {return -1;} |
167 | static int hotadd_enough_memory(struct bootnode *nd) {return 1;} | 167 | static int hotadd_enough_memory(struct bootnode *nd) {return 1;} |
168 | #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE | 168 | #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE |
169 | static inline int save_add_info(void) {return 1;} | 169 | static inline int save_add_info(void) {return 1;} |