ia64: Sync up with 2.5.18.

diff --git a/arch/ia64/kernel/pci.c b/arch/ia64/kernel/pci.c
index 983d98952364f640a9439a0f6ee3cfb6aebf9355..5d3eac97dadc109b729feb9ed68634ab5ae8921b 100644 (file)
--- a/arch/ia64/kernel/pci.c
+++ b/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

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 59a23c39a23b7b5b67ddfbba77cee6b386f207d8..ffc4e7d5bf5f14784b8d0c909794014f6384d975 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/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 */
 }
 

diff --git a/include/asm-ia64/bitops.h b/include/asm-ia64/bitops.h
index 340b70543401e9755bc1d7f0d72d1cfe4054ab08..63c824e177685ae3d903b000cf9a97ecbc5abfb0 100644 (file)
--- a/include/asm-ia64/bitops.h
+++ b/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