Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 10:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

Browse Source 
Pull microblaze fixes from Michal Simek:
 "One is fixing warning reported by sparse and the second warning was
  reported by Geert in his build regressions/improvements status update
  for -rc4."

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Use static inline functions in cacheflush.h
  microblaze: Fix sparse warnings
This commit is contained in:
Linus Torvalds 2013-06-05 09:02:09 +09:00
commit 1dc735bdec
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/microblaze/include/asm/cacheflush.h
View File

@ -102,21 +102,23 @@ do { \
#define flush_cache_range(vma, start, len) do { } while (0) #define flush_cache_range(vma, start, len) do { } while (0)
#define copy_to_user_page(vma, page, vaddr, dst, src, len) \ static inline void copy_to_user_page(struct vm_area_struct *vma,
do { \ struct page *page, unsigned long vaddr,
u32 addr = virt_to_phys(dst); \ void *dst, void *src, int len)
memcpy((dst), (src), (len)); \ {
if (vma->vm_flags & VM_EXEC) { \ u32 addr = virt_to_phys(dst);
invalidate_icache_range((unsigned) (addr), \ memcpy(dst, src, len);
(unsigned) (addr) + PAGE_SIZE); \ if (vma->vm_flags & VM_EXEC) {
flush_dcache_range((unsigned) (addr), \ invalidate_icache_range(addr, addr + PAGE_SIZE);
(unsigned) (addr) + PAGE_SIZE); \ flush_dcache_range(addr, addr + PAGE_SIZE);
} \ }
} while (0) }
#define copy_from_user_page(vma, page, vaddr, dst, src, len) \ static inline void copy_from_user_page(struct vm_area_struct *vma,
do { \ struct page *page, unsigned long vaddr,
memcpy((dst), (src), (len)); \ void *dst, void *src, int len)
} while (0) {
memcpy(dst, src, len);
}
#endif /* _ASM_MICROBLAZE_CACHEFLUSH_H */ #endif /* _ASM_MICROBLAZE_CACHEFLUSH_H */

4
arch/microblaze/include/asm/uaccess.h
View File

@ -99,13 +99,13 @@ static inline int access_ok(int type, const void __user *addr,
if ((get_fs().seg < ((unsigned long)addr)) || if ((get_fs().seg < ((unsigned long)addr)) ||
(get_fs().seg < ((unsigned long)addr + size - 1))) { (get_fs().seg < ((unsigned long)addr + size - 1))) {
pr_debug("ACCESS fail: %s at 0x%08x (size 0x%x), seg 0x%08x\n", pr_debug("ACCESS fail: %s at 0x%08x (size 0x%x), seg 0x%08x\n",
type ? "WRITE" : "READ ", (u32)addr, (u32)size, type ? "WRITE" : "READ ", (__force u32)addr, (u32)size,
(u32)get_fs().seg); (u32)get_fs().seg);
return 0; return 0;
} }
ok: ok:
pr_debug("ACCESS OK: %s at 0x%08x (size 0x%x), seg 0x%08x\n", pr_debug("ACCESS OK: %s at 0x%08x (size 0x%x), seg 0x%08x\n",
type ? "WRITE" : "READ ", (u32)addr, (u32)size, type ? "WRITE" : "READ ", (__force u32)addr, (u32)size,
(u32)get_fs().seg); (u32)get_fs().seg);
return 1; return 1;
} }