lkml.org 
[lkml]   [2008]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 2/3] Full conversion to early_initcall() interface, remove old interface.
On Fri, 27 Jun 2008 12:54:21 +0200
Johannes Weiner <hannes@saeurebad.de> wrote:

> Hi Eduard,

Hi.

> You forgot to remove the declaration from linux/interrupt.h.

The last patch was made against linux-next, as Andrew Morton
suggested, where spawn_ksoftirqd() was declared in the scope of
__do_pre_smp_initcall():
@@ -793,17 +784,6 @@ static void __init __do_pre_smp_initcalls(void)
do_one_initcall(*call);
}

-static void __init do_pre_smp_initcalls(void)
-{
- extern int spawn_ksoftirqd(void);
-
- init_call_single_data();
- migration_init();
- spawn_ksoftirqd();
- if (!nosoftlockup)
- spawn_softlockup_task();
-}
-

It may be that some other patch in -mmotm moves that into
include/linux/interrupt.h. In linux-next with my patch, running
$ find . -name \*.h | xargs grep "spawn_ksoftirqd"
shows nothing.

Thanks for spotting this difference.

(Using -mmotm + quilt myself is an additional headache, since git
already does what I want in terms of patch (read commits) management;
that's why I prefered linux-next.)

> Andrew, the following fix is needed for -mmotm:
>
> From: Johannes Weiner <hannes@saeurebad.de>
> Subject:
> full-conversion-to-early_initcall-interface-remove-old-interface-fix
>
> Original patch made spawn_softirqd() static but failed to remove the
> global definition. Do so now.
>
> Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
> ---
>
> diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
> index 30da779..62aa4f8 100644
> --- a/include/linux/interrupt.h
> +++ b/include/linux/interrupt.h
> @@ -299,7 +299,6 @@ extern void softirq_init(void);
> #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL <<
> (nr)); } while (0) extern void raise_softirq_irqoff(unsigned int nr);
> extern void raise_softirq(unsigned int nr);
> -extern int spawn_ksoftirqd(void);
>
>
> /* Tasklets --- multithreaded analogue of BHs.


Cheers,
Eduard


\
 
 \ /
  Last update: 2008-06-27 13:31    [W:0.066 / U:4.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site