Commit 2408e5f9 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] misc alpha bits

* long constant in a.out.h
* missing cast to pointer in pgtable.h
* removed useless __chk_user_ptr() in get_user() and put_user() - with fixed
  typeof handling in sparse we are getting the check from
 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);			\
  anyway, so __chk_user_ptr() is redundant there.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1540aac5
...@@ -95,7 +95,7 @@ struct exec ...@@ -95,7 +95,7 @@ struct exec
Worse, we have to notice the start address before swapping to use Worse, we have to notice the start address before swapping to use
/sbin/loader, which of course is _not_ a TASO application. */ /sbin/loader, which of course is _not_ a TASO application. */
#define SET_AOUT_PERSONALITY(BFPM, EX) \ #define SET_AOUT_PERSONALITY(BFPM, EX) \
set_personality (((BFPM->sh_bang || EX.ah.entry < 0x100000000 \ set_personality (((BFPM->sh_bang || EX.ah.entry < 0x100000000L \
? ADDR_LIMIT_32BIT : 0) | PER_OSF4)) ? ADDR_LIMIT_32BIT : 0) | PER_OSF4))
#define STACK_TOP \ #define STACK_TOP \
......
...@@ -328,7 +328,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) ...@@ -328,7 +328,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
#endif #endif
#define io_remap_page_range(vma, start, busaddr, size, prot) \ #define io_remap_page_range(vma, start, busaddr, size, prot) \
remap_page_range(vma, start, virt_to_phys(__ioremap(busaddr, size)), size, prot) remap_page_range(vma, start, virt_to_phys((void *)__ioremap(busaddr, size)), size, prot)
#define pte_ERROR(e) \ #define pte_ERROR(e) \
printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e)) printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
......
...@@ -108,7 +108,6 @@ extern void __get_user_unknown(void); ...@@ -108,7 +108,6 @@ extern void __get_user_unknown(void);
({ \ ({ \
long __gu_err = -EFAULT, __gu_val = 0; \ long __gu_err = -EFAULT, __gu_val = 0; \
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
__chk_user_ptr(ptr); \
if (__access_ok((unsigned long)__gu_addr,size,segment)) { \ if (__access_ok((unsigned long)__gu_addr,size,segment)) { \
__gu_err = 0; \ __gu_err = 0; \
switch (size) { \ switch (size) { \
...@@ -223,7 +222,6 @@ extern void __put_user_unknown(void); ...@@ -223,7 +222,6 @@ extern void __put_user_unknown(void);
({ \ ({ \
long __pu_err = -EFAULT; \ long __pu_err = -EFAULT; \
__typeof__(*(ptr)) __user *__pu_addr = (ptr); \ __typeof__(*(ptr)) __user *__pu_addr = (ptr); \
__chk_user_ptr(ptr); \
if (__access_ok((unsigned long)__pu_addr,size,segment)) { \ if (__access_ok((unsigned long)__pu_addr,size,segment)) { \
__pu_err = 0; \ __pu_err = 0; \
switch (size) { \ switch (size) { \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment