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/time (1 of 1262 files). Show all

Unified · Split

kernel/time/tick-broadcast.c+2−1
@@ -66,7 +66,8 @@ static void tick_broadcast_start_periodic(struct clock_event_device *bc) · 65 unmodified lines
66 */66 */
67int tick_check_broadcast_device(struct clock_event_device *dev)67int tick_check_broadcast_device(struct clock_event_device *dev)
68{68{
69 if ((tick_broadcast_device.evtdev &&69 if ((dev->features & CLOCK_EVT_FEAT_DUMMY) ||
70 (tick_broadcast_device.evtdev &&
70 tick_broadcast_device.evtdev->rating >= dev->rating) ||71 tick_broadcast_device.evtdev->rating >= dev->rating) ||
71 (dev->features & CLOCK_EVT_FEAT_C3STOP))72 (dev->features & CLOCK_EVT_FEAT_C3STOP))
72 return 0;73 return 0;

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