Merge cantab.net:/home/src/ntfs-2.6

into cantab.net:/home/src/ntfs-2.6-devel

7 files changed, 52 insertions, 18 deletions

diff --git a/kernel/dma.c b/kernel/dma.c
index af1d982a0c57..940d02c50879 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -58,14 +58,7 @@ struct dma_chan {
 };
 
 static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = {
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 1, "cascade" },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 }
+	[4] = { 1, "cascade" },
 };
 
 
diff --git a/kernel/futex.c b/kernel/futex.c
index abae250cf73d..d9b9694fd2e8 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -276,7 +276,7 @@ static void wake_futex(struct futex_q *q)
 	 * The waiting task can free the futex_q as soon as this is written,
 	 * without taking any locks.  This must come last.
 	 */
-	q->lock_ptr = 0;
+	q->lock_ptr = NULL;
 }
 
 /*
diff --git a/kernel/itimer.c b/kernel/itimer.c
index 1a95e09b41b6..6918cb7460a8 100644
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -134,7 +134,7 @@ asmlinkage long sys_setitimer(int which,
 	} else
 		memset((char *) &set_buffer, 0, sizeof(set_buffer));
 
-	error = do_setitimer(which, &set_buffer, ovalue ? &get_buffer : 0);
+	error = do_setitimer(which, &set_buffer, ovalue ? &get_buffer : NULL);
 	if (error || !ovalue)
 		return error;
 
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 50b776464964..c18d947b582b 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -210,7 +210,7 @@ static __init int init_posix_timers(void)
 	register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
 
 	posix_timers_cache = kmem_cache_create("posix_timers_cache",
-					sizeof (struct k_itimer), 0, 0, 0, 0);
+					sizeof (struct k_itimer), 0, 0, NULL, NULL);
 	idr_init(&posix_timers_id);
 
 	return 0;
@@ -399,7 +399,7 @@ static struct k_itimer * alloc_posix_timer(void)
 	memset(tmr, 0, sizeof (struct k_itimer));
 	if (unlikely(!(tmr->sigq = sigqueue_alloc()))) {
 		kmem_cache_free(posix_timers_cache, tmr);
-		tmr = 0;
+		tmr = NULL;
 	}
 	return tmr;
 }
@@ -431,7 +431,7 @@ sys_timer_create(clockid_t which_clock,
 	int error = 0;
 	struct k_itimer *new_timer = NULL;
 	int new_timer_id;
-	struct task_struct *process = 0;
+	struct task_struct *process = NULL;
 	unsigned long flags;
 	sigevent_t event;
 	int it_id_set = IT_ID_NOT_SET;
@@ -521,7 +521,7 @@ sys_timer_create(clockid_t which_clock,
 				get_task_struct(process);
 			} else {
 				spin_unlock_irqrestore(&process->sighand->siglock, flags);
-				process = 0;
+				process = NULL;
 			}
 		}
 		read_unlock(&tasklist_lock);
diff --git a/kernel/power/pm.c b/kernel/power/pm.c
index 09d55363cefc..d1bc943072d4 100644
--- a/kernel/power/pm.c
+++ b/kernel/power/pm.c
@@ -282,7 +282,7 @@ struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from)
 			return dev;
 		entry = entry->next;
 	}
-	return 0;
+	return NULL;
 }
 
 EXPORT_SYMBOL(pm_register);
diff --git a/kernel/printk.c b/kernel/printk.c
index 9e34ce41beb6..8b28dd2b4a98 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -684,6 +684,47 @@ void console_unblank(void)
 EXPORT_SYMBOL(console_unblank);
 
 /*
+ * Return the console tty driver structure and its associated index
+ */
+struct tty_driver *console_device(int *index)
+{
+	struct console *c;
+	struct tty_driver *driver = NULL;
+
+	acquire_console_sem();
+	for (c = console_drivers; c != NULL; c = c->next) {
+		if (!c->device)
+			continue;
+		driver = c->device(c, index);
+		if (driver)
+			break;
+	}
+	release_console_sem();
+	return driver;
+}
+
+/*
+ * Prevent further output on the passed console device so that (for example)
+ * serial drivers can disable console output before suspending a port, and can
+ * re-enable output afterwards.
+ */
+void console_stop(struct console *console)
+{
+	acquire_console_sem();
+	console->flags &= ~CON_ENABLED;
+	release_console_sem();
+}
+EXPORT_SYMBOL(console_stop);
+
+void console_start(struct console *console)
+{
+	acquire_console_sem();
+	console->flags |= CON_ENABLED;
+	release_console_sem();
+}
+EXPORT_SYMBOL(console_start);
+
+/*
  * The console driver calls this routine during kernel initialization
  * to register the console printing procedure with printk() and to
  * print any messages that were printed by the kernel before the
diff --git a/kernel/signal.c b/kernel/signal.c
index 18048ca42f0e..7a8cc4687c71 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -264,7 +264,7 @@ next_signal(struct sigpending *pending, sigset_t *mask)
 
 static struct sigqueue *__sigqueue_alloc(void)
 {
-	struct sigqueue *q = 0;
+	struct sigqueue *q = NULL;
 
 	if (atomic_read(&current->user->sigpending) <
 			current->rlim[RLIMIT_SIGPENDING].rlim_cur)
@@ -272,7 +272,7 @@ static struct sigqueue *__sigqueue_alloc(void)
 	if (q) {
 		INIT_LIST_HEAD(&q->list);
 		q->flags = 0;
-		q->lock = 0;
+		q->lock = NULL;
 		q->user = get_uid(current->user);
 		atomic_inc(&q->user->sigpending);
 	}
@@ -454,7 +454,7 @@ unblock_all_signals(void)
 
 static inline int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
 {
-	struct sigqueue *q, *first = 0;
+	struct sigqueue *q, *first = NULL;
 	int still_pending = 0;
 
 	if (unlikely(!sigismember(&list->signal, sig)))