diff options
| author | Sebastian Reichel <[email protected]> | 2025-07-06 22:53:35 +0000 |
|---|---|---|
| committer | Sebastian Reichel <[email protected]> | 2025-07-06 22:53:35 +0000 |
| commit | 61b8c39deb4b6d314f942a4a33565575c9b0c3d5 (patch) | |
| tree | f25268cdd9485af13d9efa05db3d88754a82f82b /arch/arc/include/asm/bitops.h | |
| parent | MAINTAINERS: rectify file entry in QUALCOMM SMB CHARGER DRIVER (diff) | |
| parent | Documentation: PM: *_autosuspend() functions update last busy time (diff) | |
| download | kernel-61b8c39deb4b6d314f942a4a33565575c9b0c3d5.tar.gz kernel-61b8c39deb4b6d314f942a4a33565575c9b0c3d5.zip | |
Merge tag 'pm-runtime-6.17-rc1'
Runtime PM updates related to autosuspend for 6.17
Make several autosuspend functions mark last busy stamp and update
the documentation accordingly (Sakari Ailus).
Signed-off-by: Sebastian Reichel <[email protected]>
Diffstat (limited to 'arch/arc/include/asm/bitops.h')
| -rw-r--r-- | arch/arc/include/asm/bitops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h index f5a936496f06..5340c2871392 100644 --- a/arch/arc/include/asm/bitops.h +++ b/arch/arc/include/asm/bitops.h @@ -10,7 +10,7 @@ #error only <linux/bitops.h> can be included directly #endif -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <linux/types.h> #include <linux/compiler.h> @@ -192,6 +192,6 @@ static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x) #include <asm-generic/bitops/le.h> #include <asm-generic/bitops/ext2-atomic-setbit.h> -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif |