mmiotrace: fix printk format

[linux-2.6] / arch / x86 / mm / mmio-mod.c

diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 8256546d49bf6826d33a61bda8fd88bc135e1074..6d6cac84c0453a75f6ea7852fc0cfcdb2d1dd948 100644 (file)
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -81,17 +81,14 @@ static LIST_HEAD(trace_list);               /* struct remap_trace */
 /* module parameters */
 static unsigned long   filter_offset;
 static int             nommiotrace;
-static int             ISA_trace;
 static int             trace_pc;
 
 module_param(filter_offset, ulong, 0);
 module_param(nommiotrace, bool, 0);
-module_param(ISA_trace, bool, 0);
 module_param(trace_pc, bool, 0);
 
 MODULE_PARM_DESC(filter_offset, "Start address of traced mappings.");
 MODULE_PARM_DESC(nommiotrace, "Disable actual MMIO tracing.");
-MODULE_PARM_DESC(ISA_trace, "Do not exclude the low ISA range.");
 MODULE_PARM_DESC(trace_pc, "Record address of faulting instructions.");
 
 static bool is_enabled(void)
@@ -153,8 +150,9 @@ static void print_pte(unsigned long address)
                                                        "0x%08lx\n", address);
                BUG();
        }
-       pr_info(NAME "pte for 0x%lx: 0x%lx 0x%lx\n", address, pte_val(*pte),
-                                               pte_val(*pte) & _PAGE_PRESENT);
+       pr_info(NAME "pte for 0x%lx: 0x%llx 0x%llx\n", address,
+               (unsigned long long)pte_val(*pte),
+               (unsigned long long)pte_val(*pte) & _PAGE_PRESENT);
 }
 
 /*
@@ -424,8 +422,6 @@ void enable_mmiotrace(void)
 
        if (nommiotrace)
                pr_info(NAME "MMIO tracing disabled.\n");
-       if (ISA_trace)
-               pr_warning(NAME "Warning! low ISA range will be traced.\n");
        spin_lock_irq(&trace_lock);
        atomic_inc(&mmiotrace_enabled);
        spin_unlock_irq(&trace_lock);