* [Xenomai] [PATCH] x86/ipipe: fix compile error
@ 2017-11-14 10:43 Henning Schild
2017-11-14 16:45 ` Philippe Gerum
0 siblings, 1 reply; 2+ messages in thread
From: Henning Schild @ 2017-11-14 10:43 UTC (permalink / raw)
To: xenomai
61553d8dcb9f introduced a call of "fixup_exception" with too many args,
probably a backporting problem. Remove the arg that the 4.4-version of
the function did not need.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
arch/x86/kernel/ipipe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/ipipe.c b/arch/x86/kernel/ipipe.c
index 6b02e3ea4d9a..668ac6a8ba98 100644
--- a/arch/x86/kernel/ipipe.c
+++ b/arch/x86/kernel/ipipe.c
@@ -347,7 +347,7 @@ int __ipipe_trap_prologue(struct pt_regs *regs, int trapnr)
* the standard recovery procedure in that case anyway.
*/
if (unlikely(!root_entry && faulthandler_disabled())) {
- if (fixup_exception(regs, trapnr))
+ if (fixup_exception(regs))
return 1;
}
--
2.13.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Xenomai] [PATCH] x86/ipipe: fix compile error
2017-11-14 10:43 [Xenomai] [PATCH] x86/ipipe: fix compile error Henning Schild
@ 2017-11-14 16:45 ` Philippe Gerum
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Gerum @ 2017-11-14 16:45 UTC (permalink / raw)
To: Henning Schild, xenomai
On 11/14/2017 11:43 AM, Henning Schild wrote:
> 61553d8dcb9f introduced a call of "fixup_exception" with too many args,
> probably a backporting problem. Remove the arg that the 4.4-version of
> the function did not need.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> arch/x86/kernel/ipipe.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/ipipe.c b/arch/x86/kernel/ipipe.c
> index 6b02e3ea4d9a..668ac6a8ba98 100644
> --- a/arch/x86/kernel/ipipe.c
> +++ b/arch/x86/kernel/ipipe.c
> @@ -347,7 +347,7 @@ int __ipipe_trap_prologue(struct pt_regs *regs, int trapnr)
> * the standard recovery procedure in that case anyway.
> */
> if (unlikely(!root_entry && faulthandler_disabled())) {
> - if (fixup_exception(regs, trapnr))
> + if (fixup_exception(regs))
> return 1;
> }
>
>
Merged, thanks.
--
Philippe.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-14 16:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-14 10:43 [Xenomai] [PATCH] x86/ipipe: fix compile error Henning Schild
2017-11-14 16:45 ` Philippe Gerum
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.