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

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
...@@ -51,6 +51,8 @@ else ...@@ -51,6 +51,8 @@ else
BITS := 32 BITS := 32
endif endif
CHECKFLAGS += -m$(BITS)
head-y := arch/tile/kernel/head_$(BITS).o head-y := arch/tile/kernel/head_$(BITS).o
libs-y += arch/tile/lib/ libs-y += arch/tile/lib/
......
...@@ -162,6 +162,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = { ...@@ -162,6 +162,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
.set_next_event = tile_timer_set_next_event, .set_next_event = tile_timer_set_next_event,
.set_state_shutdown = tile_timer_shutdown, .set_state_shutdown = tile_timer_shutdown,
.set_state_oneshot = tile_timer_shutdown, .set_state_oneshot = tile_timer_shutdown,
.set_state_oneshot_stopped = tile_timer_shutdown,
.tick_resume = tile_timer_shutdown, .tick_resume = tile_timer_shutdown,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment