ia64: Sync up with 2.5.18.

arch/ia64/kernel/pci.c

@@ -199,7 +199,7 @@ pcibios_config_init (void)
 	return;
 }
 
-void __init
+static int __init
 pcibios_init (void)
 {
 #	define PCI_BUSES_TO_SCAN 255

arch/ia64/mm/init.c

@@ -206,7 +206,6 @@ show_mem(void)
 	printk("%d pages shared\n", shared);
 	printk("%d pages swap cached\n", cached);
 	printk("%ld pages in page table cache\n", pgtable_cache_size);
-	printk("%ld buffermem pages\n", nr_buffermem_pages());
 #endif /* !CONFIG_DISCONTIGMEM */
 }
 

include/asm-ia64/bitops.h

@@ -326,6 +326,12 @@ ia64_fls (unsigned long x)
 	return exp - 0xffff;
 }
 
+static int
+fls (int x)
+{
+	return ia64_fls((unsigned int) x);
+}
+
 /*
  * ffs: find first bit set. This is defined the same way as the libc and compiler builtin
  * ffs routines, therefore differs in spirit from the above ffz (man ffs): it operates on