Merge tag 'asm-generic-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

Pull asm-generic updates from Arnd Bergmann:
 "Here are three small cleanup patches for the include/asm-generic
  directory.

  Christoph removes the __ioremap as part of a cleanup, Nico improves
  the constant do_div() optimization, and Denis changes BUG_ON() to be
  consistent with other implementations"

* tag 'asm-generic-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: add unlikely to default BUG_ON(x)
  __div64_const32(): improve the generic C version
  asm-generic: don't provide __ioremap

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index aa6c093d9ce910890452caeeabcde619171c706f..7357a3c942a06cf18e199ddd9cd8710c27581888 100644 (file)
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -185,7 +185,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
 #endif
 
 #ifndef HAVE_ARCH_BUG_ON
-#define BUG_ON(condition) do { if (condition) BUG(); } while (0)
+#define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0)
 #endif
 
 #ifndef HAVE_ARCH_WARN_ON

diff --git a/include/asm-generic/div64.h b/include/asm-generic/div64.h
index b2a9c74efa55aee063d0cad3c6be9a5ebe644eb6..a3b98c86f077482df66c3d1729601239e1aba11e 100644 (file)
--- a/include/asm-generic/div64.h
+++ b/include/asm-generic/div64.h
@@ -178,7 +178,8 @@ static inline uint64_t __arch_xprod_64(const uint64_t m, uint64_t n, bool bias)
        uint32_t m_hi = m >> 32;
        uint32_t n_lo = n;
        uint32_t n_hi = n >> 32;
-       uint64_t res, tmp;
+       uint64_t res;
+       uint32_t res_lo, res_hi, tmp;
 
        if (!bias) {
                res = ((uint64_t)m_lo * n_lo) >> 32;
@@ -187,8 +188,9 @@ static inline uint64_t __arch_xprod_64(const uint64_t m, uint64_t n, bool bias)
                res = (m + (uint64_t)m_lo * n_lo) >> 32;
        } else {
                res = m + (uint64_t)m_lo * n_lo;
-               tmp = (res < m) ? (1ULL << 32) : 0;
-               res = (res >> 32) + tmp;
+               res_lo = res >> 32;
+               res_hi = (res_lo < m_hi);
+               res = res_lo | ((uint64_t)res_hi << 32);
        }
 
        if (!(m & ((1ULL << 63) | (1ULL << 31)))) {
@@ -197,10 +199,12 @@ static inline uint64_t __arch_xprod_64(const uint64_t m, uint64_t n, bool bias)
                res += (uint64_t)m_hi * n_lo;
                res >>= 32;
        } else {
-               tmp = res += (uint64_t)m_lo * n_hi;
+               res += (uint64_t)m_lo * n_hi;
+               tmp = res >> 32;
                res += (uint64_t)m_hi * n_lo;
-               tmp = (res < tmp) ? (1ULL << 32) : 0;
-               res = (res >> 32) + tmp;
+               res_lo = res >> 32;
+               res_hi = (res_lo < tmp);
+               res = res_lo | ((uint64_t)res_hi << 32);
        }
 
        res += (uint64_t)m_hi * n_hi;

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index b83e2802c969a0e82d1df6e303aa3acf53f799df..d02806513670c8cca693cff296ee522264700020 100644 (file)
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -963,15 +963,6 @@ static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
 }
 #endif
 
-#ifndef __ioremap
-#define __ioremap __ioremap
-static inline void __iomem *__ioremap(phys_addr_t offset, size_t size,
-                                     unsigned long flags)
-{
-       return ioremap(offset, size);
-}
-#endif
-
 #ifndef iounmap
 #define iounmap iounmap