Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Nov 2017 17:36:43 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Nov 2017 17:36:43 +0000 (10:36 -0700)
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

arch/tile/Makefile
arch/tile/kernel/time.c

index 4dc380a519d48ad2180279c38d64892cf662139b..8fa0befba32b42d8ab438af8f942bb0bb3f4e9d5 100644 (file)
@@ -51,6 +51,8 @@ else
 BITS := 32
 endif
 
+CHECKFLAGS     += -m$(BITS)
+
 head-y         := arch/tile/kernel/head_$(BITS).o
 
 libs-y         += arch/tile/lib/
index 6643ffbc06155cfa0336c4648e82e584dabf4a22..f95d65f3162bc3a567df4ec346ca69fe605babbc 100644 (file)
@@ -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,
 };