Commit 03eae3ac authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: fix screen_info, clean up unused declarations in setup.c 



screen_info on xtensa has old style initializer without field names.
It was broken by the commit d9b26352 ("x86, setup: Store the boot
cursor state") that split the unused2 field into two.

Rewrite screen_info initialization with explicit field names.

Drop unused declarations/tentative definitions of RTC- and FD-related
structures. Drop inclusion of linux/timex.h when RTC is enabled in
configuration.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 709fb1f9

arch/xtensa/kernel/setup.c

+8 −14
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 
# include <linux/console.h>

#endif



#ifdef CONFIG_RTC

# include <linux/timex.h>

#endif



#ifdef CONFIG_PROC_FS

# include <linux/seq_file.h>

#endif
@@ -55,17 +51,16 @@ 
#include <platform/hardware.h>



#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)

struct screen_info screen_info = { 0, 24, 0, 0, 0, 80, 0, 0, 0, 24, 1, 16};

#endif



#ifdef CONFIG_BLK_DEV_FD

extern struct fd_ops no_fd_ops;

struct fd_ops *fd_ops;

struct screen_info screen_info = {

	.orig_x = 0,

	.orig_y = 24,

	.orig_video_cols = 80,

	.orig_video_lines = 24,

	.orig_video_isVGA = 1,

	.orig_video_points = 16,

};

#endif



extern struct rtc_ops no_rtc_ops;

struct rtc_ops *rtc_ops;



#ifdef CONFIG_BLK_DEV_INITRD

extern unsigned long initrd_start;

extern unsigned long initrd_end;
@@ -77,7 +72,6 @@ extern int initrd_below_start_ok; 
void *dtb_start = __dtb_start;

#endif



unsigned char aux_device_present;

extern unsigned long loops_per_jiffy;



/* Command line specified as configuration option. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE