Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/char/ftape/lowlevel/ftape-calibr.c b/drivers/char/ftape/lowlevel/ftape-calibr.c
index 77ee01ecf..d828e831d 100644
--- a/drivers/char/ftape/lowlevel/ftape-calibr.c
+++ b/drivers/char/ftape/lowlevel/ftape-calibr.c
@@ -183,7 +183,7 @@ static void init_clock(void)
 	}
 #elif defined(__alpha__)
 #if CONFIG_FT_ALPHA_CLOCK == 0
-#error You must define and set CONFIG_FT_ALPHA_CLOCK in the Makefile !
+#error You must define and set CONFIG_FT_ALPHA_CLOCK in 'make config' !
 #endif
 	extern struct hwrpb_struct *hwrpb;
 	TRACE_FUN(ft_t_any);
diff --git a/drivers/char/ftape/lowlevel/ftape-ctl.c b/drivers/char/ftape/lowlevel/ftape-ctl.c
index 6ec456f00..4196458d0 100644
--- a/drivers/char/ftape/lowlevel/ftape-ctl.c
+++ b/drivers/char/ftape/lowlevel/ftape-ctl.c
@@ -794,8 +794,8 @@ void ftape_disable(void)
 			      i, *ft_buffer[i]->address);
 		}
 	}
-	if (sigtestsetmask(&current->signal, _DONT_BLOCK) && 
-	    !(sigtestsetmask(&current->signal, _NEVER_BLOCK)) &&
+	if (sigtestsetmask(&current->pending.signal, _DONT_BLOCK) && 
+	    !(sigtestsetmask(&current->pending.signal, _NEVER_BLOCK)) &&
 	    ftape_tape_running) {
 		TRACE(ft_t_warn,
 		      "Interrupted by fatal signal and tape still running");
diff --git a/drivers/char/ftape/lowlevel/ftape-rw.c b/drivers/char/ftape/lowlevel/ftape-rw.c
index 2ae96344e..2c14f468e 100644
--- a/drivers/char/ftape/lowlevel/ftape-rw.c
+++ b/drivers/char/ftape/lowlevel/ftape-rw.c
@@ -433,7 +433,7 @@ int ftape_dumb_stop(void)
 			result = ftape_ready_wait(ftape_timeout.pause,&status);
 		}
 	} while (ftape_tape_running
-		 && !(sigtestsetmask(&current->signal, _NEVER_BLOCK)));
+		 && !(sigtestsetmask(&current->pending.signal, _NEVER_BLOCK)));
 #ifndef TESTING
 	ft_location.known = 0;
 #endif
@@ -661,7 +661,7 @@ static int seek_forward(int segment_id, int fast)
 		 *  to find a way to skip an EMPTY_SEGMENT. !!! FIXME !!!
 		 */
 		if (ftape_read_id() < 0 || !ft_location.known ||
-		    sigtestsetmask(&current->signal, _DONT_BLOCK)) {
+		    sigtestsetmask(&current->pending.signal, _DONT_BLOCK)) {
 			ft_location.known = 0;
 			if (!ftape_tape_running ||
 			    ++failures > FT_SECTORS_PER_SEGMENT) {
@@ -776,7 +776,7 @@ static int skip_reverse(int segment_id, int *pstatus)
 		fast_seek(count, 1);
 		logical_forward();
 		if (ftape_read_id() < 0 || !ft_location.known ||
-		    (sigtestsetmask(&current->signal, _DONT_BLOCK))) {
+		    (sigtestsetmask(&current->pending.signal, _DONT_BLOCK))) {
 			if ((!ftape_tape_running && !ft_location.known) ||
 			    ++failures > FT_SECTORS_PER_SEGMENT) {
 				TRACE_ABORT(-EIO, ft_t_err,
@@ -1002,7 +1002,7 @@ int ftape_start_tape(int segment_id, int sector_offset)
 	while (result < 0     &&
 	       retry++ <= 5   &&
 	       !ft_failure &&
-	       !(sigtestsetmask(&current->signal, _DONT_BLOCK))) {
+	       !(sigtestsetmask(&current->pending.signal, _DONT_BLOCK))) {
 		
 		if (retry && start_offset < 5) {
 			start_offset ++;
diff --git a/drivers/char/ftape/lowlevel/ftape-tracing.h b/drivers/char/ftape/lowlevel/ftape-tracing.h
index e0f7e0f4f..77af02f69 100644
--- a/drivers/char/ftape/lowlevel/ftape-tracing.h
+++ b/drivers/char/ftape/lowlevel/ftape-tracing.h
@@ -171,7 +171,7 @@ extern void ftape_trace_log (const char *file, const char *name);
  *  but rather into ftape-rw.h (maybe)
  */
 #define FT_SIGNAL_EXIT(sig_mask)					\
-	if (sigtestsetmask(&current->signal, sig_mask)) {		\
+	if (sigtestsetmask(&current->pending.signal, sig_mask)) {	\
 		TRACE_ABORT(-EINTR,					\
 			    ft_t_warn,					\
 			    "interrupted by non-blockable signal");	\