evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Paul Mundt 2007-11-09 17:59:53 +09:00
commit 06e5fda184
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/sh64/kernel/process.c
View file

@ -26,6 +26,7 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/proc_fs.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
@ -656,9 +657,6 @@ unsigned long get_wchan(struct task_struct *p)
*/ */
#if defined(CONFIG_SH64_PROC_ASIDS) #if defined(CONFIG_SH64_PROC_ASIDS)
#include <linux/init.h>
#include <linux/proc_fs.h>
static int static int
asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data) 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); create_proc_read_entry("asids", 0, NULL, asids_proc_info, NULL);
return 0; return 0;
} }
__initcall(register_proc_asids); __initcall(register_proc_asids);
#endif #endif

5
arch/sh64/kernel/traps.c
View file

@ -30,7 +30,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
@ -242,9 +241,6 @@ DO_ERROR(12, SIGILL, "reserved instruction", reserved_inst, current)
#endif /* CONFIG_SH64_ID2815_WORKAROUND */ #endif /* CONFIG_SH64_ID2815_WORKAROUND */
#include <asm/system.h>
/* Called with interrupts disabled */ /* Called with interrupts disabled */
asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) 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 */ /* Clear all DEBUGINT causes */
poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0); poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0);
} }