diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 16:58:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 16:58:05 -0800 |
| commit | eb4d47c8ce5bc2dac5f9ffc27dc9594f6bc2cacb (patch) | |
| tree | 0a46192f06e408d2f4bbe1d5c3ce1903074de1e3 /arch/x86/boot | |
| parent | 6a9f70b0a5b3ca5db1dd5c7743ca555bfca2ae08 (diff) | |
| parent | 642e641cbea57e559720b9df09889ffcf525cf04 (diff) | |
| download | linux-stable-eb4d47c8ce5bc2dac5f9ffc27dc9594f6bc2cacb.tar.gz linux-stable-eb4d47c8ce5bc2dac5f9ffc27dc9594f6bc2cacb.tar.bz2 linux-stable-eb4d47c8ce5bc2dac5f9ffc27dc9594f6bc2cacb.zip | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Two changes: Propagate const/__initconst, and use ARRAY_SIZE() some
more"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/events/amd/iommu: Make iommu_pmu const and __initconst
x86: Use ARRAY_SIZE
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/video-vga.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c index 45bc9402aa49..a14c5178d4ba 100644 --- a/arch/x86/boot/video-vga.c +++ b/arch/x86/boot/video-vga.c @@ -241,9 +241,9 @@ static int vga_probe(void) vga_modes, }; static int mode_count[] = { - sizeof(cga_modes)/sizeof(struct mode_info), - sizeof(ega_modes)/sizeof(struct mode_info), - sizeof(vga_modes)/sizeof(struct mode_info), + ARRAY_SIZE(cga_modes), + ARRAY_SIZE(ega_modes), + ARRAY_SIZE(vga_modes), }; struct biosregs ireg, oreg; |