diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-04-04 17:44:36 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 16:25:17 -0600 |
| commit | 8e543a975721858d9ed7a88813e24eb7eb2495fb (patch) | |
| tree | 5c909b7d21e8a6cab9354d2f2d6ca73f6401628b /arch | |
| parent | 707b6fc5a331721b01c7faedb3566f5d5f32383f (diff) | |
Bug fix to eliminate compile-time warnings from Freescale code.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-warns_fix.patch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx3/usb.c | 2 | ||||
| -rw-r--r-- | arch/arm/oprofile/op_model_arm11.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/usb.c b/arch/arm/mach-mx3/usb.c index 0d272cd6031e..479de534853e 100644 --- a/arch/arm/mach-mx3/usb.c +++ b/arch/arm/mach-mx3/usb.c @@ -755,7 +755,7 @@ static struct platform_device *host_pdev_register(struct resource *res, pdev = platform_device_register_simple("fsl-ehci", instance_id, res, n_res); if (IS_ERR(pdev)) { - pr_debug("can't register %s Host, %d\n", + pr_debug("can't register %s Host, %ld\n", config->name, PTR_ERR(pdev)); return NULL; } diff --git a/arch/arm/oprofile/op_model_arm11.c b/arch/arm/oprofile/op_model_arm11.c index 9f36c6cc6650..547ae71bb070 100644 --- a/arch/arm/oprofile/op_model_arm11.c +++ b/arch/arm/oprofile/op_model_arm11.c @@ -28,6 +28,7 @@ #include <linux/sched.h> #include <linux/oprofile.h> #include <linux/interrupt.h> +#include <linux/irq.h> #include <asm/hardware.h> #include <asm/irq.h> #include <asm/system.h> @@ -259,7 +260,7 @@ static int arm11_setup_ctrs(void) counter_config[i].event = 0; pmu->int_enable &= ~pmu->int_mask[i]; pr_debug - ("arm11_setup_ctrs: The counter event is %d for counter%d\n", + ("arm11_setup_ctrs: The counter event is %ld for counter%d\n", counter_config[i].event, i); continue; } @@ -288,7 +289,7 @@ static int arm11_setup_ctrs(void) /*! * function is the interrupt service handler for the ARM11 performance counters */ -static irqreturn_t arm11_pmu_interrupt(int irq, void *arg, struct pt_regs *regs) +static irqreturn_t arm11_pmu_interrupt(int irq, void *arg) { int i; u32 pmnc, emcs; @@ -340,7 +341,7 @@ static irqreturn_t arm11_pmu_interrupt(int irq, void *arg, struct pt_regs *regs) write_l2counter(i - EMC0, -(u32) counter_config[i].count); - oprofile_add_sample(regs, i); + oprofile_add_sample(get_irq_regs(), i); } /* Clear overflow flags */ |