tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kdev_t: always inline major/minor helper functions

Silly GCC doesn't always inline these trivial functions.

Fixes the following warning:

arch/x86/kernel/sys_ia32.o: warning: objtool: cp_stat64()+0xd8: call to new_encode_dev() with UACCESS enabled

Link: https://lkml.kernel.org/r/984353b44a4484d86ba9f73884b7306232e25e30.1608737428.git.jpoimboe@redhat.com
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> [build-tested]
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Josh Poimboeuf and committed by
Linus Torvalds aa8c7db4 8b0fac44

+11 -11
+11 -11
include/linux/kdev_t.h
··· 21 21 }) 22 22 23 23 /* acceptable for old filesystems */ 24 - static inline bool old_valid_dev(dev_t dev) 24 + static __always_inline bool old_valid_dev(dev_t dev) 25 25 { 26 26 return MAJOR(dev) < 256 && MINOR(dev) < 256; 27 27 } 28 28 29 - static inline u16 old_encode_dev(dev_t dev) 29 + static __always_inline u16 old_encode_dev(dev_t dev) 30 30 { 31 31 return (MAJOR(dev) << 8) | MINOR(dev); 32 32 } 33 33 34 - static inline dev_t old_decode_dev(u16 val) 34 + static __always_inline dev_t old_decode_dev(u16 val) 35 35 { 36 36 return MKDEV((val >> 8) & 255, val & 255); 37 37 } 38 38 39 - static inline u32 new_encode_dev(dev_t dev) 39 + static __always_inline u32 new_encode_dev(dev_t dev) 40 40 { 41 41 unsigned major = MAJOR(dev); 42 42 unsigned minor = MINOR(dev); 43 43 return (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12); 44 44 } 45 45 46 - static inline dev_t new_decode_dev(u32 dev) 46 + static __always_inline dev_t new_decode_dev(u32 dev) 47 47 { 48 48 unsigned major = (dev & 0xfff00) >> 8; 49 49 unsigned minor = (dev & 0xff) | ((dev >> 12) & 0xfff00); 50 50 return MKDEV(major, minor); 51 51 } 52 52 53 - static inline u64 huge_encode_dev(dev_t dev) 53 + static __always_inline u64 huge_encode_dev(dev_t dev) 54 54 { 55 55 return new_encode_dev(dev); 56 56 } 57 57 58 - static inline dev_t huge_decode_dev(u64 dev) 58 + static __always_inline dev_t huge_decode_dev(u64 dev) 59 59 { 60 60 return new_decode_dev(dev); 61 61 } 62 62 63 - static inline int sysv_valid_dev(dev_t dev) 63 + static __always_inline int sysv_valid_dev(dev_t dev) 64 64 { 65 65 return MAJOR(dev) < (1<<14) && MINOR(dev) < (1<<18); 66 66 } 67 67 68 - static inline u32 sysv_encode_dev(dev_t dev) 68 + static __always_inline u32 sysv_encode_dev(dev_t dev) 69 69 { 70 70 return MINOR(dev) | (MAJOR(dev) << 18); 71 71 } 72 72 73 - static inline unsigned sysv_major(u32 dev) 73 + static __always_inline unsigned sysv_major(u32 dev) 74 74 { 75 75 return (dev >> 18) & 0x3fff; 76 76 } 77 77 78 - static inline unsigned sysv_minor(u32 dev) 78 + static __always_inline unsigned sysv_minor(u32 dev) 79 79 { 80 80 return dev & 0x3ffff; 81 81 }