Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

81ca2cae · Linus Torvalds <[email protected]> · 2017-11-03 10:36:43 -07:00

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

Commit: 81ca2caefc6db1df942bdf845a2a74a60842d543
Parents: 01073ac1 · 777a45b4

Merge commit. Changes below are compared with the first parent: 01073ac1.

Changes

2 files changed · +3 −0

File	Status	Add	Del	Content
arch/tile/Makefile	modified	+2	−0	View file
arch/tile/kernel/time.c	modified	+1	−0	View file

arch/tile/Makefile

View file

diff --git a/arch/tile/Makefile b/arch/tile/Makefile
index 4dc380a..8fa0bef 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/

arch/tile/kernel/time.c

View file

diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 6643ffb..f95d65f 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,
 };
 