Skip to content

Commit 81ca2ca

Browse files
committed
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
2 parents 01073ac + 777a45b commit 81ca2ca

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

arch/tile/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ else
5151
BITS := 32
5252
endif
5353

54+
CHECKFLAGS += -m$(BITS)
55+
5456
head-y := arch/tile/kernel/head_$(BITS).o
5557

5658
libs-y += arch/tile/lib/

arch/tile/kernel/time.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
162162
.set_next_event = tile_timer_set_next_event,
163163
.set_state_shutdown = tile_timer_shutdown,
164164
.set_state_oneshot = tile_timer_shutdown,
165+
.set_state_oneshot_stopped = tile_timer_shutdown,
165166
.tick_resume = tile_timer_shutdown,
166167
};
167168

0 commit comments

Comments
 (0)