diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-09-15 11:23:38 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-09-15 11:23:38 +0300 |
| commit | a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7 (patch) | |
| tree | 5a2ad89248d8fe7a2da8904dd29042abb9f71739 /include/linux/prefetch.h | |
| parent | 3106c34df6ace8a123027b9afdc73bb05d530052 (diff) | |
| parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
Merge drm/drm-next into drm-intel-next
Sync to v6.6-rc1.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/prefetch.h')
| -rw-r--r-- | include/linux/prefetch.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/prefetch.h b/include/linux/prefetch.h index b83a3f944f28..b068e2e60939 100644 --- a/include/linux/prefetch.h +++ b/include/linux/prefetch.h @@ -25,11 +25,10 @@ struct page; prefetch() should be defined by the architecture, if not, the #define below provides a no-op define. - There are 3 prefetch() macros: + There are 2 prefetch() macros: prefetch(x) - prefetches the cacheline at "x" for read prefetchw(x) - prefetches the cacheline at "x" for write - spin_lock_prefetch(x) - prefetches the spinlock *x for taking there is also PREFETCH_STRIDE which is the architecure-preferred "lookahead" size for prefetching streamed operations. @@ -44,10 +43,6 @@ struct page; #define prefetchw(x) __builtin_prefetch(x,1) #endif -#ifndef ARCH_HAS_SPINLOCK_PREFETCH -#define spin_lock_prefetch(x) prefetchw(x) -#endif - #ifndef PREFETCH_STRIDE #define PREFETCH_STRIDE (4*L1_CACHE_BYTES) #endif |