Merge branch 'master' into sh/cachetlb
This commit is contained in:
@@ -137,6 +137,7 @@ ENTRY(tlb_protection_violation_store)
|
||||
mov #1, r5
|
||||
|
||||
call_handle_tlbmiss:
|
||||
setup_frame_reg
|
||||
mov.l 1f, r0
|
||||
mov r5, r8
|
||||
mov.l @r0, r6
|
||||
|
@@ -222,7 +222,7 @@ static int __init sh7705_devices_setup(void)
|
||||
return platform_add_devices(sh7705_devices,
|
||||
ARRAY_SIZE(sh7705_devices));
|
||||
}
|
||||
__initcall(sh7705_devices_setup);
|
||||
arch_initcall(sh7705_devices_setup);
|
||||
|
||||
static struct platform_device *sh7705_early_devices[] __initdata = {
|
||||
&tmu0_device,
|
||||
|
@@ -250,7 +250,7 @@ static int __init sh770x_devices_setup(void)
|
||||
return platform_add_devices(sh770x_devices,
|
||||
ARRAY_SIZE(sh770x_devices));
|
||||
}
|
||||
__initcall(sh770x_devices_setup);
|
||||
arch_initcall(sh770x_devices_setup);
|
||||
|
||||
static struct platform_device *sh770x_early_devices[] __initdata = {
|
||||
&tmu0_device,
|
||||
|
@@ -226,7 +226,7 @@ static int __init sh7710_devices_setup(void)
|
||||
return platform_add_devices(sh7710_devices,
|
||||
ARRAY_SIZE(sh7710_devices));
|
||||
}
|
||||
__initcall(sh7710_devices_setup);
|
||||
arch_initcall(sh7710_devices_setup);
|
||||
|
||||
static struct platform_device *sh7710_early_devices[] __initdata = {
|
||||
&tmu0_device,
|
||||
|
@@ -388,7 +388,7 @@ static int __init sh7720_devices_setup(void)
|
||||
return platform_add_devices(sh7720_devices,
|
||||
ARRAY_SIZE(sh7720_devices));
|
||||
}
|
||||
__initcall(sh7720_devices_setup);
|
||||
arch_initcall(sh7720_devices_setup);
|
||||
|
||||
static struct platform_device *sh7720_early_devices[] __initdata = {
|
||||
&cmt0_device,
|
||||
|
Reference in New Issue
Block a user