History

Merge branch 'linus' into timers/core Reason: Get upstream fixes before adding conflicting code.

Thomas Gleixner committed 13 years ago

Commit 6402c7d2 parents 77c675b 60d509f1262 files · +13864 −7800Browse files

Showing the changes to kernel/hrtimer.c (1 of 1262 files). Show all

Unified · Split

kernel/hrtimer.c+1−2
@@ -63,6 +63,7 @@ · 62 unmodified lines
63DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =63DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =
64{64{
65 65
66 .lock = __RAW_SPIN_LOCK_UNLOCKED(hrtimer_bases.lock),
66 .clock_base =67 .clock_base =
67 {68 {
68 {69 {
@@ -1662,8 +1663,6 @@ static void __cpuinit init_hrtimers_cpu(int cpu) · 1593 unmodified lines
1662 struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);1663 struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
1663 int i;1664 int i;
1664 1665
1665 raw_spin_lock_init(&cpu_base->lock);
1666
1667 for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {1666 for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
1668 cpu_base->clock_base[i].cpu_base = cpu_base;1667 cpu_base->clock_base[i].cpu_base = cpu_base;
1669 timerqueue_init_head(&cpu_base->clock_base[i].active);1668 timerqueue_init_head(&cpu_base->clock_base[i].active);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t