Skip to content

Commit

Permalink
Blackfin: SMP: tweak platform_request_ipi() usage
Browse files Browse the repository at this point in the history
This function takes an irq_handler_t function, but the prototype in
the header doesn't match the function definition.  This is due to the
smp headers needing to avoid circular dependencies.  So change the
function to take a simple pointer.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  • Loading branch information
Graf Yang authored and Mike Frysinger committed Jan 10, 2011
1 parent 71a516a commit 75734e6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion arch/blackfin/mach-bf561/include/mach/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#ifndef _MACH_BF561_SMP
#define _MACH_BF561_SMP

/* This header has to stand alone to avoid circular deps */

struct task_struct;

void platform_init_cpus(void);
Expand All @@ -17,7 +19,7 @@ int platform_boot_secondary(unsigned int cpu, struct task_struct *idle);

void platform_secondary_init(unsigned int cpu);

void platform_request_ipi(int (*handler)(int, void *));
void platform_request_ipi(/*irq_handler_t*/ void *handler);

void platform_send_ipi(cpumask_t callmap);

Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf561/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle
panic("CPU%u: processor failed to boot\n", cpu);
}

void __init platform_request_ipi(irq_handler_t handler)
void __init platform_request_ipi(void *handler)
{
int ret;

Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/mach-common/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
{
platform_prepare_cpus(max_cpus);
ipi_queue_init();
platform_request_ipi(&ipi_handler);
platform_request_ipi(ipi_handler);
}

void __init smp_cpus_done(unsigned int max_cpus)
Expand Down

0 comments on commit 75734e6

Please sign in to comment.