Skip to content

Commit 4c75bf7

Browse files
committed
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()
2 parents 3dcf147 + 6ccbd7f commit 4c75bf7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/alpha/kernel/setup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,7 @@ setup_memory(void *kernel_end)
385385
#endif /* CONFIG_BLK_DEV_INITRD */
386386
}
387387

388-
int __init
389-
page_is_ram(unsigned long pfn)
388+
int page_is_ram(unsigned long pfn)
390389
{
391390
struct memclust_struct * cluster;
392391
struct memdesc_struct * memdesc;

scripts/kallsyms.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ static struct sym_entry *read_symbol(FILE *in, char **buf, size_t *buf_len)
129129
ssize_t readlen;
130130
struct sym_entry *sym;
131131

132+
errno = 0;
132133
readlen = getline(buf, buf_len, in);
133134
if (readlen < 0) {
134135
if (errno) {

0 commit comments

Comments
 (0)