diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-13 22:14:51 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-13 22:14:51 +0200 |
commit | e75850b4573a092078d5ff1493d3d9ee16b98821 (patch) | |
tree | ece3bd9b45b43ec13c75de84967043a88fedda6e /include/linux/prefetch.h | |
parent | 5a652fe5e38d906621e9c54a7d14ca4e030ab4f6 (diff) | |
parent | 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 (diff) |
Merge 6.5-rc6 into char-misc-next
We need the char/misc fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 |