Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66e22087 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 apic update from Thomas Gleixner:
 "Trivial cleanups of the APIC related code"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Trivial coding style fixes
  x86/vector: Merge allocate_vector() into assign_vector_locked()
parents 1e45e9a9 843c4089

arch/x86/kernel/apic/vector.c

+5 −14
Original line number Diff line number Diff line
@@ -218,7 +218,8 @@ static int reserve_irq_vector(struct irq_data *irqd) 
	return 0;

}



static int allocate_vector(struct irq_data *irqd, const struct cpumask *dest)

static int

assign_vector_locked(struct irq_data *irqd, const struct cpumask *dest)

{

	struct apic_chip_data *apicd = apic_chip_data(irqd);

	bool resvd = apicd->has_reserved;
@@ -245,22 +246,12 @@ static int allocate_vector(struct irq_data *irqd, const struct cpumask *dest) 
		return -EBUSY;



	vector = irq_matrix_alloc(vector_matrix, dest, resvd, &cpu);

	if (vector > 0)

		apic_update_vector(irqd, vector, cpu);

	trace_vector_alloc(irqd->irq, vector, resvd, vector);

	return vector;

}



static int assign_vector_locked(struct irq_data *irqd,

				const struct cpumask *dest)

{

	struct apic_chip_data *apicd = apic_chip_data(irqd);

	int vector = allocate_vector(irqd, dest);



	if (vector < 0)

		return vector;

	apic_update_vector(irqd, vector, cpu);

	apic_update_irq_cfg(irqd, vector, cpu);



	apic_update_irq_cfg(irqd, apicd->vector, apicd->cpu);

	return 0;

}

arch/x86/kernel/apic/apic.c

+1 −1

File changed.

Contains only whitespace changes.