4 files changed, 29 insertions, 15 deletions

diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h
index 5a64ca4621f3..f23174fb9ec4 100644
--- a/include/asm-generic/fixmap.h
+++ b/include/asm-generic/fixmap.h
@@ -93,5 +93,8 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
 #define set_fixmap_io(idx, phys) \
         __set_fixmap(idx, phys, FIXMAP_PAGE_IO)
 
+#define set_fixmap_offset_io(idx, phys) \
+        __set_fixmap_offset(idx, phys, FIXMAP_PAGE_IO)
+
 #endif /* __ASSEMBLY__ */
 #endif /* __ASM_GENERIC_FIXMAP_H */
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 1ec08c198b66..a8015a7a55bb 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -693,24 +693,35 @@ static inline int pmd_numa(pmd_t pmd)
 #ifndef pte_mknonnuma
 static inline pte_t pte_mknonnuma(pte_t pte)
 {
-        pte = pte_clear_flags(pte, _PAGE_NUMA);
-        return pte_set_flags(pte, _PAGE_PRESENT|_PAGE_ACCESSED);
+        pteval_t val = pte_val(pte);
+
+        val &= ~_PAGE_NUMA;
+        val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
+        return __pte(val);
 }
 #endif
 
 #ifndef pmd_mknonnuma
 static inline pmd_t pmd_mknonnuma(pmd_t pmd)
 {
-        pmd = pmd_clear_flags(pmd, _PAGE_NUMA);
-        return pmd_set_flags(pmd, _PAGE_PRESENT|_PAGE_ACCESSED);
+        pmdval_t val = pmd_val(pmd);
+
+        val &= ~_PAGE_NUMA;
+        val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
+
+        return __pmd(val);
 }
 #endif
 
 #ifndef pte_mknuma
 static inline pte_t pte_mknuma(pte_t pte)
 {
-        pte = pte_set_flags(pte, _PAGE_NUMA);
-        return pte_clear_flags(pte, _PAGE_PRESENT);
+        pteval_t val = pte_val(pte);
+
+        val &= ~_PAGE_PRESENT;
+        val |= _PAGE_NUMA;
+
+        return __pte(val);
 }
 #endif
 
@@ -729,8 +740,12 @@ static inline void ptep_set_numa(struct mm_struct *mm, unsigned long addr,
 #ifndef pmd_mknuma
 static inline pmd_t pmd_mknuma(pmd_t pmd)
 {
-        pmd = pmd_set_flags(pmd, _PAGE_NUMA);
-        return pmd_clear_flags(pmd, _PAGE_PRESENT);
+        pmdval_t val = pmd_val(pmd);
+
+        val &= ~_PAGE_PRESENT;
+        val |= _PAGE_NUMA;
+
+        return __pmd(val);
 }
 #endif
 
diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h
index b4ea8f50fc65..5e752b959054 100644
--- a/include/asm-generic/resource.h
+++ b/include/asm-generic/resource.h
@@ -12,7 +12,7 @@
         [RLIMIT_CPU]            = {  RLIM_INFINITY,  RLIM_INFINITY },   \
         [RLIMIT_FSIZE]          = {  RLIM_INFINITY,  RLIM_INFINITY },   \
         [RLIMIT_DATA]           = {  RLIM_INFINITY,  RLIM_INFINITY },   \
-        [RLIMIT_STACK]          = {       _STK_LIM,   _STK_LIM_MAX },   \
+        [RLIMIT_STACK]          = {       _STK_LIM,  RLIM_INFINITY },   \
         [RLIMIT_CORE]           = {              0,  RLIM_INFINITY },   \
         [RLIMIT_RSS]            = {  RLIM_INFINITY,  RLIM_INFINITY },   \
         [RLIMIT_NPROC]          = {              0,              0 },   \
diff --git a/include/asm-generic/word-at-a-time.h b/include/asm-generic/word-at-a-time.h
index d3909effd725..94f9ea8abcae 100644
--- a/include/asm-generic/word-at-a-time.h
+++ b/include/asm-generic/word-at-a-time.h
@@ -50,11 +50,7 @@ static inline bool has_zero(unsigned long val, unsigned long *data, const struct
 }
 
 #ifndef zero_bytemask
-#ifdef CONFIG_64BIT
-#define zero_bytemask(mask)     (~0ul << fls64(mask))
-#else
-#define zero_bytemask(mask)     (~0ul << fls(mask))
-#endif /* CONFIG_64BIT */
-#endif /* zero_bytemask */
+#define zero_bytemask(mask) (~1ul << __fls(mask))
+#endif
 
 #endif /* _ASM_WORD_AT_A_TIME_H */