diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-10-02 13:37:53 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 11:48:44 +1000 |
| commit | 5669c3cf19fbadaa9120b59914beec8431277efe (patch) | |
| tree | 463ead47019486cdbde965ce1ef17045b32ca73f /arch/powerpc/kernel/irq.c | |
| parent | 88de3cab98ff6c794b840969427e61605d0cc1ea (diff) | |
| download | kernel_samsung_espresso10-5669c3cf19fbadaa9120b59914beec8431277efe.zip kernel_samsung_espresso10-5669c3cf19fbadaa9120b59914beec8431277efe.tar.gz kernel_samsung_espresso10-5669c3cf19fbadaa9120b59914beec8431277efe.tar.bz2 | |
[POWERPC] Limit range of __init_ref_ok somewhat
This patch introduces zalloc_maybe_bootmem and uses it so that we don't
have to mark a whole (largish) routine as __init_ref_ok.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 0e47c8c..151b131 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -424,7 +424,7 @@ static int default_irq_host_match(struct irq_host *h, struct device_node *np) return h->of_node != NULL && h->of_node == np; } -__init_refok struct irq_host *irq_alloc_host(struct device_node *of_node, +struct irq_host *irq_alloc_host(struct device_node *of_node, unsigned int revmap_type, unsigned int revmap_arg, struct irq_host_ops *ops, @@ -439,13 +439,7 @@ __init_refok struct irq_host *irq_alloc_host(struct device_node *of_node, /* Allocate structure and revmap table if using linear mapping */ if (revmap_type == IRQ_HOST_MAP_LINEAR) size += revmap_arg * sizeof(unsigned int); - if (mem_init_done) - host = kzalloc(size, GFP_KERNEL); - else { - host = alloc_bootmem(size); - if (host) - memset(host, 0, size); - } + host = zalloc_maybe_bootmem(size, GFP_KERNEL); if (host == NULL) return NULL; |