diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-28 09:24:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-28 09:24:50 -0800 |
| commit | 9557e60b8c3521e43bf5f21db95b2b42d7c43ac9 (patch) | |
| tree | aedadc6718398b08a3ec8d1567d8167e394a4260 | |
| parent | Merge tag 'sched-urgent-2021-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/boot: Mark prepare_command_line() __init (diff) | |
| download | linux-dev-9557e60b8c3521e43bf5f21db95b2b42d7c43ac9.tar.xz linux-dev-9557e60b8c3521e43bf5f21db95b2b42d7c43ac9.zip | |
Merge tag 'x86-urgent-2021-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build fix from Thomas Gleixner:
"A single fix for a missing __init annotation of prepare_command_line()"
* tag 'x86-urgent-2021-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Mark prepare_command_line() __init
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index c410be738ae7..6a190c7f4d71 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -742,7 +742,7 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) return 0; } -static char *prepare_command_line(void) +static char * __init prepare_command_line(void) { #ifdef CONFIG_CMDLINE_BOOL #ifdef CONFIG_CMDLINE_OVERRIDE |