diff options
Diffstat (limited to 'arch/sparc/kernel/time_64.c')
-rw-r--r-- | arch/sparc/kernel/time_64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index 9df8f095a8b1..54405d362148 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c | |||
@@ -106,7 +106,7 @@ static void tick_init_tick(void) | |||
106 | tick_disable_irq(); | 106 | tick_disable_irq(); |
107 | } | 107 | } |
108 | 108 | ||
109 | static unsigned long tick_get_tick(void) | 109 | static unsigned long long tick_get_tick(void) |
110 | { | 110 | { |
111 | unsigned long ret; | 111 | unsigned long ret; |
112 | 112 | ||
@@ -208,7 +208,7 @@ static void stick_init_tick(void) | |||
208 | stick_disable_irq(); | 208 | stick_disable_irq(); |
209 | } | 209 | } |
210 | 210 | ||
211 | static unsigned long stick_get_tick(void) | 211 | static unsigned long long stick_get_tick(void) |
212 | { | 212 | { |
213 | unsigned long ret; | 213 | unsigned long ret; |
214 | 214 | ||
@@ -352,7 +352,7 @@ static void hbtick_init_tick(void) | |||
352 | hbtick_disable_irq(); | 352 | hbtick_disable_irq(); |
353 | } | 353 | } |
354 | 354 | ||
355 | static unsigned long hbtick_get_tick(void) | 355 | static unsigned long long hbtick_get_tick(void) |
356 | { | 356 | { |
357 | return __hbird_read_stick() & ~TICK_PRIV_BIT; | 357 | return __hbird_read_stick() & ~TICK_PRIV_BIT; |
358 | } | 358 | } |
@@ -422,7 +422,7 @@ static int __devinit rtc_probe(struct of_device *op, const struct of_device_id * | |||
422 | { | 422 | { |
423 | struct resource *r; | 423 | struct resource *r; |
424 | 424 | ||
425 | printk(KERN_INFO "%s: RTC regs at 0x%lx\n", | 425 | printk(KERN_INFO "%s: RTC regs at 0x%llx\n", |
426 | op->node->full_name, op->resource[0].start); | 426 | op->node->full_name, op->resource[0].start); |
427 | 427 | ||
428 | /* The CMOS RTC driver only accepts IORESOURCE_IO, so cons | 428 | /* The CMOS RTC driver only accepts IORESOURCE_IO, so cons |
@@ -478,7 +478,7 @@ static struct platform_device rtc_bq4802_device = { | |||
478 | static int __devinit bq4802_probe(struct of_device *op, const struct of_device_id *match) | 478 | static int __devinit bq4802_probe(struct of_device *op, const struct of_device_id *match) |
479 | { | 479 | { |
480 | 480 | ||
481 | printk(KERN_INFO "%s: BQ4802 regs at 0x%lx\n", | 481 | printk(KERN_INFO "%s: BQ4802 regs at 0x%llx\n", |
482 | op->node->full_name, op->resource[0].start); | 482 | op->node->full_name, op->resource[0].start); |
483 | 483 | ||
484 | rtc_bq4802_device.resource = &op->resource[0]; | 484 | rtc_bq4802_device.resource = &op->resource[0]; |
@@ -542,7 +542,7 @@ static int __devinit mostek_probe(struct of_device *op, const struct of_device_i | |||
542 | strcmp(dp->parent->parent->name, "central") != 0) | 542 | strcmp(dp->parent->parent->name, "central") != 0) |
543 | return -ENODEV; | 543 | return -ENODEV; |
544 | 544 | ||
545 | printk(KERN_INFO "%s: Mostek regs at 0x%lx\n", | 545 | printk(KERN_INFO "%s: Mostek regs at 0x%llx\n", |
546 | dp->full_name, op->resource[0].start); | 546 | dp->full_name, op->resource[0].start); |
547 | 547 | ||
548 | m48t59_rtc.resource = &op->resource[0]; | 548 | m48t59_rtc.resource = &op->resource[0]; |