diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-03 18:36:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-03 18:36:43 +0100 |
| commit | 81ca2caefc6db1df942bdf845a2a74a60842d543 (patch) | |
| tree | 00d988029a6d753e86490a69bdb6e3a695900793 /arch | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| parent | arch/tile: Implement ->set_state_oneshot_stopped() (diff) | |
| download | linux-81ca2caefc6db1df942bdf845a2a74a60842d543.tar.xz linux-81ca2caefc6db1df942bdf845a2a74a60842d543.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile fixes from Chris Metcalf:
"Two one-line bug fixes"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: Implement ->set_state_oneshot_stopped()
tile: pass machine size to sparse
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/Makefile | 2 | ||||
| -rw-r--r-- | arch/tile/kernel/time.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/tile/Makefile b/arch/tile/Makefile index 4dc380a519d4..8fa0befba32b 100644 --- a/arch/tile/Makefile +++ b/arch/tile/Makefile @@ -51,6 +51,8 @@ else BITS := 32 endif +CHECKFLAGS += -m$(BITS) + head-y := arch/tile/kernel/head_$(BITS).o libs-y += arch/tile/lib/ diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index 6643ffbc0615..f95d65f3162b 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c @@ -162,6 +162,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = { .set_next_event = tile_timer_set_next_event, .set_state_shutdown = tile_timer_shutdown, .set_state_oneshot = tile_timer_shutdown, + .set_state_oneshot_stopped = tile_timer_shutdown, .tick_resume = tile_timer_shutdown, }; |