aboutsummaryrefslogtreecommitdiffstats
path: root/arch/tile/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-11 19:50:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-11 19:50:01 -0400
commit7ec6131b55184084d091953fad9e5c785c5b500b (patch)
tree9c777700e2c237946be8fe775903168f11b77f29 /arch/tile/include
parent4251c2a67011801caecd63671f26dd8c9aedb24c (diff)
parent50b9ac1813f7f2f13c937a1484c2fe09c4d590ce (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile changes from Chris Metcalf: "These mostly just address smaller issues reported to me" * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch: tile: kernel: unaligned.c: Cleaning up uninitialized variables drivers/tty/hvc/hvc_tile.c: use PTR_ERR_OR_ZERO replace strict_strto* call with kstrto* tile: Update comments for generic idle conversion tile: cleanup the comment in init_pgprot tile: use BOOTMEM_DEFAULT instead of magic number 0 for reserve_bootmem flags
Diffstat (limited to 'arch/tile/include')
-rw-r--r--arch/tile/include/asm/thread_info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index d767ff9f59b9..48e4fd0f38e4 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -94,7 +94,7 @@ register unsigned long stack_pointer __asm__("sp");
94/* Sit on a nap instruction until interrupted. */ 94/* Sit on a nap instruction until interrupted. */
95extern void smp_nap(void); 95extern void smp_nap(void);
96 96
97/* Enable interrupts racelessly and nap forever: helper for cpu_idle(). */ 97/* Enable interrupts racelessly and nap forever: helper for arch_cpu_idle(). */
98extern void _cpu_idle(void); 98extern void _cpu_idle(void);
99 99
100#else /* __ASSEMBLY__ */ 100#else /* __ASSEMBLY__ */