diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /arch/mips64/sgi-ip27 | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'arch/mips64/sgi-ip27')
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-console.c | 18 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-memory.c | 8 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-rtc.c | 4 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-timer.c | 2 |
4 files changed, 13 insertions, 19 deletions
diff --git a/arch/mips64/sgi-ip27/ip27-console.c b/arch/mips64/sgi-ip27/ip27-console.c index e45a078b5..fa3ffb1cb 100644 --- a/arch/mips64/sgi-ip27/ip27-console.c +++ b/arch/mips64/sgi-ip27/ip27-console.c @@ -28,7 +28,7 @@ void prom_putchar(char c) char __init prom_getchar(void) { - return(0); + return 0; } static void @@ -44,17 +44,11 @@ ip27prom_console_dev(struct console *c) } static struct console ip27_prom_console = { - "prom", - ip27prom_console_write, - NULL, - ip27prom_console_dev, - NULL, - NULL, - NULL, - CON_PRINTBUFFER, - -1, - 0, - NULL + name: "prom", + write: ip27prom_console_write, + device: ip27prom_console_dev, + flags: CON_PRINTBUFFER, + index: -1, }; __init void ip27_setup_console(void) diff --git a/arch/mips64/sgi-ip27/ip27-memory.c b/arch/mips64/sgi-ip27/ip27-memory.c index f858d098f..0e469ce4b 100644 --- a/arch/mips64/sgi-ip27/ip27-memory.c +++ b/arch/mips64/sgi-ip27/ip27-memory.c @@ -200,11 +200,11 @@ void __init prom_meminit(void) << PAGE_SHIFT)); NODE_DATA(node)->bdata = plat_node_bdata + node; slot_freepfn += node_datasz; - bootmap_size = init_bootmem_node(node, slot_freepfn, + bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, slot_firstpfn, slot_lastpfn); - free_bootmem_node(node, slot_firstpfn << PAGE_SHIFT, + free_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, (slot_lastpfn - slot_firstpfn) << PAGE_SHIFT); - reserve_bootmem_node(node, slot_firstpfn << PAGE_SHIFT, + reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, ((slot_freepfn - slot_firstpfn) << PAGE_SHIFT) + bootmap_size); } printk("Total memory probed : 0x%lx pages\n", numpages); @@ -278,7 +278,7 @@ void __init mem_init(void) /* * This will free up the bootmem, ie, slot 0 memory. */ - totalram_pages += free_all_bootmem_node(nid); + totalram_pages += free_all_bootmem_node(NODE_DATA(nid)); /* * We need to manually do the other slots. diff --git a/arch/mips64/sgi-ip27/ip27-rtc.c b/arch/mips64/sgi-ip27/ip27-rtc.c index bb5209d64..b29af3d73 100644 --- a/arch/mips64/sgi-ip27/ip27-rtc.c +++ b/arch/mips64/sgi-ip27/ip27-rtc.c @@ -60,8 +60,8 @@ static void get_rtc_time(struct rtc_time *rtc_tm); #define RTC_IS_OPEN 0x01 /* means /dev/rtc is in use */ #define RTC_TIMER_ON 0x02 /* missed irq timer active */ -static unsigned char rtc_status = 0; /* bitmapped status byte. */ -static unsigned long rtc_freq = 0; /* Current periodic IRQ rate */ +static unsigned char rtc_status; /* bitmapped status byte. */ +static unsigned long rtc_freq; /* Current periodic IRQ rate */ static struct m48t35_rtc *rtc; /* diff --git a/arch/mips64/sgi-ip27/ip27-timer.c b/arch/mips64/sgi-ip27/ip27-timer.c index 8cbb943c8..edbeb9e11 100644 --- a/arch/mips64/sgi-ip27/ip27-timer.c +++ b/arch/mips64/sgi-ip27/ip27-timer.c @@ -37,7 +37,7 @@ #define CYCLES_PER_JIFFY (CYCLES_PER_SEC/HZ) static unsigned long ct_cur[NR_CPUS]; /* What counter should be at next timer irq */ -static long last_rtc_update = 0; /* Last time the rtc clock got updated */ +static long last_rtc_update; /* Last time the rtc clock got updated */ extern rwlock_t xtime_lock; extern volatile unsigned long wall_jiffies; |