Commit fc6fcdfb authored by Hannes Eder's avatar Hannes Eder Committed by Ingo Molnar
Browse files

x86: kexec/i386: fix sparse warnings: Using plain integer as NULL pointer 



Fix these sparse warnings:

  arch/x86/kernel/machine_kexec_32.c:124:22: warning: Using plain integer as NULL pointer
  arch/x86/kernel/traps.c:950:24: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarHannes Eder <hannes@hanneseder.net>
Cc: trivial@kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fdb17aeb

arch/x86/kernel/machine_kexec_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ static void machine_kexec_page_table_set_one( 
static void machine_kexec_prepare_page_tables(struct kimage *image)

static void machine_kexec_prepare_page_tables(struct kimage *image)

{

{

	void *control_page;

	void *control_page;

	pmd_t *pmd = 0;

	pmd_t *pmd = NULL;





	control_page = page_address(image->control_code_page);

	control_page = page_address(image->control_code_page);

#ifdef CONFIG_X86_PAE

#ifdef CONFIG_X86_PAE

arch/x86/kernel/traps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -942,7 +942,7 @@ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code) 
	info.si_signo = SIGILL;

	info.si_signo = SIGILL;

	info.si_errno = 0;

	info.si_errno = 0;

	info.si_code = ILL_BADSTK;

	info.si_code = ILL_BADSTK;

	info.si_addr = 0;

	info.si_addr = NULL;

	if (notify_die(DIE_TRAP, "iret exception",

	if (notify_die(DIE_TRAP, "iret exception",

			regs, error_code, 32, SIGILL) == NOTIFY_STOP)

			regs, error_code, 32, SIGILL) == NOTIFY_STOP)

		return;

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE