Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81ca2cae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 01073ac1 777a45b4

arch/tile/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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,

};