diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 18:52:16 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 18:52:16 (GMT) |
| commit | 626f380d0b264a1e40237f5a2a3dffc5d14f256e (patch) | |
| tree | 456889d94d219628c225ccef3ad4f2af0475cbf4 /arch/sh/include/asm/system.h | |
| parent | 32708e8e95265505d9627b3bc9ed16566e0dca1c (diff) | |
| parent | bb38c222e07cbe252cfbd99cd6a9c834b0a2639a (diff) | |
| download | linux-fsl-qoriq-626f380d0b264a1e40237f5a2a3dffc5d14f256e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix up HAVE_PERF_COUNTERS typo.
sh: Fix up more dma-mapping fallout.
sh: SH7786 SMP support.
sh: Wire up the uncached fixmap on sh64 as well.
sh: Use local TLB flush in set_pte_phys().
sh: Provide cpu_idle_wait() to fix up cpuidle/SMP build.
Diffstat (limited to 'arch/sh/include/asm/system.h')
| -rw-r--r-- | arch/sh/include/asm/system.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h index a88895e..ab79e1f 100644 --- a/arch/sh/include/asm/system.h +++ b/arch/sh/include/asm/system.h @@ -154,6 +154,7 @@ extern struct dentry *sh_debugfs_root; void per_cpu_trap_init(void); void default_idle(void); +void cpu_idle_wait(void); asmlinkage void break_point_trap(void); |