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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle 17 years ago 12e22e8e 2da0ba2d

+15 -8

7 changed files

expand all

arch

mips

cavium-octeon

flash_setup.c

include

asm

types.h

kernel

setup.c

sgi-ip27

ip27-berr.c

ip27-nmi.c

sgi-ip32

ip32-memory.c

drivers

net

meth.c

+1 -1

arch/mips/cavium-octeon/flash_setup.c

··· 57 57 flash_map.bankwidth = 1; 58 58 flash_map.virt = ioremap(flash_map.phys, flash_map.size); 59 59 pr_notice("Bootbus flash: Setting flash for %luMB flash at " 60 - "0x%08lx\n", flash_map.size >> 20, flash_map.phys); 60 + "0x%08llx\n", flash_map.size >> 20, flash_map.phys); 61 61 simple_map_init(&flash_map); 62 62 mymtd = do_map_probe("cfi_probe", &flash_map); 63 63 if (mymtd) {

+7 -1

arch/mips/include/asm/types.h

··· 4 4 * for more details. 5 5 * 6 6 * Copyright (C) 1994, 1995, 1996, 1999 by Ralf Baechle 7 + * Copyright (C) 2008 Wind River Systems, 8 + * written by Ralf Baechle 7 9 * Copyright (C) 1999 Silicon Graphics, Inc. 8 10 */ 9 11 #ifndef _ASM_TYPES_H 10 12 #define _ASM_TYPES_H 11 13 12 - #if _MIPS_SZLONG == 64 14 + /* 15 + * We don't use int-l64.h for the kernel anymore but still use it for 16 + * userspace to avoid code changes. 17 + */ 18 + #if (_MIPS_SZLONG == 64) && !defined(__KERNEL__) 13 19 # include <asm-generic/int-l64.h> 14 20 #else 15 21 # include <asm-generic/int-ll64.h>

+2 -1

arch/mips/kernel/setup.c

··· 277 277 * not selected. Once that done we can determine the low bound 278 278 * of usable memory. 279 279 */ 280 - reserved_end = max(init_initrd(), PFN_UP(__pa_symbol(&_end))); 280 + reserved_end = max(init_initrd(), 281 + (unsigned long) PFN_UP(__pa_symbol(&_end))); 281 282 282 283 /* 283 284 * max_low_pfn is not a number of pages. The number of pages

+1 -1

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

··· 66 66 printk("Slice %c got %cbe at 0x%lx\n", 'A' + cpu, data ? 'd' : 'i', 67 67 regs->cp0_epc); 68 68 printk("Hub information:\n"); 69 - printk("ERR_INT_PEND = 0x%06lx\n", LOCAL_HUB_L(PI_ERR_INT_PEND)); 69 + printk("ERR_INT_PEND = 0x%06llx\n", LOCAL_HUB_L(PI_ERR_INT_PEND)); 70 70 errst0 = LOCAL_HUB_L(cpu ? PI_ERR_STATUS0_B : PI_ERR_STATUS0_A); 71 71 errst1 = LOCAL_HUB_L(cpu ? PI_ERR_STATUS1_B : PI_ERR_STATUS1_A); 72 72 dump_hub_information(errst0, errst1);

+2 -2

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

··· 143 143 pend0 = REMOTE_HUB_L(nasid, PI_INT_PEND0); 144 144 pend1 = REMOTE_HUB_L(nasid, PI_INT_PEND1); 145 145 146 - printk("PI_INT_MASK0: %16lx PI_INT_MASK1: %16lx\n", mask0, mask1); 147 - printk("PI_INT_PEND0: %16lx PI_INT_PEND1: %16lx\n", pend0, pend1); 146 + printk("PI_INT_MASK0: %16Lx PI_INT_MASK1: %16Lx\n", mask0, mask1); 147 + printk("PI_INT_PEND0: %16Lx PI_INT_PEND1: %16Lx\n", pend0, pend1); 148 148 printk("\n\n"); 149 149 } 150 150

+1 -1

arch/mips/sgi-ip32/ip32-memory.c

··· 36 36 if (base + size > (256 << 20)) 37 37 base += CRIME_HI_MEM_BASE; 38 38 39 - printk("CRIME MC: bank %u base 0x%016lx size %luMiB\n", 39 + printk("CRIME MC: bank %u base 0x%016Lx size %LuMiB\n", 40 40 bank, base, size >> 20); 41 41 add_memory_region(base, size, BOOT_MEM_RAM); 42 42 }

+1 -1

drivers/net/meth.c

··· 398 398 int len = (status & 0xffff) - 4; /* omit CRC */ 399 399 /* length sanity check */ 400 400 if (len < 60 || len > 1518) { 401 - printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2lx.\n", 401 + printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2Lx.\n", 402 402 dev->name, priv->rx_write, 403 403 priv->rx_ring[priv->rx_write]->status.raw); 404 404 dev->stats.rx_errors++;