diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-13 08:56:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-13 08:56:24 -0700 |
commit | 4c75bf7e4a0e5472bd8f0bf0a4a418ac717a9b70 (patch) | |
tree | 3dd695b5ee811bac4259ea408bd93c618d46179c /arch/alpha | |
parent | 3dcf1473c711be5536321fa4d465b9ed9e42a0ce (diff) | |
parent | 6ccbd7fd474674654019a20177c943359469103a (diff) |
Merge tag 'kbuild-fixes-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Clear errno before calling getline()
- Fix a modpost warning for ARCH=alpha
* tag 'kbuild-fixes-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
alpha: remove __init annotation from exported page_is_ram()
scripts/kallsyms: Fix build failure by setting errno before calling getline()
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index b650ff1cb022..3d7473531ab1 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -385,8 +385,7 @@ setup_memory(void *kernel_end) #endif /* CONFIG_BLK_DEV_INITRD */ } -int __init -page_is_ram(unsigned long pfn) +int page_is_ram(unsigned long pfn) { struct memclust_struct * cluster; struct memdesc_struct * memdesc; |