diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 15:59:53 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 15:59:53 (GMT) |
commit | 02cf1da2548d318ad4db9eb4cf8656e24b11aefc (patch) | |
tree | b966cb8239e1a934c2a91da67162b7a7a7b5ac8d /arch/tile/kernel/time.c | |
parent | a4fdb2a46f617b8b2cd47acec026ec16532edbc6 (diff) | |
parent | 8d03bc56cc27ddd93f70a630686ef06289787c78 (diff) | |
download | linux-02cf1da2548d318ad4db9eb4cf8656e24b11aefc.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile updates from Chris Metcalf:
"This includes secure computing support as well as miscellaneous minor
improvements"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: correct some typos in opcode type names
tile/vdso: emit a GNU hash as well
tile: Remove finish_arch_switch
tile: enable full SECCOMP support
tile/time: Migrate to new 'set-state' interface
Diffstat (limited to 'arch/tile/kernel/time.c')
-rw-r--r-- | arch/tile/kernel/time.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index 00178ec..178989e 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c @@ -140,10 +140,10 @@ static int tile_timer_set_next_event(unsigned long ticks, * Whenever anyone tries to change modes, we just mask interrupts * and wait for the next event to get set. */ -static void tile_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) +static int tile_timer_shutdown(struct clock_event_device *evt) { arch_local_irq_mask_now(INT_TILE_TIMER); + return 0; } /* @@ -157,7 +157,9 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = { .rating = 100, .irq = -1, .set_next_event = tile_timer_set_next_event, - .set_mode = tile_timer_set_mode, + .set_state_shutdown = tile_timer_shutdown, + .set_state_oneshot = tile_timer_shutdown, + .tick_resume = tile_timer_shutdown, }; void setup_tile_timer(void) |