diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 16:56:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 16:56:00 -0800 |
| commit | 9a126e788af8e0754d5d19cd98b3a2bc1711ff46 (patch) | |
| tree | f2b2f7565ab53872717ffd12d74cb23a48711183 /arch/x86/boot/boot.h | |
| parent | 38fabca18fc4c832ea95e2d14fb1ecde8b7dcc56 (diff) | |
| parent | 69be4efeb959147ff86f22e35aea9526f9b86715 (diff) | |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar:
"Two cleanups"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Add missing va_end() to die()
x86/boot: Simplify the detect_memory*() control flow
Diffstat (limited to 'arch/x86/boot/boot.h')
| -rw-r--r-- | arch/x86/boot/boot.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index ef5a9cc66fb8..32a09eb5c101 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -309,7 +309,7 @@ void query_edd(void); void __attribute__((noreturn)) die(void); /* memory.c */ -int detect_memory(void); +void detect_memory(void); /* pm.c */ void __attribute__((noreturn)) go_to_protected_mode(void); |