Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

3 files changed, 10 insertions, 9 deletions

diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index a6ffc775a9f8..f6448c7c62b5 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -323,7 +323,8 @@ void flush_dcache_page(struct page *page)
                  * specifically accesses it, of course) */
 
                 flush_tlb_page(mpnt, addr);
-                if (old_addr == 0 || (old_addr & (SHMLBA - 1)) != (addr & (SHMLBA - 1))) {
+                if (old_addr == 0 || (old_addr & (SHM_COLOUR - 1))
+                                      != (addr & (SHM_COLOUR - 1))) {
                         __flush_cache_page(mpnt, addr, page_to_phys(page));
                         if (old_addr)
                                 printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n", old_addr, addr, mpnt->vm_file ? (char *)mpnt->vm_file->f_path.dentry->d_name.name : "(null)");
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index b7cadc4a06cd..31ffa9b55322 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -45,7 +45,7 @@
 
 static int get_offset(unsigned int last_mmap)
 {
-        return (last_mmap & (SHMLBA-1)) >> PAGE_SHIFT;
+        return (last_mmap & (SHM_COLOUR-1)) >> PAGE_SHIFT;
 }
 
 static unsigned long shared_align_offset(unsigned int last_mmap,
@@ -57,8 +57,8 @@ static unsigned long shared_align_offset(unsigned int last_mmap,
 static inline unsigned long COLOR_ALIGN(unsigned long addr,
                          unsigned int last_mmap, unsigned long pgoff)
 {
-        unsigned long base = (addr+SHMLBA-1) & ~(SHMLBA-1);
-        unsigned long off  = (SHMLBA-1) &
+        unsigned long base = (addr+SHM_COLOUR-1) & ~(SHM_COLOUR-1);
+        unsigned long off  = (SHM_COLOUR-1) &
                 (shared_align_offset(last_mmap, pgoff) << PAGE_SHIFT);
 
         return base + off;
@@ -101,7 +101,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
         if (flags & MAP_FIXED) {
                 if ((flags & MAP_SHARED) && last_mmap &&
                     (addr - shared_align_offset(last_mmap, pgoff))
-                                & (SHMLBA - 1))
+                                & (SHM_COLOUR - 1))
                         return -EINVAL;
                 goto found_addr;
         }
@@ -122,7 +122,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
         info.length = len;
         info.low_limit = mm->mmap_legacy_base;
         info.high_limit = mmap_upper_limit();
-        info.align_mask = last_mmap ? (PAGE_MASK & (SHMLBA - 1)) : 0;
+        info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
         info.align_offset = shared_align_offset(last_mmap, pgoff);
         addr = vm_unmapped_area(&info);
 
@@ -161,7 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
         if (flags & MAP_FIXED) {
                 if ((flags & MAP_SHARED) && last_mmap &&
                     (addr - shared_align_offset(last_mmap, pgoff))
-                        & (SHMLBA - 1))
+                        & (SHM_COLOUR - 1))
                         return -EINVAL;
                 goto found_addr;
         }
@@ -182,7 +182,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
         info.length = len;
         info.low_limit = PAGE_SIZE;
         info.high_limit = mm->mmap_base;
-        info.align_mask = last_mmap ? (PAGE_MASK & (SHMLBA - 1)) : 0;
+        info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
         info.align_offset = shared_align_offset(last_mmap, pgoff);
         addr = vm_unmapped_area(&info);
         if (!(addr & ~PAGE_MASK))
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 80e5dd248934..83ead0ea127d 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -392,7 +392,7 @@
         ENTRY_COMP(vmsplice)
         ENTRY_COMP(move_pages)          /* 295 */
         ENTRY_SAME(getcpu)
-        ENTRY_SAME(epoll_pwait)
+        ENTRY_COMP(epoll_pwait)
         ENTRY_COMP(statfs64)
         ENTRY_COMP(fstatfs64)
         ENTRY_COMP(kexec_load)          /* 300 */