Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91742
b: refs/heads/master
c: f526448
h: refs/heads/master
v: v3
  • Loading branch information
Pavel Machek authored and Jesper Juhl committed Apr 21, 2008
1 parent 9404074 commit 8cb5e7c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1fb7c6e4cba35b5e7cef88b58d0a2ad164d801a5
refs/heads/master: f5264481c8049673e2cc8c7aca410931f571ba2d
2 changes: 1 addition & 1 deletion trunk/fs/select.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout)
wait = NULL;
if (retval || !*timeout || signal_pending(current))
break;
if(table.error) {
if (table.error) {
retval = table.error;
break;
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ void flush_signals(struct task_struct *t)
unsigned long flags;

spin_lock_irqsave(&t->sighand->siglock, flags);
clear_tsk_thread_flag(t,TIF_SIGPENDING);
clear_tsk_thread_flag(t, TIF_SIGPENDING);
flush_sigqueue(&t->pending);
flush_sigqueue(&t->signal->shared_pending);
spin_unlock_irqrestore(&t->sighand->siglock, flags);
Expand Down Expand Up @@ -424,7 +424,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
}
if (signr &&
((info->si_code & __SI_MASK) == __SI_TIMER) &&
info->si_sys_private){
info->si_sys_private) {
/*
* Release the siglock to ensure proper locking order
* of timer locks outside of siglocks. Note, we leave
Expand Down
3 changes: 1 addition & 2 deletions trunk/kernel/stop_machine.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ static void restart_machine(void)
preempt_enable_no_resched();
}

struct stop_machine_data
{
struct stop_machine_data {
int (*fn)(void *);
void *data;
struct completion done;
Expand Down
4 changes: 2 additions & 2 deletions trunk/mm/pdflush.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include <linux/gfp.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h> // Needed by writeback.h
#include <linux/writeback.h> // Prototypes pdflush_operation()
#include <linux/fs.h> /* Needed by writeback.h */
#include <linux/writeback.h> /* Prototypes pdflush_operation() */
#include <linux/kthread.h>
#include <linux/cpuset.h>
#include <linux/freezer.h>
Expand Down

0 comments on commit 8cb5e7c

Please sign in to comment.