diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-12-13 09:41:59 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-12-13 09:41:59 +0200 |
| commit | 9b18d42dda985c99db4adde45bbdf7cd79a7525c (patch) | |
| tree | 78481b44090a9ee19780091ade05a320cbc6a7bb /arch/arc/include/asm/processor.h | |
| parent | 39bdb17ebb5bd7a5c8a231d7cac4a4d5ccc58149 (diff) | |
| parent | 1b894521e60c1b91db1e8ba1278660e5c89f1b5f (diff) | |
Merge tag 'mac80211-next-for-davem-2015-12-07' into next
This pull request got a bit bigger than I wanted, due to
needing to reshuffle and fix some bugs. I merged mac80211
to get the right base for some of these changes.
* new mac80211 API for upcoming driver changes: EOSP handling,
key iteration
* scan abort changes allowing to cancel an ongoing scan
* VHT IBSS 80+80 MHz support
* re-enable full AP client state tracking after fixes
* various small fixes (that weren't relevant for mac80211)
* various cleanups
Diffstat (limited to 'arch/arc/include/asm/processor.h')
| -rw-r--r-- | arch/arc/include/asm/processor.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index 44545354e9e85..1d694c1ef6d6b 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h @@ -57,11 +57,7 @@ struct task_struct; * A lot of busy-wait loops in SMP are based off of non-volatile data otherwise * get optimised away by gcc */ -#ifdef CONFIG_SMP #define cpu_relax() __asm__ __volatile__ ("" : : : "memory") -#else -#define cpu_relax() do { } while (0) -#endif #define cpu_relax_lowlatency() cpu_relax() |