Skip to content

Commit

Permalink
powerpc: Drop use of 'type' from access_ok()
Browse files Browse the repository at this point in the history
In commit 05a4ab8 ("powerpc/uaccess: fix warning/error with
access_ok()") an attempt was made to remove a warning by referencing
the variable `type`. However in commit 96d4f26 ("Remove 'type'
argument from access_ok() function") the variable `type` has been
removed, breaking the build:

  arch/powerpc/include/asm/uaccess.h:66:32: error: ‘type’ undeclared (first use in this function)

This essentially reverts commit 05a4ab8 ("powerpc/uaccess: fix
warning/error with access_ok()") to fix the error.

Fixes: 96d4f26 ("Remove 'type' argument from access_ok() function")
Signed-off-by: Mathieu Malaterre <[email protected]>
[mpe: Reword change log slightly.]
Signed-off-by: Michael Ellerman <[email protected]>
  • Loading branch information
malaterre authored and mpe committed Jan 4, 2019
1 parent d538d94 commit 074400a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static inline int __access_ok(unsigned long addr, unsigned long size,
#endif

#define access_ok(addr, size) \
(__chk_user_ptr(addr), (void)(type), \
(__chk_user_ptr(addr), \
__access_ok((__force unsigned long)(addr), (size), get_fs()))

/*
Expand Down

0 comments on commit 074400a

Please sign in to comment.