Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Ralf Baechle 2009-03-30 14:49:41 +02:00
parent 2da0ba2d27
commit 12e22e8e60
7 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/mips/cavium-octeon/flash_setup.c
View file

@ -57,7 +57,7 @@ static int __init flash_init(void)
flash_map.bankwidth = 1; flash_map.bankwidth = 1;
flash_map.virt = ioremap(flash_map.phys, flash_map.size); flash_map.virt = ioremap(flash_map.phys, flash_map.size);
pr_notice("Bootbus flash: Setting flash for %luMB flash at " 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); simple_map_init(&flash_map);
mymtd = do_map_probe("cfi_probe", &flash_map); mymtd = do_map_probe("cfi_probe", &flash_map);
if (mymtd) { if (mymtd) {

8
arch/mips/include/asm/types.h
View file

@ -4,12 +4,18 @@
* for more details. * for more details.
* *
* Copyright (C) 1994, 1995, 1996, 1999 by Ralf Baechle * 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. * Copyright (C) 1999 Silicon Graphics, Inc.
*/ */
#ifndef _ASM_TYPES_H #ifndef _ASM_TYPES_H
#define _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> # include <asm-generic/int-l64.h>
#else #else
# include <asm-generic/int-ll64.h> # include <asm-generic/int-ll64.h>

3
arch/mips/kernel/setup.c
View file

@ -277,7 +277,8 @@ static void __init bootmem_init(void)
* not selected. Once that done we can determine the low bound * not selected. Once that done we can determine the low bound
* of usable memory. * 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 * max_low_pfn is not a number of pages. The number of pages

2
arch/mips/sgi-ip27/ip27-berr.c
View file

@ -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', printk("Slice %c got %cbe at 0x%lx\n", 'A' + cpu, data ? 'd' : 'i',
regs->cp0_epc); regs->cp0_epc);
printk("Hub information:\n"); 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); 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); errst1 = LOCAL_HUB_L(cpu ? PI_ERR_STATUS1_B : PI_ERR_STATUS1_A);
dump_hub_information(errst0, errst1); dump_hub_information(errst0, errst1);

4
arch/mips/sgi-ip27/ip27-nmi.c
View file

@ -143,8 +143,8 @@ void nmi_dump_hub_irq(nasid_t nasid, int slice)
pend0 = REMOTE_HUB_L(nasid, PI_INT_PEND0); pend0 = REMOTE_HUB_L(nasid, PI_INT_PEND0);
pend1 = REMOTE_HUB_L(nasid, PI_INT_PEND1); pend1 = REMOTE_HUB_L(nasid, PI_INT_PEND1);
printk("PI_INT_MASK0: %16lx PI_INT_MASK1: %16lx\n", mask0, mask1); 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_PEND0: %16Lx PI_INT_PEND1: %16Lx\n", pend0, pend1);
printk("\n\n"); printk("\n\n");
} }

2
arch/mips/sgi-ip32/ip32-memory.c
View file

@ -36,7 +36,7 @@ void __init prom_meminit(void)
if (base + size > (256 << 20)) if (base + size > (256 << 20))
base += CRIME_HI_MEM_BASE; base += CRIME_HI_MEM_BASE;
printk("CRIME MC: bank %u base 0x%016lx size %luMiB\n", printk("CRIME MC: bank %u base 0x%016Lx size %LuMiB\n",
bank, base, size >> 20); bank, base, size >> 20);
add_memory_region(base, size, BOOT_MEM_RAM); add_memory_region(base, size, BOOT_MEM_RAM);
} }

2
drivers/net/meth.c
View file

@ -398,7 +398,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
int len = (status & 0xffff) - 4; /* omit CRC */ int len = (status & 0xffff) - 4; /* omit CRC */
/* length sanity check */ /* length sanity check */
if (len < 60 || len > 1518) { if (len < 60 || len > 1518) {
printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2lx.\n", printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2Lx.\n",
dev->name, priv->rx_write, dev->name, priv->rx_write,
priv->rx_ring[priv->rx_write]->status.raw); priv->rx_ring[priv->rx_write]->status.raw);
dev->stats.rx_errors++; dev->stats.rx_errors++;