diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-15 10:02:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-15 10:02:25 -0700 |
| commit | 42576bee6eacda29a3193e97961ab3583a324850 (patch) | |
| tree | 850f5f50941e800bd457cda268d650565ac746d6 /arch/x86/boot | |
| parent | ba33ea811e1ff6726abb7f8f96df38c2d7b50304 (diff) | |
| parent | 25b4caf7c50e8c501310e8c515d8518b1850c948 (diff) | |
| download | linux-42576bee6eacda29a3193e97961ab3583a324850.tar.bz2 | |
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:
"Early command line options parsing enhancements from Dave Hansen, plus
minor cleanups and enhancements"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Remove unused 'is_big_kernel' variable
x86/boot: Use proper array element type in memset() size calculation
x86/boot: Pass in size to early cmdline parsing
x86/boot: Simplify early command line parsing
x86/boot: Fix early command-line parsing when partial word matches
x86/boot: Fix early command-line parsing when matching at end
x86/boot: Simplify kernel load address alignment check
x86/boot: Micro-optimize reset_early_page_tables()
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/tools/build.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c index a7661c430cd9..0702d2531bc7 100644 --- a/arch/x86/boot/tools/build.c +++ b/arch/x86/boot/tools/build.c @@ -49,7 +49,6 @@ typedef unsigned int u32; /* This must be large enough to hold the entire setup */ u8 buf[SETUP_SECT_MAX*512]; -int is_big_kernel; #define PECOFF_RELOC_RESERVE 0x20 |