diff options
-rw-r--r-- | arch/arm/kernel/calls.S | 2 | ||||
-rw-r--r-- | arch/arm/kernel/entry-common.S | 4 | ||||
-rw-r--r-- | arch/i386/kernel/setup.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 949ec4427f21..2ad4aa2a1536 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
@@ -131,7 +131,7 @@ __syscall_start: | |||
131 | .long sys_wait4 | 131 | .long sys_wait4 |
132 | /* 115 */ .long sys_swapoff | 132 | /* 115 */ .long sys_swapoff |
133 | .long sys_sysinfo | 133 | .long sys_sysinfo |
134 | .long sys_ipc | 134 | .long sys_ipc_wrapper |
135 | .long sys_fsync | 135 | .long sys_fsync |
136 | .long sys_sigreturn_wrapper | 136 | .long sys_sigreturn_wrapper |
137 | /* 120 */ .long sys_clone_wrapper | 137 | /* 120 */ .long sys_clone_wrapper |
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index db302c6e5343..81d450ac3fab 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -273,6 +273,10 @@ sys_mbind_wrapper: | |||
273 | str r5, [sp, #4] | 273 | str r5, [sp, #4] |
274 | b sys_mbind | 274 | b sys_mbind |
275 | 275 | ||
276 | sys_ipc_wrapper: | ||
277 | str r5, [sp, #4] @ push sixth arg | ||
278 | b sys_ipc | ||
279 | |||
276 | /* | 280 | /* |
277 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested | 281 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested |
278 | * offset, we return EINVAL. | 282 | * offset, we return EINVAL. |
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index dc39ca6a7eca..9b8c8a19824d 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
@@ -848,9 +848,7 @@ static void __init parse_cmdline_early (char ** cmdline_p) | |||
848 | #ifdef CONFIG_X86_IO_APIC | 848 | #ifdef CONFIG_X86_IO_APIC |
849 | else if (!memcmp(from, "acpi_skip_timer_override", 24)) | 849 | else if (!memcmp(from, "acpi_skip_timer_override", 24)) |
850 | acpi_skip_timer_override = 1; | 850 | acpi_skip_timer_override = 1; |
851 | #endif | ||
852 | 851 | ||
853 | #ifdef CONFIG_X86_LOCAL_APIC | ||
854 | if (!memcmp(from, "disable_timer_pin_1", 19)) | 852 | if (!memcmp(from, "disable_timer_pin_1", 19)) |
855 | disable_timer_pin_1 = 1; | 853 | disable_timer_pin_1 = 1; |
856 | if (!memcmp(from, "enable_timer_pin_1", 18)) | 854 | if (!memcmp(from, "enable_timer_pin_1", 18)) |
@@ -859,7 +857,7 @@ static void __init parse_cmdline_early (char ** cmdline_p) | |||
859 | /* disable IO-APIC */ | 857 | /* disable IO-APIC */ |
860 | else if (!memcmp(from, "noapic", 6)) | 858 | else if (!memcmp(from, "noapic", 6)) |
861 | disable_ioapic_setup(); | 859 | disable_ioapic_setup(); |
862 | #endif /* CONFIG_X86_LOCAL_APIC */ | 860 | #endif /* CONFIG_X86_IO_APIC */ |
863 | #endif /* CONFIG_ACPI */ | 861 | #endif /* CONFIG_ACPI */ |
864 | 862 | ||
865 | #ifdef CONFIG_X86_LOCAL_APIC | 863 | #ifdef CONFIG_X86_LOCAL_APIC |