Skip to content

Commit

Permalink
"make namespacecheck" fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Apr 24, 2008
1 parent f8dc5a1 commit a4928cf
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 20 deletions.
2 changes: 1 addition & 1 deletion arch/x86/kernel/apic_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ void __init init_bsp_APIC(void)
apic_write_around(APIC_LVT1, value);
}

void __cpuinit lapic_setup_esr(void)
static void __cpuinit lapic_setup_esr(void)
{
unsigned long oldvalue, value, maxlvt;
if (lapic_is_integrated() && !esr_disable) {
Expand Down
4 changes: 2 additions & 2 deletions arch/x86/kernel/apic_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ void __init setup_boot_APIC_clock(void)
* set the DUMMY flag again and force the broadcast mode in the
* clockevents layer.
*/
void __cpuinit check_boot_apic_timer_broadcast(void)
static void __cpuinit check_boot_apic_timer_broadcast(void)
{
if (!disable_apic_timer ||
(lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY))
Expand Down Expand Up @@ -834,7 +834,7 @@ void __cpuinit setup_local_APIC(void)
preempt_enable();
}

void __cpuinit lapic_setup_esr(void)
static void __cpuinit lapic_setup_esr(void)
{
unsigned maxlvt = lapic_get_maxlvt();

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/process_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ static void hard_enable_TSC(void)
write_cr4(read_cr4() & ~X86_CR4_TSD);
}

void enable_TSC(void)
static void enable_TSC(void)
{
preempt_disable();
if (test_and_clear_thread_flag(TIF_NOTSC))
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/process_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ static void hard_enable_TSC(void)
write_cr4(read_cr4() & ~X86_CR4_TSD);
}

void enable_TSC(void)
static void enable_TSC(void)
{
preempt_disable();
if (test_and_clear_thread_flag(TIF_NOTSC))
Expand Down
4 changes: 2 additions & 2 deletions arch/x86/kernel/setup_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ static void __init reserve_ebda_region(void)
}

#ifndef CONFIG_NEED_MULTIPLE_NODES
void __init setup_bootmem_allocator(void);
static void __init setup_bootmem_allocator(void);
static unsigned long __init setup_memory(void)
{
/*
Expand Down Expand Up @@ -477,7 +477,7 @@ static unsigned long __init setup_memory(void)
return max_low_pfn;
}

void __init zone_sizes_init(void)
static void __init zone_sizes_init(void)
{
unsigned long max_zone_pfns[MAX_NR_ZONES];
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
Expand Down
12 changes: 6 additions & 6 deletions arch/x86/kernel/smpboot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static void unmap_cpu_to_node(int cpu)
u8 cpu_2_logical_apicid[NR_CPUS] __read_mostly =
{ [0 ... NR_CPUS-1] = BAD_APICID };

void map_cpu_to_logical_apicid(void)
static void map_cpu_to_logical_apicid(void)
{
int cpu = smp_processor_id();
int apicid = logical_smp_processor_id();
Expand All @@ -197,7 +197,7 @@ void map_cpu_to_logical_apicid(void)
map_cpu_to_node(cpu, node);
}

void unmap_cpu_to_logical_apicid(int cpu)
static void unmap_cpu_to_logical_apicid(int cpu)
{
cpu_2_logical_apicid[cpu] = BAD_APICID;
unmap_cpu_to_node(cpu);
Expand All @@ -211,7 +211,7 @@ void unmap_cpu_to_logical_apicid(int cpu)
* Report back to the Boot Processor.
* Running on AP.
*/
void __cpuinit smp_callin(void)
static void __cpuinit smp_callin(void)
{
int cpuid, phys_id;
unsigned long timeout;
Expand Down Expand Up @@ -436,7 +436,7 @@ static void __cpuinit smp_apply_quirks(struct cpuinfo_x86 *c)
#endif
}

void __cpuinit smp_checks(void)
static void __cpuinit smp_checks(void)
{
if (smp_b_stepping)
printk(KERN_WARNING "WARNING: SMP operation may be unreliable"
Expand Down Expand Up @@ -565,7 +565,7 @@ void __init smp_alloc_memory(void)
}
#endif

void impress_friends(void)
static void impress_friends(void)
{
int cpu;
unsigned long bogosum = 0;
Expand Down Expand Up @@ -1287,7 +1287,7 @@ void cpu_exit_clear(void)
}
# endif /* CONFIG_X86_32 */

void remove_siblinginfo(int cpu)
static void remove_siblinginfo(int cpu)
{
int sibling;
struct cpuinfo_x86 *c = &cpu_data(cpu);
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/tlb_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,
spin_unlock(&f->tlbstate_lock);
}

int __cpuinit init_smp_flush(void)
static int __cpuinit init_smp_flush(void)
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/vsyscall_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache)
return 0;
}

long __vsyscall(3) venosys_1(void)
static long __vsyscall(3) venosys_1(void)
{
return -ENOSYS;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mm/dump_pagetables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ static const struct file_operations ptdump_fops = {
.release = single_release,
};

int pt_dump_init(void)
static int pt_dump_init(void)
{
struct dentry *pe;

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mm/pageattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ static const struct file_operations dpa_fops = {
.release = single_release,
};

int __init debug_pagealloc_proc_init(void)
static int __init debug_pagealloc_proc_init(void)
{
struct dentry *de;

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mm/srat_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
pxm, apic_id, node);
}

int update_end_of_memory(unsigned long end) {return -1;}
static int update_end_of_memory(unsigned long end) {return -1;}
static int hotadd_enough_memory(struct bootnode *nd) {return 1;}
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
static inline int save_add_info(void) {return 1;}
Expand Down
1 change: 0 additions & 1 deletion include/asm-x86/smp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ static inline int hard_smp_processor_id(void)
#ifdef CONFIG_HOTPLUG_CPU
extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
extern void remove_siblinginfo(int cpu);
#endif

extern void smp_alloc_memory(void);
Expand Down
1 change: 0 additions & 1 deletion include/asm-x86/tsc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ extern unsigned int cpu_khz;
extern unsigned int tsc_khz;

extern void disable_TSC(void);
extern void enable_TSC(void);

static inline cycles_t get_cycles(void)
{
Expand Down

0 comments on commit a4928cf

Please sign in to comment.