Merge home.transmeta.com:/home/torvalds/v2.5/x86-64

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc arch/x86_64/defconfig
Simple merge

diff --cc arch/x86_64/ia32/ia32_ioctl.c
Simple merge

diff --cc arch/x86_64/kernel/mtrr.c
index 9d478fa81f6b3345dafa395a021416ce8e23a171,2ad91b4e6805166644b9456d1e048ad60eb76af9..26325a4a579cae9fe779bf1dd28ba4c5118b3f96
--- 1/arch/x86_64/kernel/mtrr.c
--- 2/arch/x86_64/kernel/mtrr.c
+++ b/arch/x86_64/kernel/mtrr.c
@@@ -642,13 -642,12 +642,13 @@@ int mtrr_add_page (u64 base, u32 size, 
        if ((type == MTRR_TYPE_WRCOMB) && !have_wrcomb()) {
                printk (KERN_WARNING
                        "mtrr: your processor doesn't support write-combining\n");
 -        return -ENOSYS;
 -    }
 +              return -ENOSYS;
 +      }
  
        if (base & (size_or_mask>>PAGE_SHIFT)) {
-               printk (KERN_WARNING "mtrr: base(%lx) exceeds the MTRR width(%lx)\n",
+               printk (KERN_WARNING "mtrr: base(%Lx) exceeds the MTRR width(%Lx)\n",
 -                              base, (size_or_mask>>PAGE_SHIFT));
 +                              (unsigned long) base,
 +                              (unsigned long) (size_or_mask>>PAGE_SHIFT));
                return -EINVAL;
        }