Commit 0e96f31e authored by Jordan Borgner's avatar Jordan Borgner Committed by Ingo Molnar
Browse files

x86: Clean up 'sizeof x' => 'sizeof(x)' 



"sizeof(x)" is the canonical coding style used in arch/x86 most of the time.
Fix the few places that didn't follow the convention.

(Also do some whitespace cleanups in a few places while at it.)

[ mingo: Rewrote the changelog. ]

Signed-off-by: default avatarJordan Borgner <mail@jordan-borgner.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20181028125828.7rgammkgzep2wpam@JordanDesktop


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 4b783dd6

arch/x86/boot/cpucheck.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr) 
{

	int err;



	memset(&cpu.flags, 0, sizeof cpu.flags);

	memset(&cpu.flags, 0, sizeof(cpu.flags));

	cpu.level = 3;



	if (has_eflag(X86_EFLAGS_AC))

arch/x86/boot/early_serial_console.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void parse_earlyprintk(void) 
	int pos = 0;

	int port = 0;



	if (cmdline_find_option("earlyprintk", arg, sizeof arg) > 0) {

	if (cmdline_find_option("earlyprintk", arg, sizeof(arg)) > 0) {

		char *e;



		if (!strncmp(arg, "serial", 6)) {
@@ -124,7 +124,7 @@ static void parse_console_uart8250(void) 
	 * console=uart8250,io,0x3f8,115200n8

	 * need to make sure it is last one console !

	 */

	if (cmdline_find_option("console", optstr, sizeof optstr) <= 0)

	if (cmdline_find_option("console", optstr, sizeof(optstr)) <= 0)

		return;



	options = optstr;

arch/x86/boot/edd.c

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei) 
{

	struct biosregs ireg, oreg;



	memset(ei, 0, sizeof *ei);

	memset(ei, 0, sizeof(*ei));



	/* Check Extensions Present */
@@ -133,7 +133,7 @@ void query_edd(void) 
	struct edd_info ei, *edp;

	u32 *mbrptr;



	if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {

	if (cmdline_find_option("edd", eddarg, sizeof(eddarg)) > 0) {

		if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) {

			do_edd = 1;

			do_mbr = 0;
@@ -166,7 +166,7 @@ void query_edd(void) 
		 */

		if (!get_edd_info(devno, &ei)

		    && boot_params.eddbuf_entries < EDDMAXNR) {

			memcpy(edp, &ei, sizeof ei);

			memcpy(edp, &ei, sizeof(ei));

			edp++;

			boot_params.eddbuf_entries++;

		}

arch/x86/boot/main.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ static void copy_boot_params(void) 
	const struct old_cmdline * const oldcmd =

		(const struct old_cmdline *)OLD_CL_ADDRESS;



	BUILD_BUG_ON(sizeof boot_params != 4096);

	memcpy(&boot_params.hdr, &hdr, sizeof hdr);

	BUILD_BUG_ON(sizeof(boot_params) != 4096);

	memcpy(&boot_params.hdr, &hdr, sizeof(hdr));



	if (!boot_params.hdr.cmd_line_ptr &&

	    oldcmd->cl_magic == OLD_CL_MAGIC) {

arch/x86/boot/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int detect_memory_e820(void) 


	initregs(&ireg);

	ireg.ax  = 0xe820;

	ireg.cx  = sizeof buf;

	ireg.cx  = sizeof(buf);

	ireg.edx = SMAP;

	ireg.di  = (size_t)&buf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE