lkml.org 
[lkml]   [2017]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Commit-ID:  4ab764c336123157690ee0000a1dcf81851c58d1
    Gitweb: http://git.kernel.org/tip/4ab764c336123157690ee0000a1dcf81851c58d1
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Tue, 20 Jun 2017 01:37:36 +0200
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Thu, 22 Jun 2017 18:21:19 +0200

    genirq: Remove pointless gfp argument

    All callers hand in GPF_KERNEL. No point to have an extra argument for
    that.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: Marc Zyngier <marc.zyngier@arm.com>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Keith Busch <keith.busch@intel.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Christoph Hellwig <hch@lst.de>
    Link: http://lkml.kernel.org/r/20170619235446.082544752@linutronix.de

    ---
    kernel/irq/irqdesc.c | 15 +++++++--------
    1 file changed, 7 insertions(+), 8 deletions(-)

    diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
    index feade53..48d4f03 100644
    --- a/kernel/irq/irqdesc.c
    +++ b/kernel/irq/irqdesc.c
    @@ -54,14 +54,14 @@ static void __init init_irq_default_affinity(void)
    #endif

    #ifdef CONFIG_SMP
    -static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node)
    +static int alloc_masks(struct irq_desc *desc, int node)
    {
    if (!zalloc_cpumask_var_node(&desc->irq_common_data.affinity,
    - gfp, node))
    + GFP_KERNEL, node))
    return -ENOMEM;

    #ifdef CONFIG_GENERIC_PENDING_IRQ
    - if (!zalloc_cpumask_var_node(&desc->pending_mask, gfp, node)) {
    + if (!zalloc_cpumask_var_node(&desc->pending_mask, GFP_KERNEL, node)) {
    free_cpumask_var(desc->irq_common_data.affinity);
    return -ENOMEM;
    }
    @@ -86,7 +86,7 @@ static void desc_smp_init(struct irq_desc *desc, int node,

    #else
    static inline int
    -alloc_masks(struct irq_desc *desc, gfp_t gfp, int node) { return 0; }
    +alloc_masks(struct irq_desc *desc, int node) { return 0; }
    static inline void
    desc_smp_init(struct irq_desc *desc, int node, const struct cpumask *affinity) { }
    #endif
    @@ -344,9 +344,8 @@ static struct irq_desc *alloc_desc(int irq, int node, unsigned int flags,
    struct module *owner)
    {
    struct irq_desc *desc;
    - gfp_t gfp = GFP_KERNEL;

    - desc = kzalloc_node(sizeof(*desc), gfp, node);
    + desc = kzalloc_node(sizeof(*desc), GFP_KERNEL, node);
    if (!desc)
    return NULL;
    /* allocate based on nr_cpu_ids */
    @@ -354,7 +353,7 @@ static struct irq_desc *alloc_desc(int irq, int node, unsigned int flags,
    if (!desc->kstat_irqs)
    goto err_desc;

    - if (alloc_masks(desc, gfp, node))
    + if (alloc_masks(desc, node))
    goto err_kstat;

    raw_spin_lock_init(&desc->lock);
    @@ -525,7 +524,7 @@ int __init early_irq_init(void)

    for (i = 0; i < count; i++) {
    desc[i].kstat_irqs = alloc_percpu(unsigned int);
    - alloc_masks(&desc[i], GFP_KERNEL, node);
    + alloc_masks(&desc[i], node);
    raw_spin_lock_init(&desc[i].lock);
    lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
    desc_set_defaults(i, &desc[i], node, NULL, NULL);
    \
     
     \ /
      Last update: 2017-06-22 20:04    [W:4.064 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site