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

Commit c202ac9f authored by Len Brown's avatar Len Brown
Browse files

Merge ../to-linus

parents 4be44fcd c3068951

arch/i386/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -454,8 +454,9 @@ config HPET_TIMER 
	  Choose N to continue using the legacy 8254 timer.



config HPET_EMULATE_RTC

	bool "Provide RTC interrupt"

	bool

	depends on HPET_TIMER && RTC=y

	default y



config SMP

	bool "Symmetric multi-processing support"

arch/x86_64/ia32/ptrace32.c

+4 −4
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 val) 
	switch (regno) {

	case offsetof(struct user32, regs.fs):

		if (val && (val & 3) != 3) return -EIO; 

		child->thread.fs = val & 0xffff; 

		child->thread.fsindex = val & 0xffff;

		break;

	case offsetof(struct user32, regs.gs):

		if (val && (val & 3) != 3) return -EIO; 

		child->thread.gs = val & 0xffff;

		child->thread.gsindex = val & 0xffff;

		break;

	case offsetof(struct user32, regs.ds):

		if (val && (val & 3) != 3) return -EIO;
@@ -138,10 +138,10 @@ static int getreg32(struct task_struct *child, unsigned regno, u32 *val) 


	switch (regno) {

	case offsetof(struct user32, regs.fs):

	        *val = child->thread.fs; 

	        *val = child->thread.fsindex;

		break;

	case offsetof(struct user32, regs.gs):

		*val = child->thread.gs;

		*val = child->thread.gsindex;

		break;

	case offsetof(struct user32, regs.ds):

		*val = child->thread.ds;

kernel/exit.c

+3 −1
Original line number Diff line number Diff line
@@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long code) 
	acct_update_integrals(tsk);

	update_mem_hiwater(tsk);

	group_dead = atomic_dec_and_test(&tsk->signal->live);

	if (group_dead)

	if (group_dead) {

 		del_timer_sync(&tsk->signal->real_timer);

		acct_process(code);

	}

	exit_mm(tsk);



	exit_sem(tsk);

kernel/posix-timers.c

+0 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *sig) 
		tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);

		itimer_delete(tmr);

	}

	del_timer_sync(&sig->real_timer);

}



/*