Commit 12e22e8e authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Stop using <asm-generic/int-l64.h>. 



This fixes a few warnings - and triggers a few new ones which the rest of
this patch fixes.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2da0ba2d

arch/mips/cavium-octeon/flash_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int __init flash_init(void) 
		flash_map.bankwidth = 1;

		flash_map.virt = ioremap(flash_map.phys, flash_map.size);

		pr_notice("Bootbus flash: Setting flash for %luMB flash at "

			  "0x%08lx\n", flash_map.size >> 20, flash_map.phys);

			  "0x%08llx\n", flash_map.size >> 20, flash_map.phys);

		simple_map_init(&flash_map);

		mymtd = do_map_probe("cfi_probe", &flash_map);

		if (mymtd) {

arch/mips/include/asm/types.h

+7 −1
Original line number Diff line number Diff line
@@ -4,12 +4,18 @@ 
 * for more details.

 *

 * Copyright (C) 1994, 1995, 1996, 1999 by Ralf Baechle

 * Copyright (C) 2008 Wind River Systems,

 *   written by Ralf Baechle

 * Copyright (C) 1999 Silicon Graphics, Inc.

 */

#ifndef _ASM_TYPES_H

#define _ASM_TYPES_H



#if _MIPS_SZLONG == 64

/*

 * We don't use int-l64.h for the kernel anymore but still use it for

 * userspace to avoid code changes.

 */

#if (_MIPS_SZLONG == 64) && !defined(__KERNEL__)

# include <asm-generic/int-l64.h>

#else

# include <asm-generic/int-ll64.h>

arch/mips/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -277,7 +277,8 @@ static void __init bootmem_init(void) 
	 * not selected. Once that done we can determine the low bound

	 * of usable memory.

	 */

	reserved_end = max(init_initrd(), PFN_UP(__pa_symbol(&_end)));

	reserved_end = max(init_initrd(),

			   (unsigned long) PFN_UP(__pa_symbol(&_end)));



	/*

	 * max_low_pfn is not a number of pages. The number of pages

arch/mips/sgi-ip27/ip27-berr.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int ip27_be_handler(struct pt_regs *regs, int is_fixup) 
	printk("Slice %c got %cbe at 0x%lx\n", 'A' + cpu, data ? 'd' : 'i',

	       regs->cp0_epc);

	printk("Hub information:\n");

	printk("ERR_INT_PEND = 0x%06lx\n", LOCAL_HUB_L(PI_ERR_INT_PEND));

	printk("ERR_INT_PEND = 0x%06llx\n", LOCAL_HUB_L(PI_ERR_INT_PEND));

	errst0 = LOCAL_HUB_L(cpu ? PI_ERR_STATUS0_B : PI_ERR_STATUS0_A);

	errst1 = LOCAL_HUB_L(cpu ? PI_ERR_STATUS1_B : PI_ERR_STATUS1_A);

	dump_hub_information(errst0, errst1);

arch/mips/sgi-ip27/ip27-nmi.c

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ void nmi_dump_hub_irq(nasid_t nasid, int slice) 
	pend0 = REMOTE_HUB_L(nasid, PI_INT_PEND0);

	pend1 = REMOTE_HUB_L(nasid, PI_INT_PEND1);



	printk("PI_INT_MASK0: %16lx PI_INT_MASK1: %16lx\n", mask0, mask1);

	printk("PI_INT_PEND0: %16lx PI_INT_PEND1: %16lx\n", pend0, pend1);

	printk("PI_INT_MASK0: %16Lx PI_INT_MASK1: %16Lx\n", mask0, mask1);

	printk("PI_INT_PEND0: %16Lx PI_INT_PEND1: %16Lx\n", pend0, pend1);

	printk("\n\n");

}