m68k: Convert arch/m68k/mm/fault.c to pr_*() (8e398f63) · Commits · e / devices / android_kernel_fairphone_FP3

arch/m68k/mm/fault.c

+8 −15

Original line number	Original line	Diff line number	Diff line
	@@ -25,9 +25,8 @@ int send_fault_sig(struct pt_regs *regs)
	siginfo.si_signo = current->thread.signo;		siginfo.si_signo = current->thread.signo;
	siginfo.si_code = current->thread.code;		siginfo.si_code = current->thread.code;
	siginfo.si_addr = (void *)current->thread.faddr;		siginfo.si_addr = (void *)current->thread.faddr;
	#ifdef DEBUG		pr_debug("send_fault_sig: %p,%d,%d\n", siginfo.si_addr,
	printk("send_fault_sig: %p,%d,%d\n", siginfo.si_addr, siginfo.si_signo, siginfo.si_code);		siginfo.si_signo, siginfo.si_code);
	#endif

	if (user_mode(regs)) {		if (user_mode(regs)) {
	force_sig_info(siginfo.si_signo,		force_sig_info(siginfo.si_signo,
	@@ -45,10 +44,10 @@ int send_fault_sig(struct pt_regs *regs)
	* terminate things with extreme prejudice.		* terminate things with extreme prejudice.
	*/		*/
	if ((unsigned long)siginfo.si_addr < PAGE_SIZE)		if ((unsigned long)siginfo.si_addr < PAGE_SIZE)
	printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");		pr_alert("Unable to handle kernel NULL pointer dereference");
	else		else
	printk(KERN_ALERT "Unable to handle kernel access");		pr_alert("Unable to handle kernel access");
	printk(" at virtual address %p\n", siginfo.si_addr);		pr_cont(" at virtual address %p\n", siginfo.si_addr);
	die_if_kernel("Oops", regs, 0 /error_code/);		die_if_kernel("Oops", regs, 0 /error_code/);
	do_exit(SIGKILL);		do_exit(SIGKILL);
	}		}
	@@ -75,10 +74,8 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
	int fault;		int fault;
	unsigned int flags = FAULT_FLAG_ALLOW_RETRY \| FAULT_FLAG_KILLABLE;		unsigned int flags = FAULT_FLAG_ALLOW_RETRY \| FAULT_FLAG_KILLABLE;

	#ifdef DEBUG		pr_debug("do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n",
	printk ("do page fault:\nregs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n",
	regs->sr, regs->pc, address, error_code, mm ? mm->pgd : NULL);		regs->sr, regs->pc, address, error_code, mm ? mm->pgd : NULL);
	#endif

	/*		/*
	* If we're in an interrupt or have no user		* If we're in an interrupt or have no user
	@@ -117,9 +114,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
	* we can handle it..		* we can handle it..
	*/		*/
	good_area:		good_area:
	#ifdef DEBUG		pr_debug("do_page_fault: good_area\n");
	printk("do_page_fault: good_area\n");
	#endif
	switch (error_code & 3) {		switch (error_code & 3) {
	default: /* 3: write, present */		default: /* 3: write, present */
	/* fall through */		/* fall through */
	@@ -142,9 +137,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
	*/		*/

	fault = handle_mm_fault(mm, vma, address, flags);		fault = handle_mm_fault(mm, vma, address, flags);
	#ifdef DEBUG		pr_debug("handle_mm_fault returns %d\n", fault);
	printk("handle_mm_fault returns %d\n",fault);
	#endif

	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))		if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
	return 0;		return 0;