Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Fixup screen_info struct initializations

|arch/mips/sibyte/swarm/setup.c:153:
| warning: large integer implicitly truncated to unsigned type

The field was changed in d9b26352 aka ("x86, setup: Store the boot
cursor state"). This patch changes the values back they way they were
before this extra field got introduced.

While here, the other two boards are also converted to C99 initializer.

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1137/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Sebastian Andrzej Siewior and committed by
Ralf Baechle
b20947aa 9eed4124

+17 -27
+3 -9
arch/mips/jazz/setup.c
··· 76 76 77 77 #ifdef CONFIG_VT 78 78 screen_info = (struct screen_info) { 79 - 0, 0, /* orig-x, orig-y */ 80 - 0, /* unused */ 81 - 0, /* orig_video_page */ 82 - 0, /* orig_video_mode */ 83 - 160, /* orig_video_cols */ 84 - 0, 0, 0, /* unused, ega_bx, unused */ 85 - 64, /* orig_video_lines */ 86 - 0, /* orig_video_isVGA */ 87 - 16 /* orig_video_points */ 79 + .orig_video_cols = 160, 80 + .orig_video_lines = 64, 81 + .orig_video_points = 16, 88 82 }; 89 83 #endif 90 84
+6 -9
arch/mips/loongson/common/setup.c
··· 41 41 conswitchp = &vga_con; 42 42 43 43 screen_info = (struct screen_info) { 44 - 0, 25, /* orig-x, orig-y */ 45 - 0, /* unused */ 46 - 0, /* orig-video-page */ 47 - 0, /* orig-video-mode */ 48 - 80, /* orig-video-cols */ 49 - 0, 0, 0, /* ega_ax, ega_bx, ega_cx */ 50 - 25, /* orig-video-lines */ 51 - VIDEO_TYPE_VGAC, /* orig-video-isVGA */ 52 - 16 /* orig-video-points */ 44 + .orig_x = 0, 45 + .orig_y = 25, 46 + .orig_video_cols = 80, 47 + .orig_video_lines = 25, 48 + .orig_video_isVGA = VIDEO_TYPE_VGAC, 49 + .orig_video_points = 16, 53 50 }; 54 51 #elif defined(CONFIG_DUMMY_CONSOLE) 55 52 conswitchp = &dummy_con;
+8 -9
arch/mips/sibyte/swarm/setup.c
··· 145 145 146 146 #ifdef CONFIG_VT 147 147 screen_info = (struct screen_info) { 148 - 0, 0, /* orig-x, orig-y */ 149 - 0, /* unused */ 150 - 52, /* orig_video_page */ 151 - 3, /* orig_video_mode */ 152 - 80, /* orig_video_cols */ 153 - 4626, 3, 9, /* unused, ega_bx, unused */ 154 - 25, /* orig_video_lines */ 155 - 0x22, /* orig_video_isVGA */ 156 - 16 /* orig_video_points */ 148 + .orig_video_page = 52, 149 + .orig_video_mode = 3, 150 + .orig_video_cols = 80, 151 + .flags = 12, 152 + .orig_video_ega_bx = 3, 153 + .orig_video_lines = 25, 154 + .orig_video_isVGA = 0x22, 155 + .orig_video_points = 16, 157 156 }; 158 157 /* XXXKW for CFE, get lines/cols from environment */ 159 158 #endif