diff options
| author | Thomas Weißschuh <linux@weissschuh.net> | 2026-04-04 10:08:22 +0200 |
|---|---|---|
| committer | Thomas Weißschuh <linux@weissschuh.net> | 2026-04-04 10:29:02 +0200 |
| commit | 572246dcddb5455d62d5d152fe31105542b10ff5 (patch) | |
| tree | d68ea7bff9cbc9eea2e7a2201424721d64cbf96f /tools/include | |
| parent | df4ef52c1d4737ca68ce8f1ade5f61abad219055 (diff) | |
| download | linux-next-572246dcddb5455d62d5d152fe31105542b10ff5.tar.gz linux-next-572246dcddb5455d62d5d152fe31105542b10ff5.zip | |
tools/nolibc: handle all major and minor numbers in makedev() and friends
Remove the limitation of only handling small major and minor numbers.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://patch.msgid.link/20260404-nolibc-makedev-v2-5-456a429bf60c@weissschuh.net
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/nolibc/sys/sysmacros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/include/nolibc/sys/sysmacros.h b/tools/include/nolibc/sys/sysmacros.h index 347a95341ea2..ff9dd85ca59c 100644 --- a/tools/include/nolibc/sys/sysmacros.h +++ b/tools/include/nolibc/sys/sysmacros.h @@ -12,24 +12,24 @@ #include "../std.h" -/* WARNING, it only deals with the 4096 first majors and 256 first minors */ static __inline__ dev_t __nolibc_makedev(unsigned int maj, unsigned int min) { - return ((maj & 0xfff) << 8) | (min & 0xff); + return (((dev_t)maj & ~0xfff) << 32) | ((maj & 0xfff) << 8) | + (((dev_t)min & ~0xff) << 12) | (min & 0xff); } #define makedev(maj, min) __nolibc_makedev(maj, min) static __inline__ unsigned int __nolibc_major(dev_t dev) { - return (dev >> 8) & 0xfff; + return ((dev >> 32) & ~0xfff) | ((dev >> 8) & 0xfff); } #define major(dev) __nolibc_major(dev) static __inline__ unsigned int __nolibc_minor(dev_t dev) { - return dev & 0xff; + return ((dev >> 12) & ~0xff) | (dev & 0xff); } #define minor(dev) __nolibc_minor(dev) |