[<prev] [next>] [day] [month] [year] [list]
Message-ID: <87harca0h1.fsf@tucsk.pomaz.szeredi.hu>
Date: Wed, 05 Sep 2012 18:38:50 +0200
From: Miklos Szeredi <miklos@...redi.hu>
To: Linus Torvalds <torvalds@...ux-foundation.org>
CC: linux-kernel@...r.kernel.org,
user-mode-linux-devel@...ts.sourceforge.net,
Martin Pärtel <martin.partel@...il.com>
Subject: [PATCH] uml: fix compile error in deliver_alarm()
From: Miklos Szeredi <mszeredi@...e.cz>
Fix the following compile error on UML.
arch/um/os-Linux/time.c: In function 'deliver_alarm':
arch/um/os-Linux/time.c:117:3: error: too few arguments to function 'alarm_handler'
arch/um/os-Linux/internal.h:1:6: note: declared here
The error was introduced by commit d3c1cfcd (um: pass siginfo to guest
process) in 3.6-rc1.
Signed-off-by: Miklos Szeredi <mszeredi@...e.cz>
CC: Martin Pärtel <martin.partel@...il.com>
---
arch/um/os-Linux/time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/arch/um/os-Linux/time.c
===================================================================
--- linux-2.6.orig/arch/um/os-Linux/time.c 2012-09-05 17:18:27.000000000 +0200
+++ linux-2.6/arch/um/os-Linux/time.c 2012-09-05 18:34:35.000000000 +0200
@@ -114,7 +114,7 @@ static void deliver_alarm(void)
skew += this_tick - last_tick;
while (skew >= one_tick) {
- alarm_handler(SIGVTALRM, NULL);
+ alarm_handler(SIGVTALRM, NULL, NULL);
skew -= one_tick;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists