patch-2.1.125 linux/arch/m68k/atari/stram.c

Next file: linux/arch/m68k/config.in
Previous file: linux/arch/m68k/atari/ataints.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.124/linux/arch/m68k/atari/stram.c linux/arch/m68k/atari/stram.c
@@ -273,7 +273,7 @@
 
 	/* determine whether kernel code resides in ST-RAM (then ST-RAM is the
 	 * first memory block at virtual 0x0) */
-	stram_start = phys_to_virt( 0 );
+	stram_start = (unsigned long)phys_to_virt(0);
 	kernel_in_stram = (stram_start == 0);
 
 	for( i = 0; i < m68k_num_memory; ++i ) {
@@ -1465,9 +1465,10 @@
 	for( p = alloc_list; p; p = p->next ) {
 		if (len + 50 >= PAGE_SIZE)
 			break;
-		PRINT_PROC( "0x%08lx-0x%08lx: %s (",
-					virt_to_phys(p->start),
-					virt_to_phys(p->start+p->size-1), p->owner );
+		PRINT_PROC("0x%08lx-0x%08lx: %s (",
+			   virt_to_phys((void *)p->start),
+			   virt_to_phys((void *)p->start+p->size-1),
+			   p->owner);
 		if (p->flags & BLOCK_STATIC)
 			PRINT_PROC( "static)\n" );
 		else if (p->flags & BLOCK_GFP)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov