diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 13:08:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 13:08:01 -0700 |
commit | 6f58d79598c184dc4f18ceddfaa5fa7483bce0a5 (patch) | |
tree | 2dfb9a7c1e947086c20960d4fa20458266473f0a /arch/sparc64/kernel/ds.c | |
parent | ca1a6ba57c5fca755b4ac7a13395bca2e2e371b1 (diff) | |
parent | 6d008153234c4cccae7bb0170defeea18258db4a (diff) | |
download | blackbird-op-linux-6f58d79598c184dc4f18ceddfaa5fa7483bce0a5.tar.gz blackbird-op-linux-6f58d79598c184dc4f18ceddfaa5fa7483bce0a5.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: exec PT_DTRACE
[SPARC64]: Use shorter list_splice_init() for brevity.
[SPARC64]: Remove most limitations to kernel image size.
Diffstat (limited to 'arch/sparc64/kernel/ds.c')
-rw-r--r-- | arch/sparc64/kernel/ds.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c index bd76482077be..edb74f5a1186 100644 --- a/arch/sparc64/kernel/ds.c +++ b/arch/sparc64/kernel/ds.c @@ -972,8 +972,7 @@ static void process_ds_work(void) LIST_HEAD(todo); spin_lock_irqsave(&ds_lock, flags); - list_splice(&ds_work_list, &todo); - INIT_LIST_HEAD(&ds_work_list); + list_splice_init(&ds_work_list, &todo); spin_unlock_irqrestore(&ds_lock, flags); list_for_each_entry_safe(qp, tmp, &todo, list) { |