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

Commit 24b8e0cc authored by Peter Chubb's avatar Peter Chubb Committed by Tony Luck
Browse files

[IA64] Remove warnings for gcc 4.0 IA64 compilation. 



This patch removes some compilation warnings, mostly
trivially. acpi.c fix also noted by Kenji Kaneshige.

Signed-off-by; Peter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 065d9cac

arch/ia64/kernel/acpi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -899,7 +899,7 @@ int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) 
	if ((err = iosapic_init(phys_addr, gsi_base)))

	if ((err = iosapic_init(phys_addr, gsi_base)))

		return err;

		return err;





#if CONFIG_ACPI_NUMA

#ifdef CONFIG_ACPI_NUMA

	acpi_map_iosapic(handle, 0, NULL, NULL);

	acpi_map_iosapic(handle, 0, NULL, NULL);

#endif				/* CONFIG_ACPI_NUMA */

#endif				/* CONFIG_ACPI_NUMA */

arch/ia64/kernel/entry.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -491,7 +491,7 @@ GLOBAL_ENTRY(prefetch_stack) 
	;;

	;;

	lfetch.fault [r16], 128

	lfetch.fault [r16], 128

	br.ret.sptk.many rp

	br.ret.sptk.many rp

END(prefetch_switch_stack)

END(prefetch_stack)





GLOBAL_ENTRY(execve)

GLOBAL_ENTRY(execve)

	mov r15=__NR_execve			// put syscall number in place

	mov r15=__NR_execve			// put syscall number in place

arch/ia64/kernel/perfmon.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -574,7 +574,7 @@ pfm_protect_ctx_ctxsw(pfm_context_t *x) 
	return 0UL;

	return 0UL;

}

}





static inline unsigned long

static inline void

pfm_unprotect_ctx_ctxsw(pfm_context_t *x, unsigned long f)

pfm_unprotect_ctx_ctxsw(pfm_context_t *x, unsigned long f)

{

{

	spin_unlock(&(x)->ctx_lock);

	spin_unlock(&(x)->ctx_lock);

drivers/char/agp/hp-agp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ hp_zx1_configure (void) 
		readl(hp->ioc_regs+HP_ZX1_PDIR_BASE);

		readl(hp->ioc_regs+HP_ZX1_PDIR_BASE);

		writel(hp->io_tlb_ps, hp->ioc_regs+HP_ZX1_TCNFG);

		writel(hp->io_tlb_ps, hp->ioc_regs+HP_ZX1_TCNFG);

		readl(hp->ioc_regs+HP_ZX1_TCNFG);

		readl(hp->ioc_regs+HP_ZX1_TCNFG);

		writel(~(HP_ZX1_IOVA_SIZE-1), hp->ioc_regs+HP_ZX1_IMASK);

		writel((unsigned int)(~(HP_ZX1_IOVA_SIZE-1)), hp->ioc_regs+HP_ZX1_IMASK);

		readl(hp->ioc_regs+HP_ZX1_IMASK);

		readl(hp->ioc_regs+HP_ZX1_IMASK);

		writel(hp->iova_base|1, hp->ioc_regs+HP_ZX1_IBASE);

		writel(hp->iova_base|1, hp->ioc_regs+HP_ZX1_IBASE);

		readl(hp->ioc_regs+HP_ZX1_IBASE);

		readl(hp->ioc_regs+HP_ZX1_IBASE);