---

yaml --- r: 297920 b: refs/heads/master c: f52a759 h: refs/heads/master v: v3
git-mirror · Mar 30, 2012 · d5bf93c · d5bf93c
1 parent 748550e
commit d5bf93c
Show file tree

Hide file tree

Showing 62 changed files with 2,239 additions and 4,435 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9613bebb223dea3179c265dc31e1bb41ae39f321
+refs/heads/master: f52a759327b8b30fbf66da2d75961d2dbc7c6cfa
diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff
@@ -158,7 +158,6 @@ logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
-mach
 mach-types
 mach-types.h
 machtypes.h

diff --git a/trunk/arch/ia64/include/asm/cmpxchg.h b/trunk/arch/ia64/include/asm/cmpxchg.h
@@ -1 +1 @@
-#include <asm/intrinsics.h>
+/* Future home of xchg() and cmpxchg() */
diff --git a/trunk/arch/s390/include/asm/cpu_mf.h b/trunk/arch/s390/include/asm/cpu_mf.h
@@ -12,8 +12,6 @@
 #ifndef _ASM_S390_CPU_MF_H
 #define _ASM_S390_CPU_MF_H
 
-#include <asm/facility.h>
-
 #define CPU_MF_INT_SF_IAE	(1 << 31)	/* invalid entry address */
 #define CPU_MF_INT_SF_ISE	(1 << 30)	/* incorrect SDBT entry */
 #define CPU_MF_INT_SF_PRA	(1 << 29)	/* program request alert */

diff --git a/trunk/arch/s390/include/asm/mmu.h b/trunk/arch/s390/include/asm/mmu.h
@@ -1,8 +1,6 @@
 #ifndef __MMU_H
 #define __MMU_H
 
-#include <linux/errno.h>
-
 typedef struct {
 	atomic_t attach_count;
 	unsigned int flush_mm;

diff --git a/trunk/arch/s390/kernel/lgr.c b/trunk/arch/s390/kernel/lgr.c
@@ -8,7 +8,6 @@
 #include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
-#include <asm/facility.h>
 #include <asm/sysinfo.h>
 #include <asm/ebcdic.h>
 #include <asm/debug.h>

diff --git a/trunk/arch/s390/kernel/perf_cpum_cf.c b/trunk/arch/s390/kernel/perf_cpum_cf.c
@@ -18,7 +18,7 @@
 #include <linux/notifier.h>
 #include <linux/init.h>
 #include <linux/export.h>
-#include <asm/ctl_reg.h>
+#include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/cpu_mf.h>
 

diff --git a/trunk/arch/s390/kernel/perf_event.c b/trunk/arch/s390/kernel/perf_event.c
@@ -15,6 +15,7 @@
 #include <linux/perf_event.h>
 #include <linux/percpu.h>
 #include <linux/export.h>
+#include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/cpu_mf.h>
 #include <asm/lowcore.h>

diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
@@ -50,7 +50,6 @@
 
 #include <asm/ipl.h>
 #include <asm/uaccess.h>
-#include <asm/facility.h>
 #include <asm/smp.h>
 #include <asm/mmu_context.h>
 #include <asm/cpcmd.h>

diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
@@ -32,8 +32,6 @@
 #include <linux/slab.h>
 #include <linux/crash_dump.h>
 #include <asm/asm-offsets.h>
-#include <asm/switch_to.h>
-#include <asm/facility.h>
 #include <asm/ipl.h>
 #include <asm/setup.h>
 #include <asm/irq.h>

diff --git a/trunk/arch/sparc/include/asm/ptrace.h b/trunk/arch/sparc/include/asm/ptrace.h
@@ -165,7 +165,6 @@ struct sparc_stackf {
 #ifdef __KERNEL__
 
 #include <linux/threads.h>
-#include <asm/switch_to.h>
 
 static inline int pt_regs_trap_type(struct pt_regs *regs)
 {

diff --git a/trunk/arch/sparc/kernel/jump_label.c b/trunk/arch/sparc/kernel/jump_label.c
@@ -6,8 +6,6 @@
 #include <linux/jump_label.h>
 #include <linux/memory.h>
 
-#include <asm/cacheflush.h>
-
 #ifdef HAVE_JUMP_LABEL
 
 void arch_jump_label_transform(struct jump_entry *entry,

diff --git a/trunk/arch/sparc/kernel/kgdb_64.c b/trunk/arch/sparc/kernel/kgdb_64.c
@@ -7,7 +7,6 @@
 #include <linux/kdebug.h>
 #include <linux/ftrace.h>
 
-#include <asm/cacheflush.h>
 #include <asm/kdebug.h>
 #include <asm/ptrace.h>
 #include <asm/irq.h>

diff --git a/trunk/fs/btrfs/async-thread.c b/trunk/fs/btrfs/async-thread.c
@@ -171,11 +171,11 @@ static void check_pending_worker_creates(struct btrfs_worker_thread *worker)
 	spin_unlock_irqrestore(&workers->lock, flags);
 }
 
-static noinline void run_ordered_completions(struct btrfs_workers *workers,
+static noinline int run_ordered_completions(struct btrfs_workers *workers,
 					    struct btrfs_work *work)
 {
 	if (!workers->ordered)
-		return;
+		return 0;
 
 	set_bit(WORK_DONE_BIT, &work->flags);
 
@@ -213,6 +213,7 @@ static noinline void run_ordered_completions(struct btrfs_workers *workers,
 	}
 
 	spin_unlock(&workers->order_lock);
+	return 0;
 }
 
 static void put_worker(struct btrfs_worker_thread *worker)
@@ -398,7 +399,7 @@ static int worker_loop(void *arg)
 /*
  * this will wait for all the worker threads to shutdown
  */
-void btrfs_stop_workers(struct btrfs_workers *workers)
+int btrfs_stop_workers(struct btrfs_workers *workers)
 {
 	struct list_head *cur;
 	struct btrfs_worker_thread *worker;
@@ -426,6 +427,7 @@ void btrfs_stop_workers(struct btrfs_workers *workers)
 		put_worker(worker);
 	}
 	spin_unlock_irq(&workers->lock);
+	return 0;
 }
 
 /*
@@ -613,14 +615,14 @@ static struct btrfs_worker_thread *find_worker(struct btrfs_workers *workers)
  * it was taken from.  It is intended for use with long running work functions
  * that make some progress and want to give the cpu up for others.
  */
-void btrfs_requeue_work(struct btrfs_work *work)
+int btrfs_requeue_work(struct btrfs_work *work)
 {
 	struct btrfs_worker_thread *worker = work->worker;
 	unsigned long flags;
 	int wake = 0;
 
 	if (test_and_set_bit(WORK_QUEUED_BIT, &work->flags))
-		return;
+		goto out;
 
 	spin_lock_irqsave(&worker->lock, flags);
 	if (test_bit(WORK_HIGH_PRIO_BIT, &work->flags))
@@ -647,6 +649,9 @@ void btrfs_requeue_work(struct btrfs_work *work)
 	if (wake)
 		wake_up_process(worker->task);
 	spin_unlock_irqrestore(&worker->lock, flags);
+out:
+
+	return 0;
 }
 
 void btrfs_set_work_high_prio(struct btrfs_work *work)

diff --git a/trunk/fs/btrfs/async-thread.h b/trunk/fs/btrfs/async-thread.h
@@ -111,9 +111,9 @@ struct btrfs_workers {
 
 void btrfs_queue_worker(struct btrfs_workers *workers, struct btrfs_work *work);
 int btrfs_start_workers(struct btrfs_workers *workers);
-void btrfs_stop_workers(struct btrfs_workers *workers);
+int btrfs_stop_workers(struct btrfs_workers *workers);
 void btrfs_init_workers(struct btrfs_workers *workers, char *name, int max,
 			struct btrfs_workers *async_starter);
-void btrfs_requeue_work(struct btrfs_work *work);
+int btrfs_requeue_work(struct btrfs_work *work);
 void btrfs_set_work_high_prio(struct btrfs_work *work);
 #endif
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#include <asm/intrinsics.h>
		/* Future home of xchg() and cmpxchg() */