* Fix parisc compile failure after smp: Add task_struct argument to __cpu_up()
@ 2012-05-25 10:59 James Bottomley
2012-05-25 12:21 ` Thomas Gleixner
0 siblings, 1 reply; 2+ messages in thread
From: James Bottomley @ 2012-05-25 10:59 UTC (permalink / raw)
To: Parisc List, Thomas Gleixner
Y29tbWl0IDgyMzljMjVmNDdkMmIzMTgxNTY5OTNiMTVmMzM5MDBhODZlYTVlMTcgYWRkZWQgYW4g
YXJndW1lbnQgdG8gb3VyDQpfX2NwdV91cCgpIGZ1bmN0aW9uLCBidXQgZGlkbid0IG5vdGljZSB3
ZSBoYXZlIGFuIGV4dHJhIGRlZmluaXRpb24gZm9yDQp0aGlzIGluIGFzbS9zbXAuaCByZXN1bHRp
bmcgaW4gYSBjb21waWxlIGZhaWx1cmUuDQoNCkZpeCBieSByZW1vdmluZyB0aGUgZXh0cmFuZW91
cyBwYXJpc2MgZGVmaW5pdGlvbiBvZiBfX2NwdV91cCgpLiAgV2hpbGUNCndlJ3JlIGF0IGl0LCBy
ZW1vdmUgdGhlIGR1cGxpY2F0ZWQgZGVmaW5pdGlvbiBvZiBzbXBfc2VuZF9yZXNjaGVkdWxlKCku
DQoNCkphbWVzDQoNCi0tLQ0KDQpkaWZmIC0tZ2l0IGEvYXJjaC9wYXJpc2MvaW5jbHVkZS9hc20v
c21wLmggYi9hcmNoL3BhcmlzYy9pbmNsdWRlL2FzbS9zbXAuaA0KaW5kZXggZThmODAzNy4uYTVk
YzkwNiAxMDA2NDQNCi0tLSBhL2FyY2gvcGFyaXNjL2luY2x1ZGUvYXNtL3NtcC5oDQorKysgYi9h
cmNoL3BhcmlzYy9pbmNsdWRlL2FzbS9zbXAuaA0KQEAgLTI1LDcgKzI1LDYgQEAgdHlwZWRlZiB1
bnNpZ25lZCBsb25nIGFkZHJlc3NfdDsNCiAjZGVmaW5lIGNwdV9udW1iZXJfbWFwKGNwdSkJKGNw
dSkNCiAjZGVmaW5lIGNwdV9sb2dpY2FsX21hcChjcHUpCShjcHUpDQogDQotZXh0ZXJuIHZvaWQg
c21wX3NlbmRfcmVzY2hlZHVsZShpbnQgY3B1KTsNCiBleHRlcm4gdm9pZCBzbXBfc2VuZF9hbGxf
bm9wKHZvaWQpOw0KIA0KIGV4dGVybiB2b2lkIGFyY2hfc2VuZF9jYWxsX2Z1bmN0aW9uX3Npbmds
ZV9pcGkoaW50IGNwdSk7DQpAQCAtNTAsNiArNDksNSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgX19j
cHVfZGllICh1bnNpZ25lZCBpbnQgY3B1KSB7DQogICB3aGlsZSgxKQ0KICAgICA7DQogfQ0KLWV4
dGVybiBpbnQgX19jcHVfdXAgKHVuc2lnbmVkIGludCBjcHUpOw0KIA0KICNlbmRpZiAvKiAgX19B
U01fU01QX0ggKi8NCg0K
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Fix parisc compile failure after smp: Add task_struct argument to __cpu_up()
2012-05-25 10:59 Fix parisc compile failure after smp: Add task_struct argument to __cpu_up() James Bottomley
@ 2012-05-25 12:21 ` Thomas Gleixner
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Gleixner @ 2012-05-25 12:21 UTC (permalink / raw)
To: James Bottomley; +Cc: Parisc List
On Fri, 25 May 2012, James Bottomley wrote:
> commit 8239c25f47d2b318156993b15f33900a86ea5e17 added an argument to our
> __cpu_up() function, but didn't notice we have an extra definition for
> this in asm/smp.h resulting in a compile failure.
>
> Fix by removing the extraneous parisc definition of __cpu_up(). While
> we're at it, remove the duplicated definition of smp_send_reschedule().
Ooops. Sorry.
> James
>
> ---
>
> diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h
> index e8f8037..a5dc906 100644
> --- a/arch/parisc/include/asm/smp.h
> +++ b/arch/parisc/include/asm/smp.h
> @@ -25,7 +25,6 @@ typedef unsigned long address_t;
> #define cpu_number_map(cpu) (cpu)
> #define cpu_logical_map(cpu) (cpu)
>
> -extern void smp_send_reschedule(int cpu);
> extern void smp_send_all_nop(void);
>
> extern void arch_send_call_function_single_ipi(int cpu);
> @@ -50,6 +49,5 @@ static inline void __cpu_die (unsigned int cpu) {
> while(1)
> ;
> }
> -extern int __cpu_up (unsigned int cpu);
>
> #endif /* __ASM_SMP_H */
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-25 12:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-25 10:59 Fix parisc compile failure after smp: Add task_struct argument to __cpu_up() James Bottomley
2012-05-25 12:21 ` Thomas Gleixner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox