git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
s390
/
kernel
/
vtime.c
diff --git
a/arch/s390/kernel/vtime.c
b/arch/s390/kernel/vtime.c
index
dfe6f08
..
2306cd8
100644
(file)
--- a/
arch/s390/kernel/vtime.c
+++ b/
arch/s390/kernel/vtime.c
@@
-7,7
+7,6
@@
* Author(s): Jan Glauber <jan.glauber@de.ibm.com>
*/
* Author(s): Jan Glauber <jan.glauber@de.ibm.com>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/time.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/time.h>
@@
-356,7
+355,7
@@
static void internal_add_vtimer(struct vtimer_list *timer)
set_vtimer(event->expires);
spin_unlock_irqrestore(&vt_list->lock, flags);
set_vtimer(event->expires);
spin_unlock_irqrestore(&vt_list->lock, flags);
- /* release CPU aquired in prepare_vtimer or mod_virt_timer() */
+ /* release CPU a
c
quired in prepare_vtimer or mod_virt_timer() */
put_cpu();
}
put_cpu();
}