diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:00:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:00:40 +1000 |
| commit | 1d42fcfe774211af917889db5bfff7ccb6b226fa (patch) | |
| tree | 51bda16f752c893aba2aedb36dd314768401b59f /arch/m68k | |
| parent | 189da3b9ff1fa12056be78d769970410b11e83c9 (diff) | |
| parent | 30e8e851f9c57d4710754438c296fe3e92a525a1 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/Kconfig
drivers/acpi/acpi_extlog.c
drivers/net/wireless/ath/ath9k/hw.c
fs/nfs/pagelist.c
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/processor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index b0768a657920..20dda1d4b860 100644 --- a/arch/m68k/include/asm/processor.h +++ b/arch/m68k/include/asm/processor.h @@ -176,5 +176,6 @@ unsigned long get_wchan(struct task_struct *p); #define task_pt_regs(tsk) ((struct pt_regs *) ((tsk)->thread.esp0)) #define cpu_relax() barrier() +#define cpu_relax_lowlatency() cpu_relax() #endif |