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

Commit 06e5fda1 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

parents 3d9144c2 c26056bc

arch/sh64/kernel/process.c

+3 −7
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/reboot.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/proc_fs.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>
@@ -656,9 +657,6 @@ unsigned long get_wchan(struct task_struct *p) 
   */



#if defined(CONFIG_SH64_PROC_ASIDS)

#include <linux/init.h>

#include <linux/proc_fs.h>



static int

asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data)

{
@@ -689,7 +687,5 @@ static int __init register_proc_asids(void) 
	create_proc_read_entry("asids", 0, NULL, asids_proc_info, NULL);

	return 0;

}



__initcall(register_proc_asids);

#endif

arch/sh64/kernel/traps.c

+0 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/interrupt.h>

#include <linux/sysctl.h>

#include <linux/module.h>



#include <asm/system.h>

#include <asm/uaccess.h>

#include <asm/io.h>
@@ -242,9 +241,6 @@ DO_ERROR(12, SIGILL, "reserved instruction", reserved_inst, current) 


#endif /* CONFIG_SH64_ID2815_WORKAROUND */





#include <asm/system.h>



/* Called with interrupts disabled */

asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)

{
@@ -984,4 +980,3 @@ asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs) 
	/* Clear all DEBUGINT causes */

	poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0);

}