mac80211: correct legacy rates check in ieee80211_calc_rx_airtime

[platform/kernel/linux-rpi.git] / lib / logic_iomem.c

diff --git a/lib/logic_iomem.c b/lib/logic_iomem.c
index 9bdfde0..e7ea9b2 100644 (file)
--- a/lib/logic_iomem.c
+++ b/lib/logic_iomem.c
@@ -21,15 +21,15 @@ struct logic_iomem_area {
 
 #define AREA_SHIFT     24
 #define MAX_AREA_SIZE  (1 << AREA_SHIFT)
-#define MAX_AREAS      ((1ULL<<32) / MAX_AREA_SIZE)
+#define MAX_AREAS      ((1U << 31) / MAX_AREA_SIZE)
 #define AREA_BITS      ((MAX_AREAS - 1) << AREA_SHIFT)
 #define AREA_MASK      (MAX_AREA_SIZE - 1)
 #ifdef CONFIG_64BIT
 #define IOREMAP_BIAS   0xDEAD000000000000UL
 #define IOREMAP_MASK   0xFFFFFFFF00000000UL
 #else
-#define IOREMAP_BIAS   0
-#define IOREMAP_MASK   0
+#define IOREMAP_BIAS   0x80000000UL
+#define IOREMAP_MASK   0x80000000UL
 #endif
 
 static DEFINE_MUTEX(regions_mtx);
@@ -68,7 +68,7 @@ int logic_iomem_add_region(struct resource *resource,
 }
 EXPORT_SYMBOL(logic_iomem_add_region);
 
-#ifndef CONFIG_LOGIC_IOMEM_FALLBACK
+#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK
 static void __iomem *real_ioremap(phys_addr_t offset, size_t size)
 {
        WARN(1, "invalid ioremap(0x%llx, 0x%zx)\n",
@@ -79,9 +79,9 @@ static void __iomem *real_ioremap(phys_addr_t offset, size_t size)
 static void real_iounmap(void __iomem *addr)
 {
        WARN(1, "invalid iounmap for addr 0x%llx\n",
-            (unsigned long long __force)addr);
+            (unsigned long long)(uintptr_t __force)addr);
 }
-#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */
+#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */
 
 void __iomem *ioremap(phys_addr_t offset, size_t size)
 {
@@ -168,12 +168,12 @@ void iounmap(void __iomem *addr)
 }
 EXPORT_SYMBOL(iounmap);
 
-#ifndef CONFIG_LOGIC_IOMEM_FALLBACK
+#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK
 #define MAKE_FALLBACK(op, sz)                                          \
 static u##sz real_raw_read ## op(const volatile void __iomem *addr)    \
 {                                                                      \
        WARN(1, "Invalid read" #op " at address %llx\n",                \
-            (unsigned long long __force)addr);                         \
+            (unsigned long long)(uintptr_t __force)addr);              \
        return (u ## sz)~0ULL;                                          \
 }                                                                      \
                                                                        \
@@ -181,7 +181,8 @@ static void real_raw_write ## op(u ## sz val,                               \
                                 volatile void __iomem *addr)           \
 {                                                                      \
        WARN(1, "Invalid writeq" #op " of 0x%llx at address %llx\n",    \
-            (unsigned long long)val, (unsigned long long __force)addr);\
+            (unsigned long long)val,                                   \
+            (unsigned long long)(uintptr_t __force)addr);\
 }                                                                      \
 
 MAKE_FALLBACK(b, 8);
@@ -194,14 +195,14 @@ MAKE_FALLBACK(q, 64);
 static void real_memset_io(volatile void __iomem *addr, int value, size_t size)
 {
        WARN(1, "Invalid memset_io at address 0x%llx\n",
-            (unsigned long long __force)addr);
+            (unsigned long long)(uintptr_t __force)addr);
 }
 
 static void real_memcpy_fromio(void *buffer, const volatile void __iomem *addr,
                               size_t size)
 {
        WARN(1, "Invalid memcpy_fromio at address 0x%llx\n",
-            (unsigned long long __force)addr);
+            (unsigned long long)(uintptr_t __force)addr);
 
        memset(buffer, 0xff, size);
 }
@@ -210,9 +211,9 @@ static void real_memcpy_toio(volatile void __iomem *addr, const void *buffer,
                             size_t size)
 {
        WARN(1, "Invalid memcpy_toio at address 0x%llx\n",
-            (unsigned long long __force)addr);
+            (unsigned long long)(uintptr_t __force)addr);
 }
-#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */
+#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */
 
 #define MAKE_OP(op, sz)                                                \
 u##sz __raw_read ## op(const volatile void __iomem *addr)              \