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

Commit 8c5dfd25 authored by Stoyan Gaydarov's avatar Stoyan Gaydarov Committed by Ingo Molnar
Browse files

x86: BUG to BUG_ON changes



Impact: cleanup

Signed-off-by: default avatarStoyan Gaydarov <stoyboyker@gmail.com>
LKML-Reference: <1236661850-8237-8-git-send-email-stoyboyker@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 467c88fe
Loading
Loading
Loading
Loading
+2 −4
Original line number Original line Diff line number Diff line
@@ -1078,8 +1078,7 @@ void __cpuinit cpu_init(void)


	atomic_inc(&init_mm.mm_count);
	atomic_inc(&init_mm.mm_count);
	me->active_mm = &init_mm;
	me->active_mm = &init_mm;
	if (me->mm)
	BUG_ON(me->mm);
		BUG();
	enter_lazy_tlb(&init_mm, me);
	enter_lazy_tlb(&init_mm, me);


	load_sp0(t, &current->thread);
	load_sp0(t, &current->thread);
@@ -1145,8 +1144,7 @@ void __cpuinit cpu_init(void)
	 */
	 */
	atomic_inc(&init_mm.mm_count);
	atomic_inc(&init_mm.mm_count);
	curr->active_mm = &init_mm;
	curr->active_mm = &init_mm;
	if (curr->mm)
	BUG_ON(curr->mm);
		BUG();
	enter_lazy_tlb(&init_mm, curr);
	enter_lazy_tlb(&init_mm, curr);


	load_sp0(t, thread);
	load_sp0(t, thread);
+1 −2
Original line number Original line Diff line number Diff line
@@ -74,8 +74,7 @@ static void ich_force_hpet_resume(void)
	if (!force_hpet_address)
	if (!force_hpet_address)
		return;
		return;


	if (rcba_base == NULL)
	BUG_ON(rcba_base == NULL);
		BUG();


	/* read the Function Disable register, dword mode only */
	/* read the Function Disable register, dword mode only */
	val = readl(rcba_base + 0x3404);
	val = readl(rcba_base + 0x3404);