Commit a289cc7c authored by Randy Dunlap's avatar Randy Dunlap Committed by Ingo Molnar
Browse files

x86, UV: uv_irq.c: Fix all sparse warnings 



Fix all sparse warnings in building uv_irq.c.

 arch/x86/kernel/uv_irq.c:46:17: warning: symbol 'uv_irq_chip' was not declared. Should it be static?
 arch/x86/kernel/uv_irq.c:143:50: error: no identifier for function argument
 arch/x86/kernel/uv_irq.c:162:13: error: typename in expression
 arch/x86/kernel/uv_irq.c:162:13: error: undefined identifier 'restrict'
 arch/x86/kernel/uv_irq.c:250:44: error: no identifier for function argument
 arch/x86/kernel/uv_irq.c:260:17: error: typename in expression
 arch/x86/kernel/uv_irq.c:260:17: error: undefined identifier 'restrict'
 arch/x86/kernel/uv_irq.c:233:50: warning: incorrect type in argument 3 (different signedness)
 arch/x86/kernel/uv_irq.c:233:50:    expected int *pnode
 arch/x86/kernel/uv_irq.c:233:50:    got unsigned int *<noident>
 arch/x86/include/asm/uv/uv_hub.h:318:44: warning: incorrect type in argument 2 (different address spaces)
 arch/x86/include/asm/uv/uv_hub.h:318:44:    expected void volatile [noderef] <asn:2>*addr
 arch/x86/include/asm/uv/uv_hub.h:318:44:    got unsigned long *

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Mike Travis <travis@sgi.com>
Cc: Cliff Wickman <cpw@sgi.com>
Cc: Jack Steiner <steiner@sgi.com>
LKML-Reference: <20100416175142.f4b59683.randy.dunlap@oracle.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b8f7fb13

arch/x86/include/asm/uv/uv_hub.h

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static inline unsigned long uv_read_global_mmr32(int pnode, unsigned long offset 
 * Access Global MMR space using the MMR space located at the top of physical

 * memory.

 */

static inline unsigned long *uv_global_mmr64_address(int pnode, unsigned long offset)

static inline volatile void __iomem *uv_global_mmr64_address(int pnode, unsigned long offset)

{

	return __va(UV_GLOBAL_MMR64_BASE |

		    UV_GLOBAL_MMR64_PNODE_BITS(pnode) | offset);

arch/x86/kernel/uv_irq.c

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void uv_ack_apic(unsigned int irq) 
	ack_APIC_irq();

}



struct irq_chip uv_irq_chip = {

static struct irq_chip uv_irq_chip = {

	.name		= "UV-CORE",

	.startup	= uv_noop_ret,

	.shutdown	= uv_noop,
@@ -140,7 +140,7 @@ int uv_irq_2_mmr_info(int irq, unsigned long *offset, int *pnode) 
 */

static int

arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade,

		       unsigned long mmr_offset, int restrict)

		       unsigned long mmr_offset, int limit)

{

	const struct cpumask *eligible_cpu = cpumask_of(cpu);

	struct irq_desc *desc = irq_to_desc(irq);
@@ -159,7 +159,7 @@ arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, 
	if (err != 0)

		return err;



	if (restrict == UV_AFFINITY_CPU)

	if (limit == UV_AFFINITY_CPU)

		desc->status |= IRQ_NO_BALANCING;

	else

		desc->status |= IRQ_MOVE_PCNTXT;
@@ -213,7 +213,7 @@ static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask) 
	unsigned long mmr_value;

	struct uv_IO_APIC_route_entry *entry;

	unsigned long mmr_offset;

	unsigned mmr_pnode;

	int mmr_pnode;



	if (set_desc_affinity(desc, mask, &dest))

		return -1;
@@ -247,7 +247,7 @@ static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask) 
 * interrupt is raised.

 */

int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,

		 unsigned long mmr_offset, int restrict)

		 unsigned long mmr_offset, int limit)

{

	int irq, ret;
@@ -257,7 +257,7 @@ int uv_setup_irq(char *irq_name, int cpu, int mmr_blade, 
		return -EBUSY;



	ret = arch_enable_uv_irq(irq_name, irq, cpu, mmr_blade, mmr_offset,

		restrict);

		limit);

	if (ret == irq)

		uv_set_irq_2_mmr_info(irq, mmr_offset, mmr_blade);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE