Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Initialize CLOCK_ID to HRTIMER_BASE table statically
rtc: max8925: Call dev_set_drvdata before rtc_device_register
+2
-1
drivers/rtc/rtc-max8925.c
+2
-1
drivers/rtc/rtc-max8925.c
···
257
257
goto out_irq;
258
258
}
259
259
260
+
dev_set_drvdata(&pdev->dev, info);
261
+
260
262
info->rtc_dev = rtc_device_register("max8925-rtc", &pdev->dev,
261
263
&max8925_rtc_ops, THIS_MODULE);
262
264
ret = PTR_ERR(info->rtc_dev);
···
267
265
goto out_rtc;
268
266
}
269
267
270
-
dev_set_drvdata(&pdev->dev, info);
271
268
platform_set_drvdata(pdev, info);
272
269
273
270
return 0;
+5
-5
kernel/hrtimer.c
+5
-5
kernel/hrtimer.c
···
81
81
}
82
82
};
83
83
84
-
static int hrtimer_clock_to_base_table[MAX_CLOCKS];
84
+
static int hrtimer_clock_to_base_table[MAX_CLOCKS] = {
85
+
[CLOCK_REALTIME] = HRTIMER_BASE_REALTIME,
86
+
[CLOCK_MONOTONIC] = HRTIMER_BASE_MONOTONIC,
87
+
[CLOCK_BOOTTIME] = HRTIMER_BASE_BOOTTIME,
88
+
};
85
89
86
90
static inline int hrtimer_clockid_to_base(clockid_t clock_id)
87
91
{
···
1726
1722
1727
1723
void __init hrtimers_init(void)
1728
1724
{
1729
-
hrtimer_clock_to_base_table[CLOCK_REALTIME] = HRTIMER_BASE_REALTIME;
1730
-
hrtimer_clock_to_base_table[CLOCK_MONOTONIC] = HRTIMER_BASE_MONOTONIC;
1731
-
hrtimer_clock_to_base_table[CLOCK_BOOTTIME] = HRTIMER_BASE_BOOTTIME;
1732
-
1733
1725
hrtimer_cpu_notify(&hrtimers_nb, (unsigned long)CPU_UP_PREPARE,
1734
1726
(void *)(long)smp_processor_id());
1735
1727
register_cpu_notifier(&hrtimers_nb);