sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-24 21:24:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

[uaccess] Rename userptr_sub() to userptr_diff()

Browse Source 
Clarify the intended usage of userptr_sub() by renaming it to
userptr_diff() (to avoid confusion with userptr_add()), and fix the
existing call sites that erroneously use userptr_sub() to subtract an
offset from a userptr_t value.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-04-20 17:18:06 +01:00
parent 453acba7dc
commit 63d27c6311
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/ipxe/linux/linux_uaccess.h
View File

@@ -75,9 +75,9 @@ UACCESS_INLINE ( linux, userptr_add ) ( userptr_t userptr, off_t offset ) {
}
static inline __always_inline off_t
UACCESS_INLINE ( linux, userptr_sub ) ( userptr_t userptr,
userptr_t subtrahend ) {
return trivial_userptr_sub ( userptr, subtrahend );
UACCESS_INLINE ( linux, userptr_diff ) ( userptr_t userptr,
userptr_t subtrahend ) {
return trivial_userptr_diff ( userptr, subtrahend );
}
static inline __always_inline void

10
src/include/ipxe/uaccess.h
View File

@@ -96,7 +96,7 @@ trivial_userptr_add ( userptr_t userptr, off_t offset ) {
* @ret offset Offset
*/
static inline __always_inline off_t
trivial_userptr_sub ( userptr_t userptr, userptr_t subtrahend ) {
trivial_userptr_diff ( userptr_t userptr, userptr_t subtrahend ) {
return ( userptr - subtrahend );
}
@@ -248,9 +248,9 @@ UACCESS_INLINE ( flat, userptr_add ) ( userptr_t userptr, off_t offset ) {
}
static inline __always_inline off_t
UACCESS_INLINE ( flat, userptr_sub ) ( userptr_t userptr,
userptr_t subtrahend ) {
return trivial_userptr_sub ( userptr, subtrahend );
UACCESS_INLINE ( flat, userptr_diff ) ( userptr_t userptr,
userptr_t subtrahend ) {
return trivial_userptr_diff ( userptr, subtrahend );
}
static inline __always_inline void
@@ -349,7 +349,7 @@ userptr_t userptr_add ( userptr_t userptr, off_t offset );
* @v subtrahend User pointer to be subtracted
* @ret offset Offset
*/
off_t userptr_sub ( userptr_t userptr, userptr_t subtrahend );
off_t userptr_diff ( userptr_t userptr, userptr_t subtrahend );
/**
* Convert virtual address to a physical address