Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92bc2056 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: change most X86_32 pt_regs members to unsigned long 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 45de7079

arch/x86/kernel/process_32.c

+2 −3
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ void __show_registers(struct pt_regs *regs, int all) 
			init_utsname()->version);



	printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",

			0xffff & regs->cs, regs->ip, regs->flags,

			(u16)regs->cs, regs->ip, regs->flags,

			smp_processor_id());

	print_symbol("EIP is at %s\n", regs->ip);
@@ -341,8 +341,7 @@ void __show_registers(struct pt_regs *regs, int all) 
	printk("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",

		regs->si, regs->di, regs->bp, sp);

	printk(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",

	       regs->ds & 0xffff, regs->es & 0xffff,

	       regs->fs & 0xffff, gs, ss);

	       (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, ss);



	if (!all)

		return;

arch/x86/kernel/signal_32.c

+2 −2
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, 
	regs->sp = (unsigned long) frame;

	regs->ip = (unsigned long) ka->sa.sa_handler;

	regs->ax = (unsigned long) sig;

	regs->dx = (unsigned long) 0;

	regs->cx = (unsigned long) 0;

	regs->dx = 0;

	regs->cx = 0;



	regs->ds = __USER_DS;

	regs->es = __USER_DS;

include/asm-x86/ptrace.h

+14 −14
Original line number Diff line number Diff line
@@ -36,23 +36,23 @@ struct pt_regs { 
#else /* __KERNEL__ */



struct pt_regs {

	long bx;

	long cx;

	long dx;

	long si;

	long di;

	long bp;

	unsigned long bx;

	unsigned long cx;

	unsigned long dx;

	unsigned long si;

	unsigned long di;

	unsigned long bp;

	long ax;

	int  ds;

	int  es;

	int  fs;

	unsigned long ds;

	unsigned long es;

	unsigned long fs;

	/* int  gs; */

	long orig_ax;

	long ip;

	int  cs;

	long flags;

	long sp;

	int  ss;

	unsigned long ip;

	unsigned long cs;

	unsigned long flags;

	unsigned long sp;

	unsigned long ss;

};



#include <asm/vm86.h>