103 files changed, 777 insertions, 588 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b22db521cec1..9c592aa0280c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2232,7 +2232,23 @@ P:	Martin Schwidefsky
 M:      schwidefsky@de.ibm.com
 M:      linux390@de.ibm.com
 L:      linux-390@vm.marist.edu
-W:      http://oss.software.ibm.com/developerworks/opensource/linux390
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+S390 NETWORK DRIVERS
+P:      Frank Pavlic
+M:      fpavlic@de.ibm.com
+M:      linux390@de.ibm.com
+L:      linux-390@vm.marist.edu
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+S390 ZFCP DRIVER
+P:      Andreas Herrmann
+M:      aherrman@de.ibm.com
+M:      linux390@de.ibm.com
+L:      linux-390@vm.marist.edu
+W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 SAA7146 VIDEO4LINUX-2 DRIVER
diff --git a/Makefile b/Makefile
index a1158d1c051e..74d67b2c35d9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 16
-EXTRAVERSION =-rc2
+EXTRAVERSION =-rc3
 NAME=Sliding Snow Leopard
 # *DOCUMENTATION*
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index 5884469f6bfe..2bee6499edd9 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -398,7 +398,11 @@ ignore_int:
        pushl 32(%esp)
        pushl 40(%esp)
        pushl $int_msg
+#ifdef CONFIG_EARLY_PRINTK
+        call early_printk
+#else
        call printk
+#endif
        addl $(5*4),%esp
        popl %ds
        popl %es
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 5a8b3fb6d27b..ac687d00a1ce 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -299,7 +299,7 @@ ENTRY(sys_call_table)
        .long sys_mknodat
        .long sys_fchownat
        .long sys_futimesat
-        .long sys_newfstatat            /* 300 */
+        .long sys_fstatat64             /* 300 */
        .long sys_unlinkat
        .long sys_renameat
        .long sys_linkat
diff --git a/arch/m68k/fpsp040/bindec.S b/arch/m68k/fpsp040/bindec.S
index 3ba446a99a12..72f1159cb804 100644
--- a/arch/m68k/fpsp040/bindec.S
+++ b/arch/m68k/fpsp040/bindec.S
@@ -131,9 +131,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |BINDEC    idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/binstr.S b/arch/m68k/fpsp040/binstr.S
index d53555c0a2b6..8a05ba92a8a0 100644
--- a/arch/m68k/fpsp040/binstr.S
+++ b/arch/m68k/fpsp040/binstr.S
@@ -60,9 +60,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |BINSTR    idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/bugfix.S b/arch/m68k/fpsp040/bugfix.S
index 942c4f6f4fd1..3bb9c84bb058 100644
--- a/arch/m68k/fpsp040/bugfix.S
+++ b/arch/m68k/fpsp040/bugfix.S
@@ -152,9 +152,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |BUGFIX    idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/decbin.S b/arch/m68k/fpsp040/decbin.S
index 2160609e328d..16ed796bad87 100644
--- a/arch/m68k/fpsp040/decbin.S
+++ b/arch/m68k/fpsp040/decbin.S
@@ -69,9 +69,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |DECBIN    idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/do_func.S b/arch/m68k/fpsp040/do_func.S
index 81f6a9856dce..3eff99a80413 100644
--- a/arch/m68k/fpsp040/do_func.S
+++ b/arch/m68k/fpsp040/do_func.S
@@ -22,9 +22,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 DO_FUNC:        |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/fpsp.h b/arch/m68k/fpsp040/fpsp.h
index 984a4eb8010a..5df4cd772934 100644
--- a/arch/m68k/fpsp040/fpsp.h
+++ b/arch/m68k/fpsp040/fpsp.h
@@ -5,9 +5,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |       fpsp.h --- stack frame offsets during FPSP exception handling
 |
diff --git a/arch/m68k/fpsp040/gen_except.S b/arch/m68k/fpsp040/gen_except.S
index 401d06f39f73..3642cb7e3641 100644
--- a/arch/m68k/fpsp040/gen_except.S
+++ b/arch/m68k/fpsp040/gen_except.S
@@ -29,9 +29,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 GEN_EXCEPT:    |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/get_op.S b/arch/m68k/fpsp040/get_op.S
index c7c2f3727425..64c36d79ef83 100644
--- a/arch/m68k/fpsp040/get_op.S
+++ b/arch/m68k/fpsp040/get_op.S
@@ -54,9 +54,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 GET_OP:    |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/kernel_ex.S b/arch/m68k/fpsp040/kernel_ex.S
index 476b711967ce..45bcf3455d34 100644
--- a/arch/m68k/fpsp040/kernel_ex.S
+++ b/arch/m68k/fpsp040/kernel_ex.S
@@ -12,9 +12,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 KERNEL_EX:    |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/res_func.S b/arch/m68k/fpsp040/res_func.S
index 8f6b95217865..d9cdf4383545 100644
--- a/arch/m68k/fpsp040/res_func.S
+++ b/arch/m68k/fpsp040/res_func.S
@@ -16,9 +16,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 RES_FUNC:    |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/round.S b/arch/m68k/fpsp040/round.S
index 00f98068783f..f84ae0dd4358 100644
--- a/arch/m68k/fpsp040/round.S
+++ b/arch/m68k/fpsp040/round.S
@@ -8,9 +8,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |ROUND  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sacos.S b/arch/m68k/fpsp040/sacos.S
index 83b00ab1c48f..513c7cca7318 100644
--- a/arch/m68k/fpsp040/sacos.S
+++ b/arch/m68k/fpsp040/sacos.S
@@ -38,9 +38,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SACOS  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sasin.S b/arch/m68k/fpsp040/sasin.S
index 5647a6043903..2a269a58ceaa 100644
--- a/arch/m68k/fpsp040/sasin.S
+++ b/arch/m68k/fpsp040/sasin.S
@@ -38,9 +38,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SASIN  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/satan.S b/arch/m68k/fpsp040/satan.S
index 20dae222d51e..c8a664998f92 100644
--- a/arch/m68k/fpsp040/satan.S
+++ b/arch/m68k/fpsp040/satan.S
@@ -43,9 +43,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |satan  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/satanh.S b/arch/m68k/fpsp040/satanh.S
index 20f07810bcda..ba91f77a7571 100644
--- a/arch/m68k/fpsp040/satanh.S
+++ b/arch/m68k/fpsp040/satanh.S
@@ -45,9 +45,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |satanh idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/scale.S b/arch/m68k/fpsp040/scale.S
index 5c9b805265f2..04829dd4f1f4 100644
--- a/arch/m68k/fpsp040/scale.S
+++ b/arch/m68k/fpsp040/scale.S
@@ -21,9 +21,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SCALE    idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/scosh.S b/arch/m68k/fpsp040/scosh.S
index e81edbb87642..07d3a4d7c86d 100644
--- a/arch/m68k/fpsp040/scosh.S
+++ b/arch/m68k/fpsp040/scosh.S
@@ -49,9 +49,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SCOSH  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/setox.S b/arch/m68k/fpsp040/setox.S
index 0aa75f9bf7d1..145af5447581 100644
--- a/arch/m68k/fpsp040/setox.S
+++ b/arch/m68k/fpsp040/setox.S
@@ -331,9 +331,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |setox  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sgetem.S b/arch/m68k/fpsp040/sgetem.S
index 0fcbd045ba75..d9234f4aed57 100644
--- a/arch/m68k/fpsp040/sgetem.S
+++ b/arch/m68k/fpsp040/sgetem.S
@@ -24,9 +24,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SGETEM idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sint.S b/arch/m68k/fpsp040/sint.S
index 0f9bd28e55a0..0e92d4e5d231 100644
--- a/arch/m68k/fpsp040/sint.S
+++ b/arch/m68k/fpsp040/sint.S
@@ -51,9 +51,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SINT    idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S
index a1629194e3fd..a8f41615d94a 100644
--- a/arch/m68k/fpsp040/skeleton.S
+++ b/arch/m68k/fpsp040/skeleton.S
@@ -30,9 +30,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |
 |       Modified for Linux-1.3.x by Jes Sorensen (jds@kom.auc.dk)
diff --git a/arch/m68k/fpsp040/slog2.S b/arch/m68k/fpsp040/slog2.S
index 517fa4563246..fac2c738382e 100644
--- a/arch/m68k/fpsp040/slog2.S
+++ b/arch/m68k/fpsp040/slog2.S
@@ -96,9 +96,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SLOG2    idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/slogn.S b/arch/m68k/fpsp040/slogn.S
index 2aaa0725c035..d98eaf641ec4 100644
--- a/arch/m68k/fpsp040/slogn.S
+++ b/arch/m68k/fpsp040/slogn.S
@@ -63,9 +63,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |slogn  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/smovecr.S b/arch/m68k/fpsp040/smovecr.S
index a0127fa55e9c..73c36512081b 100644
--- a/arch/m68k/fpsp040/smovecr.S
+++ b/arch/m68k/fpsp040/smovecr.S
@@ -15,9 +15,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SMOVECR        idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/srem_mod.S b/arch/m68k/fpsp040/srem_mod.S
index 8c8d7f50cc68..a27e70c9a0eb 100644
--- a/arch/m68k/fpsp040/srem_mod.S
+++ b/arch/m68k/fpsp040/srem_mod.S
@@ -66,9 +66,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 SREM_MOD:    |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/ssin.S b/arch/m68k/fpsp040/ssin.S
index 043c91cdd657..a1ef8e01bf06 100644
--- a/arch/m68k/fpsp040/ssin.S
+++ b/arch/m68k/fpsp040/ssin.S
@@ -83,9 +83,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SSIN   idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/ssinh.S b/arch/m68k/fpsp040/ssinh.S
index c8b3308bb143..8a560edc7653 100644
--- a/arch/m68k/fpsp040/ssinh.S
+++ b/arch/m68k/fpsp040/ssinh.S
@@ -49,9 +49,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |SSINH  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/stan.S b/arch/m68k/fpsp040/stan.S
index b5c2a196e617..f8553aaececb 100644
--- a/arch/m68k/fpsp040/stan.S
+++ b/arch/m68k/fpsp040/stan.S
@@ -50,9 +50,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |STAN   idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/stanh.S b/arch/m68k/fpsp040/stanh.S
index 33b009802243..7e12e59ee8c7 100644
--- a/arch/m68k/fpsp040/stanh.S
+++ b/arch/m68k/fpsp040/stanh.S
@@ -49,9 +49,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |STANH  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sto_res.S b/arch/m68k/fpsp040/sto_res.S
index 0cdca3b060ad..484b47d4eaad 100644
--- a/arch/m68k/fpsp040/sto_res.S
+++ b/arch/m68k/fpsp040/sto_res.S
@@ -19,9 +19,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 STO_RES:        |idnt   2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/stwotox.S b/arch/m68k/fpsp040/stwotox.S
index 4e3c1407d3df..0d5e6a1436a6 100644
--- a/arch/m68k/fpsp040/stwotox.S
+++ b/arch/m68k/fpsp040/stwotox.S
@@ -76,9 +76,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |STWOTOX        idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/tbldo.S b/arch/m68k/fpsp040/tbldo.S
index fe60cf4d20d7..fd5c37a5a2b9 100644
--- a/arch/m68k/fpsp040/tbldo.S
+++ b/arch/m68k/fpsp040/tbldo.S
@@ -17,9 +17,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |TBLDO  idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/util.S b/arch/m68k/fpsp040/util.S
index 452f3d65857b..65b26fa88c60 100644
--- a/arch/m68k/fpsp040/util.S
+++ b/arch/m68k/fpsp040/util.S
@@ -16,9 +16,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 |UTIL   idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_bsun.S b/arch/m68k/fpsp040/x_bsun.S
index 039247b09c8b..d5a576bfac79 100644
--- a/arch/m68k/fpsp040/x_bsun.S
+++ b/arch/m68k/fpsp040/x_bsun.S
@@ -13,9 +13,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_BSUN: |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_fline.S b/arch/m68k/fpsp040/x_fline.S
index 3917710b0fde..264e126d1db7 100644
--- a/arch/m68k/fpsp040/x_fline.S
+++ b/arch/m68k/fpsp040/x_fline.S
@@ -13,9 +13,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_FLINE:        |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_operr.S b/arch/m68k/fpsp040/x_operr.S
index b0f54bcb49a7..e2c371c3a45d 100644
--- a/arch/m68k/fpsp040/x_operr.S
+++ b/arch/m68k/fpsp040/x_operr.S
@@ -43,9 +43,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_OPERR:        |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_ovfl.S b/arch/m68k/fpsp040/x_ovfl.S
index 22cb8b42c7b6..6fe4989ee31f 100644
--- a/arch/m68k/fpsp040/x_ovfl.S
+++ b/arch/m68k/fpsp040/x_ovfl.S
@@ -35,9 +35,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_OVFL: |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_snan.S b/arch/m68k/fpsp040/x_snan.S
index 039af573312e..4ed766416378 100644
--- a/arch/m68k/fpsp040/x_snan.S
+++ b/arch/m68k/fpsp040/x_snan.S
@@ -22,9 +22,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_SNAN: |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_store.S b/arch/m68k/fpsp040/x_store.S
index 4282fa67d449..402dc0c0ebc0 100644
--- a/arch/m68k/fpsp040/x_store.S
+++ b/arch/m68k/fpsp040/x_store.S
@@ -11,9 +11,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_STORE:        |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_unfl.S b/arch/m68k/fpsp040/x_unfl.S
index 077fcc230fcc..eb772ff3b812 100644
--- a/arch/m68k/fpsp040/x_unfl.S
+++ b/arch/m68k/fpsp040/x_unfl.S
@@ -21,9 +21,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_UNFL: |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_unimp.S b/arch/m68k/fpsp040/x_unimp.S
index 920cb9410e9e..6f382b21228b 100644
--- a/arch/m68k/fpsp040/x_unimp.S
+++ b/arch/m68k/fpsp040/x_unimp.S
@@ -22,9 +22,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_UNIMP:        |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_unsupp.S b/arch/m68k/fpsp040/x_unsupp.S
index 4ec57285b683..d7cf46208c62 100644
--- a/arch/m68k/fpsp040/x_unsupp.S
+++ b/arch/m68k/fpsp040/x_unsupp.S
@@ -23,9 +23,8 @@
 |               Copyright (C) Motorola, Inc. 1990
 |                       All Rights Reserved
 |
-|       THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
+|       For details on the license for this file, please see the
-|       The copyright notice above does not evidence any
+|       file, README, in this same directory.
-|       actual or intended publication of such source code.
 X_UNSUPP:       |idnt    2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 3525c91204d4..f8d0cd540a06 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc1
+# Linux kernel version: 2.6.16-rc2
-# Thu Jan 19 10:58:53 2006
+# Wed Feb  8 10:44:39 2006
 #
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -12,7 +12,6 @@ CONFIG_S390=y
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -154,6 +153,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
+# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -607,6 +607,7 @@ CONFIG_MSDOS_PARTITION=y
 # Instrumentation Support
 #
 # CONFIG_PROFILING is not set
+# CONFIG_STATISTICS is not set
 #
 # Kernel hacking
@@ -624,7 +625,7 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_VM is not set
 CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index cc20f0e3a7d3..2d021626c1a6 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -905,6 +905,26 @@ asmlinkage long sys32_fstat64(unsigned long fd, struct stat64_emu31 __user * sta
        return ret;
 }
+asmlinkage long sys32_fstatat(unsigned int dfd, char __user *filename,
+                              struct stat64_emu31 __user* statbuf, int flag)
+{
+        struct kstat stat;
+        int error = -EINVAL;
+        if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)
+                goto out;
+        if (flag & AT_SYMLINK_NOFOLLOW)
+                error = vfs_lstat_fd(dfd, filename, &stat);
+        else
+                error = vfs_stat_fd(dfd, filename, &stat);
+        if (!error)
+                error = cp_stat64(statbuf, &stat);
+out:
+        return error;
+}
 /*
 * Linux/i386 didn't use to be able to handle more than
 * 4 system call parameters, so these system calls used a memory
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 83b33fe1923c..dd2d6c3e8df8 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1523,13 +1523,13 @@ compat_sys_futimesat_wrapper:
        llgtr   %r4,%r4                 # struct timeval *
        jg      compat_sys_futimesat
-        .globl compat_sys_newfstatat_wrapper
+        .globl sys32_fstatat_wrapper
-compat_sys_newfstatat_wrapper:
+sys32_fstatat_wrapper:
        llgfr   %r2,%r2                 # unsigned int
        llgtr   %r3,%r3                 # char *
-        llgtr   %r4,%r4                 # struct stat *
+        llgtr   %r4,%r4                 # struct stat64 *
        lgfr    %r5,%r5                 # int
-        jg      compat_sys_newfstatat
+        jg      sys32_fstatat
        .globl sys_unlinkat_wrapper
 sys_unlinkat_wrapper:
@@ -1602,3 +1602,8 @@ compat_sys_ppoll_wrapper:
        llgtr   %r5,%r5                 # const sigset_t *
        llgfr   %r6,%r6                 # size_t
        jg      compat_sys_ppoll
+        .globl sys_unshare_wrapper
+sys_unshare_wrapper:
+        llgfr   %r2,%r2                 # unsigned long
+        jg      sys_unshare
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index f0ed5c642c74..bad81b5832db 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -12,15 +12,16 @@
 * on the S390 architecture.
 */
-#include <asm/cio.h>
-#include <asm/setup.h>
 #include <linux/device.h>
 #include <linux/mm.h>
 #include <linux/kexec.h>
 #include <linux/delay.h>
+#include <asm/cio.h>
+#include <asm/setup.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/system.h>
+#include <asm/smp.h>
 static void kexec_halt_all_cpus(void *);
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index cbfcfd02a43a..0d1ad5dbe2b1 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -52,7 +52,7 @@ extern volatile int __cpu_logical_map[];
 struct _lowcore *lowcore_ptr[NR_CPUS];
 cpumask_t cpu_online_map;
-cpumask_t cpu_possible_map;
+cpumask_t cpu_possible_map = CPU_MASK_ALL;
 static struct task_struct *current_set[NR_CPUS];
@@ -514,9 +514,6 @@ __init smp_check_cpus(unsigned int max_cpus)
                num_cpus++;
        }
-        for (cpu = 1; cpu < max_cpus; cpu++)
-                cpu_set(cpu, cpu_possible_map);
        printk("Detected %d CPU's\n",(int) num_cpus);
        printk("Boot cpu address %2X\n", boot_cpu_addr);
 }
@@ -810,7 +807,6 @@ void __devinit smp_prepare_boot_cpu(void)
        cpu_set(0, cpu_online_map);
        cpu_set(0, cpu_present_map);
-        cpu_set(0, cpu_possible_map);
        S390_lowcore.percpu_offset = __per_cpu_offset[0];
        current_set[0] = current;
 }
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 3280345efacd..84921fe8d266 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -301,7 +301,7 @@ SYSCALL(sys_mkdirat,sys_mkdirat,sys_mkdirat_wrapper)
 SYSCALL(sys_mknodat,sys_mknodat,sys_mknodat_wrapper)    /* 290 */
 SYSCALL(sys_fchownat,sys_fchownat,sys_fchownat_wrapper)
 SYSCALL(sys_futimesat,sys_futimesat,compat_sys_futimesat_wrapper)
-SYSCALL(sys_newfstatat,sys_newfstatat,compat_sys_newfstatat_wrapper)
+SYSCALL(sys_fstatat64,sys_newfstatat,sys32_fstatat_wrapper)
 SYSCALL(sys_unlinkat,sys_unlinkat,sys_unlinkat_wrapper)
 SYSCALL(sys_renameat,sys_renameat,sys_renameat_wrapper) /* 295 */
 SYSCALL(sys_linkat,sys_linkat,sys_linkat_wrapper)
@@ -311,3 +311,4 @@ SYSCALL(sys_fchmodat,sys_fchmodat,sys_fchmodat_wrapper)
 SYSCALL(sys_faccessat,sys_faccessat,sys_faccessat_wrapper)      /* 300 */
 SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6_wrapper)
 SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll_wrapper)
+SYSCALL(sys_unshare,sys_unshare,sys_unshare_wrapper)
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index ada4535d0161..00dee176c08e 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -677,7 +677,7 @@ ia32_sys_call_table:
        .quad sys_mknodat
        .quad sys_fchownat
        .quad compat_sys_futimesat
-        .quad compat_sys_newfstatat     /* 300 */
+        .quad sys32_fstatat             /* 300 */
        .quad sys_unlinkat
        .quad sys_renameat
        .quad sys_linkat
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 54481af5344a..2bc55af95419 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -180,6 +180,28 @@ sys32_fstat64(unsigned int fd, struct stat64 __user *statbuf)
        return ret;
 }
+asmlinkage long
+sys32_fstatat(unsigned int dfd, char __user *filename,
+              struct stat64 __user* statbuf, int flag)
+{
+        struct kstat stat;
+        int error = -EINVAL;
+        if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)
+                goto out;
+        if (flag & AT_SYMLINK_NOFOLLOW)
+                error = vfs_lstat_fd(dfd, filename, &stat);
+        else
+                error = vfs_stat_fd(dfd, filename, &stat);
+        if (!error)
+                error = cp_stat64(statbuf, &stat);
+out:
+        return error;
+}
 /*
 * Linux/i386 didn't use to be able to handle more than
 * 4 system call parameters, so these system calls used a memory
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 6147770b4347..7a0a3e8d5d72 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -708,7 +708,7 @@ static void setup_APIC_timer(unsigned int clocks)
        local_irq_save(flags);
        /* wait for irq slice */
-        if (vxtime.hpet_address) {
+        if (vxtime.hpet_address && hpet_use_timer) {
                int trigger = hpet_readl(HPET_T0_CMP);
                while (hpet_readl(HPET_COUNTER) >= trigger)
                        /* do nothing */ ;
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 2fe23a6c361b..dd0718dc178b 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -310,7 +310,7 @@ void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int di
        for (i = 0; i < nents; i++) {
                struct scatterlist *s = &sg[i];
-                if (!s->dma_length || !s->length)
+                if (!s->dma_length)
                        break;
                dma_unmap_single(dev, s->dma_address, s->dma_length, dir);
        }
@@ -364,7 +364,6 @@ static int __dma_map_cont(struct scatterlist *sg, int start, int stopat,
                
                BUG_ON(i > start && s->offset);
                if (i == start) {
-                        *sout = *s; 
                        sout->dma_address = iommu_bus_base;
                        sout->dma_address += iommu_page*PAGE_SIZE + s->offset;
                        sout->dma_length = s->length;
@@ -379,7 +378,7 @@ static int __dma_map_cont(struct scatterlist *sg, int start, int stopat,
                        SET_LEAK(iommu_page);
                        addr += PAGE_SIZE;
                        iommu_page++;
-        } 
+                }
        } 
        BUG_ON(iommu_page - iommu_start != pages);      
        return 0;
@@ -391,7 +390,6 @@ static inline int dma_map_cont(struct scatterlist *sg, int start, int stopat,
 {
        if (!need) { 
                BUG_ON(stopat - start != 1);
-                *sout = sg[start]; 
                sout->dma_length = sg[start].length; 
                return 0;
        } 
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index dba7237be5c1..3c58c30506a1 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -59,7 +59,7 @@ static int notsc __initdata = 0;
 unsigned int cpu_khz;                                   /* TSC clocks / usec, not used here */
 static unsigned long hpet_period;                       /* fsecs / HPET clock */
 unsigned long hpet_tick;                                /* HPET clocks / interrupt */
-static int hpet_use_timer;                              /* Use counter of hpet for time keeping, otherwise PIT */
+int hpet_use_timer;                             /* Use counter of hpet for time keeping, otherwise PIT */
 unsigned long vxtime_hz = PIT_TICK_RATE;
 int report_lost_ticks;                          /* command line option */
 unsigned long long monotonic_base;
@@ -326,7 +326,10 @@ static noinline void handle_lost_ticks(int lost, struct pt_regs *regs)
            print_symbol("rip %s\n", regs->rip);
            if (vxtime.mode == VXTIME_TSC && vxtime.hpet_address) {
                    printk(KERN_WARNING "Falling back to HPET\n");
-                    vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick;
+                    if (hpet_use_timer)
+                        vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick;
+                    else
+                        vxtime.last = hpet_readl(HPET_COUNTER);
                    vxtime.mode = VXTIME_HPET;
                    do_gettimeoffset = do_gettimeoffset_hpet;
            }
@@ -988,7 +991,10 @@ void __init time_init_gtod(void)
                notsc = 1;
        if (vxtime.hpet_address && notsc) {
                timetype = hpet_use_timer ? "HPET" : "PIT/HPET";
-                vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick;
+                if (hpet_use_timer)
+                        vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick;
+                else
+                        vxtime.last = hpet_readl(HPET_COUNTER);
                vxtime.mode = VXTIME_HPET;
                do_gettimeoffset = do_gettimeoffset_hpet;
 #ifdef CONFIG_X86_PM_TIMER
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index ee1b2da9e5e7..28d50dc540e8 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -90,6 +90,20 @@ static inline void conditional_sti(struct pt_regs *regs)
                local_irq_enable();
 }
+static inline void preempt_conditional_sti(struct pt_regs *regs)
+{
+        preempt_disable();
+        if (regs->eflags & X86_EFLAGS_IF)
+                local_irq_enable();
+}
+static inline void preempt_conditional_cli(struct pt_regs *regs)
+{
+        if (regs->eflags & X86_EFLAGS_IF)
+                local_irq_disable();
+        preempt_enable_no_resched();
+}
 static int kstack_depth_to_print = 10;
 #ifdef CONFIG_KALLSYMS
@@ -693,7 +707,7 @@ asmlinkage void __kprobes do_debug(struct pt_regs * regs,
                                                SIGTRAP) == NOTIFY_STOP)
                return;
-        conditional_sti(regs);
+        preempt_conditional_sti(regs);
        /* Mask out spurious debug traps due to lazy DR7 setting */
        if (condition & (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) {
@@ -738,11 +752,13 @@ asmlinkage void __kprobes do_debug(struct pt_regs * regs,
 clear_dr7:
        set_debugreg(0UL, 7);
+        preempt_conditional_cli(regs);
        return;
 clear_TF_reenable:
        set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
        regs->eflags &= ~TF_MASK;
+        preempt_conditional_cli(regs);
 }
 static int kernel_math_error(struct pt_regs *regs, const char *str, int trapnr)
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 41a94bc79f67..eb2eb3e12d6a 100644
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -250,12 +250,17 @@ tipar_open(struct inode *inode, struct file *file)
 {
        unsigned int minor = iminor(inode) - TIPAR_MINOR;
-        if (minor > tp_count - 1)
+        if (tp_count == 0 || minor > tp_count - 1)
                return -ENXIO;
        if (test_and_set_bit(minor, &opened))
                return -EBUSY;
+        if (!table[minor].dev) {
+                printk(KERN_ERR "%s: NULL device for minor %u\n",
+                                __FUNCTION__, minor);
+                return -ENXIO;
+        }
        parport_claim_or_block(table[minor].dev);
        init_ti_parallel(minor);
        parport_release(table[minor].dev);
@@ -510,16 +515,20 @@ tipar_init_module(void)
                err = PTR_ERR(tipar_class);
                goto out_chrdev;
        }
-        if (parport_register_driver(&tipar_driver)) {
+        if (parport_register_driver(&tipar_driver) || tp_count == 0) {
                printk(KERN_ERR "tipar: unable to register with parport\n");
                err = -EIO;
-                goto out;
+                goto out_class;
        }
        err = 0;
        goto out;
+out_class:
+        class_destroy(tipar_class);
 out_chrdev:
+        devfs_remove("ticables/par");
        unregister_chrdev(TIPAR_MAJOR, "tipar");
 out:
        return err;     
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index 37c9e13ad3ac..8d6b249ad66b 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -49,29 +49,37 @@
 *      More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/
 */
-#include <linux/module.h>
+#include <linux/config.h>       /* For CONFIG_WATCHDOG_NOWAYOUT/... */
-#include <linux/moduleparam.h>
+#include <linux/module.h>       /* For module specific items */
-#include <linux/types.h>
+#include <linux/moduleparam.h>  /* For new moduleparam's */
-#include <linux/timer.h>
+#include <linux/types.h>        /* For standard types (like size_t) */
-#include <linux/jiffies.h>
+#include <linux/errno.h>        /* For the -ENODEV/... values */
-#include <linux/config.h>
+#include <linux/kernel.h>       /* For printk/panic/... */
-#include <linux/wait.h>
+#include <linux/delay.h>        /* For mdelay function */
-#include <linux/slab.h>
+#include <linux/timer.h>        /* For timer related operations */
-#include <linux/ioport.h>
+#include <linux/jiffies.h>      /* For jiffies stuff */
-#include <linux/delay.h>
+#include <linux/miscdevice.h>   /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */
-#include <linux/fs.h>
+#include <linux/watchdog.h>     /* For the watchdog specific items */
-#include <linux/miscdevice.h>
+#include <linux/notifier.h>     /* For notifier support */
-#include <linux/watchdog.h>
+#include <linux/reboot.h>       /* For reboot_notifier stuff */
-#include <linux/notifier.h>
+#include <linux/init.h>         /* For __init/__exit/... */
-#include <linux/init.h>
+#include <linux/fs.h>           /* For file operations */
-#include <linux/spinlock.h>
+#include <linux/ioport.h>       /* For io-port access */
-#include <linux/reboot.h>
+#include <linux/spinlock.h>     /* For spin_lock/spin_unlock/... */
 #include <linux/sched.h>        /* TASK_INTERRUPTIBLE, set_current_state() and friends */
-#include <asm/uaccess.h>
+#include <linux/slab.h>         /* For kmalloc */
-#include <asm/io.h>
-#define WD_VER                  "1.16 (06/12/2004)"
+#include <asm/uaccess.h>        /* For copy_to_user/put_user/... */
-#define PFX                     "pcwd: "
+#include <asm/io.h>             /* For inb/outb/... */
+/* Module and version information */
+#define WATCHDOG_VERSION "1.16"
+#define WATCHDOG_DATE "03 Jan 2006"
+#define WATCHDOG_DRIVER_NAME "ISA-PC Watchdog"
+#define WATCHDOG_NAME "pcwd"
+#define PFX WATCHDOG_NAME ": "
+#define DRIVER_VERSION WATCHDOG_DRIVER_NAME " driver, v" WATCHDOG_VERSION " (" WATCHDOG_DATE ")\n"
+#define WD_VER WATCHDOG_VERSION " (" WATCHDOG_DATE ")"
 /*
 * It should be noted that PCWD_REVISION_B was removed because A and B
@@ -85,36 +93,38 @@
 /*
 * These are the defines that describe the control status bits for the
- * PC Watchdog card, revision A.
+ * PCI-PC Watchdog card.
- */
+*/
+/* Port 1 : Control Status #1 for the PC Watchdog card, revision A. */
 #define WD_WDRST                0x01    /* Previously reset state */
 #define WD_T110                 0x02    /* Temperature overheat sense */
 #define WD_HRTBT                0x04    /* Heartbeat sense */
 #define WD_RLY2                 0x08    /* External relay triggered */
 #define WD_SRLY2                0x80    /* Software external relay triggered */
+/* Port 1 : Control Status #1 for the PC Watchdog card, revision C. */
-/*
- * These are the defines that describe the control status bits for the
- * PC Watchdog card, revision C.
- */
 #define WD_REVC_WTRP            0x01    /* Watchdog Trip status */
 #define WD_REVC_HRBT            0x02    /* Watchdog Heartbeat */
 #define WD_REVC_TTRP            0x04    /* Temperature Trip status */
+/* Port 2 : Control Status #2 */
+#define WD_WDIS                 0x10    /* Watchdog Disabled */
+#define WD_ENTP                 0x20    /* Watchdog Enable Temperature Trip */
+#define WD_SSEL                 0x40    /* Watchdog Switch Select (1:SW1 <-> 0:SW2) */
+#define WD_WCMD                 0x80    /* Watchdog Command Mode */
 /* max. time we give an ISA watchdog card to process a command */
 /* 500ms for each 4 bit response (according to spec.) */
 #define ISA_COMMAND_TIMEOUT     1000
 /* Watchdog's internal commands */
-#define CMD_ISA_IDLE                    0x00
+#define CMD_ISA_IDLE                    0x00
-#define CMD_ISA_VERSION_INTEGER         0x01
+#define CMD_ISA_VERSION_INTEGER         0x01
-#define CMD_ISA_VERSION_TENTH           0x02
+#define CMD_ISA_VERSION_TENTH           0x02
-#define CMD_ISA_VERSION_HUNDRETH        0x03
+#define CMD_ISA_VERSION_HUNDRETH        0x03
-#define CMD_ISA_VERSION_MINOR           0x04
+#define CMD_ISA_VERSION_MINOR           0x04
-#define CMD_ISA_SWITCH_SETTINGS         0x05
+#define CMD_ISA_SWITCH_SETTINGS         0x05
-#define CMD_ISA_DELAY_TIME_2SECS        0x0A
+#define CMD_ISA_DELAY_TIME_2SECS        0x0A
-#define CMD_ISA_DELAY_TIME_4SECS        0x0B
+#define CMD_ISA_DELAY_TIME_4SECS        0x0B
-#define CMD_ISA_DELAY_TIME_8SECS        0x0C
+#define CMD_ISA_DELAY_TIME_8SECS        0x0C
 /*
 * We are using an kernel timer to do the pinging of the watchdog
@@ -130,15 +140,17 @@ static int cards_found;
 /* internal variables */
 static atomic_t open_allowed = ATOMIC_INIT(1);
 static char expect_close;
-static struct timer_list timer;
-static unsigned long next_heartbeat;
 static int temp_panic;
-static int revision;                    /* The card's revision */
+static struct {                         /* this is private data for each ISA-PC watchdog card */
-static int supports_temp;               /* Wether or not the card has a temperature device */
+        int revision;                   /* The card's revision */
-static int command_mode;                /* Wether or not the card is in command mode */
+        int supports_temp;              /* Wether or not the card has a temperature device */
-static int initial_status;              /* The card's boot status */
+        int command_mode;               /* Wether or not the card is in command mode */
-static int current_readport;            /* The cards I/O address */
+        int boot_status;                /* The card's boot status */
-static spinlock_t io_lock;
+        int io_addr;                    /* The cards I/O address */
+        spinlock_t io_lock;             /* the lock for io operations */
+        struct timer_list timer;        /* The timer that pings the watchdog */
+        unsigned long next_heartbeat;   /* the next_heartbeat for the timer */
+} pcwd_private;
 /* module parameters */
 #define WATCHDOG_HEARTBEAT 60           /* 60 sec default heartbeat */
@@ -161,14 +173,14 @@ static int send_isa_command(int cmd)
        int port0, last_port0;  /* Double read for stabilising */
        /* The WCMD bit must be 1 and the command is only 4 bits in size */
-        control_status = (cmd & 0x0F) | 0x80;
+        control_status = (cmd & 0x0F) | WD_WCMD;
-        outb_p(control_status, current_readport + 2);
+        outb_p(control_status, pcwd_private.io_addr + 2);
        udelay(ISA_COMMAND_TIMEOUT);
-        port0 = inb_p(current_readport);
+        port0 = inb_p(pcwd_private.io_addr);
        for (i = 0; i < 25; ++i) {
                last_port0 = port0;
-                port0 = inb_p(current_readport);
+                port0 = inb_p(pcwd_private.io_addr);
                if (port0 == last_port0)
                        break;  /* Data is stable */
@@ -184,7 +196,7 @@ static int set_command_mode(void)
        int i, found=0, count=0;
        /* Set the card into command mode */
-        spin_lock(&io_lock);
+        spin_lock(&pcwd_private.io_lock);
        while ((!found) && (count < 3)) {
                i = send_isa_command(CMD_ISA_IDLE);
@@ -192,15 +204,15 @@ static int set_command_mode(void)
                        found = 1;
                else if (i == 0xF3) {
                        /* Card does not like what we've done to it */
-                        outb_p(0x00, current_readport + 2);
+                        outb_p(0x00, pcwd_private.io_addr + 2);
                        udelay(1200);   /* Spec says wait 1ms */
-                        outb_p(0x00, current_readport + 2);
+                        outb_p(0x00, pcwd_private.io_addr + 2);
                        udelay(ISA_COMMAND_TIMEOUT);
                }
                count++;
        }
-        spin_unlock(&io_lock);
+        spin_unlock(&pcwd_private.io_lock);
-        command_mode = found;
+        pcwd_private.command_mode = found;
        return(found);
 }
@@ -208,12 +220,95 @@ static int set_command_mode(void)
 static void unset_command_mode(void)
 {
        /* Set the card into normal mode */
-        spin_lock(&io_lock);
+        spin_lock(&pcwd_private.io_lock);
-        outb_p(0x00, current_readport + 2);
+        outb_p(0x00, pcwd_private.io_addr + 2);
        udelay(ISA_COMMAND_TIMEOUT);
-        spin_unlock(&io_lock);
+        spin_unlock(&pcwd_private.io_lock);
+        pcwd_private.command_mode = 0;
+}
+static inline void pcwd_check_temperature_support(void)
+{
+        if (inb(pcwd_private.io_addr) != 0xF0)
+                pcwd_private.supports_temp = 1;
+}
+static inline char *get_firmware(void)
+{
+        int one, ten, hund, minor;
+        char *ret;
+        ret = kmalloc(6, GFP_KERNEL);
+        if(ret == NULL)
+                return NULL;
+        if (set_command_mode()) {
+                one = send_isa_command(CMD_ISA_VERSION_INTEGER);
+                ten = send_isa_command(CMD_ISA_VERSION_TENTH);
+                hund = send_isa_command(CMD_ISA_VERSION_HUNDRETH);
+                minor = send_isa_command(CMD_ISA_VERSION_MINOR);
+                sprintf(ret, "%c.%c%c%c", one, ten, hund, minor);
+        }
+        else
+                sprintf(ret, "ERROR");
+        unset_command_mode();
+        return(ret);
+}
+static inline int pcwd_get_option_switches(void)
+{
+        int option_switches=0;
+        if (set_command_mode()) {
+                /* Get switch settings */
+                option_switches = send_isa_command(CMD_ISA_SWITCH_SETTINGS);
+        }
+        unset_command_mode();
+        return(option_switches);
+}
+static void pcwd_show_card_info(void)
+{
+        char *firmware;
+        int option_switches;
+        /* Get some extra info from the hardware (in command/debug/diag mode) */
+        if (pcwd_private.revision == PCWD_REVISION_A)
+                printk(KERN_INFO PFX "ISA-PC Watchdog (REV.A) detected at port 0x%04x\n", pcwd_private.io_addr);
+        else if (pcwd_private.revision == PCWD_REVISION_C) {
+                firmware = get_firmware();
+                printk(KERN_INFO PFX "ISA-PC Watchdog (REV.C) detected at port 0x%04x (Firmware version: %s)\n",
+                        pcwd_private.io_addr, firmware);
+                kfree(firmware);
+                option_switches = pcwd_get_option_switches();
+                printk(KERN_INFO PFX "Option switches (0x%02x): Temperature Reset Enable=%s, Power On Delay=%s\n",
+                        option_switches,
+                        ((option_switches & 0x10) ? "ON" : "OFF"),
+                        ((option_switches & 0x08) ? "ON" : "OFF"));
+                /* Reprogram internal heartbeat to 2 seconds */
+                if (set_command_mode()) {
+                        send_isa_command(CMD_ISA_DELAY_TIME_2SECS);
+                        unset_command_mode();
+                }
+        }
+        if (pcwd_private.supports_temp)
+                printk(KERN_INFO PFX "Temperature Option Detected\n");
+        if (pcwd_private.boot_status & WDIOF_CARDRESET)
+                printk(KERN_INFO PFX "Previous reboot was caused by the card\n");
+        if (pcwd_private.boot_status & WDIOF_OVERHEAT) {
+                printk(KERN_EMERG PFX "Card senses a CPU Overheat. Panicking!\n");
+                printk(KERN_EMERG PFX "CPU Overheat\n");
+        }
-        command_mode = 0;
+        if (pcwd_private.boot_status == 0)
+                printk(KERN_INFO PFX "No previous trip detected - Cold boot or reset\n");
 }
 static void pcwd_timer_ping(unsigned long data)
@@ -222,25 +317,25 @@ static void pcwd_timer_ping(unsigned long data)
        /* If we got a heartbeat pulse within the WDT_INTERVAL
         * we agree to ping the WDT */
-        if(time_before(jiffies, next_heartbeat)) {
+        if(time_before(jiffies, pcwd_private.next_heartbeat)) {
                /* Ping the watchdog */
-                spin_lock(&io_lock);
+                spin_lock(&pcwd_private.io_lock);
-                if (revision == PCWD_REVISION_A) {
+                if (pcwd_private.revision == PCWD_REVISION_A) {
                        /*  Rev A cards are reset by setting the WD_WDRST bit in register 1 */
-                        wdrst_stat = inb_p(current_readport);
+                        wdrst_stat = inb_p(pcwd_private.io_addr);
                        wdrst_stat &= 0x0F;
                        wdrst_stat |= WD_WDRST;
-                        outb_p(wdrst_stat, current_readport + 1);
+                        outb_p(wdrst_stat, pcwd_private.io_addr + 1);
                } else {
                        /* Re-trigger watchdog by writing to port 0 */
-                        outb_p(0x00, current_readport);
+                        outb_p(0x00, pcwd_private.io_addr);
                }
                /* Re-set the timer interval */
-                mod_timer(&timer, jiffies + WDT_INTERVAL);
+                mod_timer(&pcwd_private.timer, jiffies + WDT_INTERVAL);
-                spin_unlock(&io_lock);
+                spin_unlock(&pcwd_private.io_lock);
        } else {
                printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
        }
@@ -250,19 +345,19 @@ static int pcwd_start(void)
 {
        int stat_reg;
-        next_heartbeat = jiffies + (heartbeat * HZ);
+        pcwd_private.next_heartbeat = jiffies + (heartbeat * HZ);
        /* Start the timer */
-        mod_timer(&timer, jiffies + WDT_INTERVAL);
+        mod_timer(&pcwd_private.timer, jiffies + WDT_INTERVAL);
        /* Enable the port */
-        if (revision == PCWD_REVISION_C) {
+        if (pcwd_private.revision == PCWD_REVISION_C) {
-                spin_lock(&io_lock);
+                spin_lock(&pcwd_private.io_lock);
-                outb_p(0x00, current_readport + 3);
+                outb_p(0x00, pcwd_private.io_addr + 3);
                udelay(ISA_COMMAND_TIMEOUT);
-                stat_reg = inb_p(current_readport + 2);
+                stat_reg = inb_p(pcwd_private.io_addr + 2);
-                spin_unlock(&io_lock);
+                spin_unlock(&pcwd_private.io_lock);
-                if (stat_reg & 0x10) {
+                if (stat_reg & WD_WDIS) {
                        printk(KERN_INFO PFX "Could not start watchdog\n");
                        return -EIO;
                }
@@ -275,18 +370,18 @@ static int pcwd_stop(void)
        int stat_reg;
        /* Stop the timer */
-        del_timer(&timer);
+        del_timer(&pcwd_private.timer);
        /*  Disable the board  */
-        if (revision == PCWD_REVISION_C) {
+        if (pcwd_private.revision == PCWD_REVISION_C) {
-                spin_lock(&io_lock);
+                spin_lock(&pcwd_private.io_lock);
-                outb_p(0xA5, current_readport + 3);
+                outb_p(0xA5, pcwd_private.io_addr + 3);
                udelay(ISA_COMMAND_TIMEOUT);
-                outb_p(0xA5, current_readport + 3);
+                outb_p(0xA5, pcwd_private.io_addr + 3);
                udelay(ISA_COMMAND_TIMEOUT);
-                stat_reg = inb_p(current_readport + 2);
+                stat_reg = inb_p(pcwd_private.io_addr + 2);
-                spin_unlock(&io_lock);
+                spin_unlock(&pcwd_private.io_lock);
-                if ((stat_reg & 0x10) == 0) {
+                if ((stat_reg & WD_WDIS) == 0) {
                        printk(KERN_INFO PFX "Could not stop watchdog\n");
                        return -EIO;
                }
@@ -297,7 +392,7 @@ static int pcwd_stop(void)
 static int pcwd_keepalive(void)
 {
        /* user land ping */
-        next_heartbeat = jiffies + (heartbeat * HZ);
+        pcwd_private.next_heartbeat = jiffies + (heartbeat * HZ);
        return 0;
 }
@@ -315,23 +410,23 @@ static int pcwd_get_status(int *status)
        int card_status;
        *status=0;
-        spin_lock(&io_lock);
+        spin_lock(&pcwd_private.io_lock);
-        if (revision == PCWD_REVISION_A)
+        if (pcwd_private.revision == PCWD_REVISION_A)
                /* Rev A cards return status information from
                 * the base register, which is used for the
                 * temperature in other cards. */
-                card_status = inb(current_readport);
+                card_status = inb(pcwd_private.io_addr);
        else {
                /* Rev C cards return card status in the base
                 * address + 1 register. And use different bits
                 * to indicate a card initiated reset, and an
                 * over-temperature condition. And the reboot
                 * status can be reset. */
-                card_status = inb(current_readport + 1);
+                card_status = inb(pcwd_private.io_addr + 1);
        }
-        spin_unlock(&io_lock);
+        spin_unlock(&pcwd_private.io_lock);
-        if (revision == PCWD_REVISION_A) {
+        if (pcwd_private.revision == PCWD_REVISION_A) {
                if (card_status & WD_WDRST)
                        *status |= WDIOF_CARDRESET;
@@ -360,10 +455,10 @@ static int pcwd_get_status(int *status)
 static int pcwd_clear_status(void)
 {
-        if (revision == PCWD_REVISION_C) {
+        if (pcwd_private.revision == PCWD_REVISION_C) {
-                spin_lock(&io_lock);
+                spin_lock(&pcwd_private.io_lock);
-                outb_p(0x00, current_readport + 1); /* clear reset status */
+                outb_p(0x00, pcwd_private.io_addr + 1); /* clear reset status */
-                spin_unlock(&io_lock);
+                spin_unlock(&pcwd_private.io_lock);
        }
        return 0;
 }
@@ -371,20 +466,20 @@ static int pcwd_clear_status(void)
 static int pcwd_get_temperature(int *temperature)
 {
        /* check that port 0 gives temperature info and no command results */
-        if (command_mode)
+        if (pcwd_private.command_mode)
                return -1;
        *temperature = 0;
-        if (!supports_temp)
+        if (!pcwd_private.supports_temp)
                return -ENODEV;
        /*
         * Convert celsius to fahrenheit, since this was
         * the decided 'standard' for this return value.
         */
-        spin_lock(&io_lock);
+        spin_lock(&pcwd_private.io_lock);
-        *temperature = ((inb(current_readport)) * 9 / 5) + 32;
+        *temperature = ((inb(pcwd_private.io_addr)) * 9 / 5) + 32;
-        spin_unlock(&io_lock);
+        spin_unlock(&pcwd_private.io_lock);
        return 0;
 }
@@ -425,7 +520,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
                return put_user(status, argp);
        case WDIOC_GETBOOTSTATUS:
-                return put_user(initial_status, argp);
+                return put_user(pcwd_private.boot_status, argp);
        case WDIOC_GETTEMP:
                if (pcwd_get_temperature(&temperature))
@@ -434,7 +529,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
                return put_user(temperature, argp);
        case WDIOC_SETOPTIONS:
-                if (revision == PCWD_REVISION_C)
+                if (pcwd_private.revision == PCWD_REVISION_C)
                {
                        if(copy_from_user(&rv, argp, sizeof(int)))
                                return -EFAULT;
@@ -550,7 +645,7 @@ static ssize_t pcwd_temp_read(struct file *file, char __user *buf, size_t count,
 static int pcwd_temp_open(struct inode *inode, struct file *file)
 {
-        if (!supports_temp)
+        if (!pcwd_private.supports_temp)
                return -ENODEV;
        return nonseekable_open(inode, file);
@@ -616,68 +711,24 @@ static struct notifier_block pcwd_notifier = {
 *      Init & exit routines
 */
-static inline void get_support(void)
-{
-        if (inb(current_readport) != 0xF0)
-                supports_temp = 1;
-}
 static inline int get_revision(void)
 {
        int r = PCWD_REVISION_C;
-        spin_lock(&io_lock);
+        spin_lock(&pcwd_private.io_lock);
        /* REV A cards use only 2 io ports; test
         * presumes a floating bus reads as 0xff. */
-        if ((inb(current_readport + 2) == 0xFF) ||
+        if ((inb(pcwd_private.io_addr + 2) == 0xFF) ||
-            (inb(current_readport + 3) == 0xFF))
+            (inb(pcwd_private.io_addr + 3) == 0xFF))
                r=PCWD_REVISION_A;
-        spin_unlock(&io_lock);
+        spin_unlock(&pcwd_private.io_lock);
        return r;
 }
-static inline char *get_firmware(void)
-{
-        int one, ten, hund, minor;
-        char *ret;
-        ret = kmalloc(6, GFP_KERNEL);
-        if(ret == NULL)
-                return NULL;
-        if (set_command_mode()) {
-                one = send_isa_command(CMD_ISA_VERSION_INTEGER);
-                ten = send_isa_command(CMD_ISA_VERSION_TENTH);
-                hund = send_isa_command(CMD_ISA_VERSION_HUNDRETH);
-                minor = send_isa_command(CMD_ISA_VERSION_MINOR);
-                sprintf(ret, "%c.%c%c%c", one, ten, hund, minor);
-        }
-        else
-                sprintf(ret, "ERROR");
-        unset_command_mode();
-        return(ret);
-}
-static inline int get_option_switches(void)
-{
-        int rv=0;
-        if (set_command_mode()) {
-                /* Get switch settings */
-                rv = send_isa_command(CMD_ISA_SWITCH_SETTINGS);
-        }
-        unset_command_mode();
-        return(rv);
-}
 static int __devinit pcwatchdog_init(int base_addr)
 {
        int ret;
-        char *firmware;
-        int option_switches;
        cards_found++;
        if (cards_found == 1)
@@ -692,104 +743,66 @@ static int __devinit pcwatchdog_init(int base_addr)
                printk(KERN_ERR PFX "No I/O-Address for card detected\n");
                return -ENODEV;
        }
-        current_readport = base_addr;
+        pcwd_private.io_addr = base_addr;
        /* Check card's revision */
-        revision = get_revision();
+        pcwd_private.revision = get_revision();
-        if (!request_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4, "PCWD")) {
+        if (!request_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4, "PCWD")) {
                printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                        current_readport);
+                        pcwd_private.io_addr);
-                current_readport = 0x0000;
+                pcwd_private.io_addr = 0x0000;
                return -EIO;
        }
        /* Initial variables */
-        supports_temp = 0;
+        pcwd_private.supports_temp = 0;
        temp_panic = 0;
-        initial_status = 0x0000;
+        pcwd_private.boot_status = 0x0000;
        /* get the boot_status */
-        pcwd_get_status(&initial_status);
+        pcwd_get_status(&pcwd_private.boot_status);
        /* clear the "card caused reboot" flag */
        pcwd_clear_status();
-        init_timer(&timer);
+        init_timer(&pcwd_private.timer);
-        timer.function = pcwd_timer_ping;
+        pcwd_private.timer.function = pcwd_timer_ping;
-        timer.data = 0;
+        pcwd_private.timer.data = 0;
        /*  Disable the board  */
        pcwd_stop();
        /*  Check whether or not the card supports the temperature device */
-        get_support();
+        pcwd_check_temperature_support();
-        /* Get some extra info from the hardware (in command/debug/diag mode) */
-        if (revision == PCWD_REVISION_A)
-                printk(KERN_INFO PFX "ISA-PC Watchdog (REV.A) detected at port 0x%04x\n", current_readport);
-        else if (revision == PCWD_REVISION_C) {
-                firmware = get_firmware();
-                printk(KERN_INFO PFX "ISA-PC Watchdog (REV.C) detected at port 0x%04x (Firmware version: %s)\n",
-                        current_readport, firmware);
-                kfree(firmware);
-                option_switches = get_option_switches();
-                printk(KERN_INFO PFX "Option switches (0x%02x): Temperature Reset Enable=%s, Power On Delay=%s\n",
-                        option_switches,
-                        ((option_switches & 0x10) ? "ON" : "OFF"),
-                        ((option_switches & 0x08) ? "ON" : "OFF"));
-                /* Reprogram internal heartbeat to 2 seconds */
-                if (set_command_mode()) {
-                        send_isa_command(CMD_ISA_DELAY_TIME_2SECS);
-                        unset_command_mode();
-                }
-        } else {
-                /* Should NEVER happen, unless get_revision() fails. */
-                printk(KERN_INFO PFX "Unable to get revision\n");
-                release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4);
-                current_readport = 0x0000;
-                return -1;
-        }
-        if (supports_temp)
+        /* Show info about the card itself */
-                printk(KERN_INFO PFX "Temperature Option Detected\n");
+        pcwd_show_card_info();
-        if (initial_status & WDIOF_CARDRESET)
-                printk(KERN_INFO PFX "Previous reboot was caused by the card\n");
-        if (initial_status & WDIOF_OVERHEAT) {
-                printk(KERN_EMERG PFX "Card senses a CPU Overheat. Panicking!\n");
-                printk(KERN_EMERG PFX "CPU Overheat\n");
-        }
-        if (initial_status == 0)
-                printk(KERN_INFO PFX "No previous trip detected - Cold boot or reset\n");
        /* Check that the heartbeat value is within it's range ; if not reset to the default */
-        if (pcwd_set_heartbeat(heartbeat)) {
+        if (pcwd_set_heartbeat(heartbeat)) {
-                pcwd_set_heartbeat(WATCHDOG_HEARTBEAT);
+                pcwd_set_heartbeat(WATCHDOG_HEARTBEAT);
-                printk(KERN_INFO PFX "heartbeat value must be 2<=heartbeat<=7200, using %d\n",
+                printk(KERN_INFO PFX "heartbeat value must be 2<=heartbeat<=7200, using %d\n",
-                        WATCHDOG_HEARTBEAT);
+                        WATCHDOG_HEARTBEAT);
        }
        ret = register_reboot_notifier(&pcwd_notifier);
        if (ret) {
                printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
                        ret);
-                release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4);
+                release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
-                current_readport = 0x0000;
+                pcwd_private.io_addr = 0x0000;
                return ret;
        }
-        if (supports_temp) {
+        if (pcwd_private.supports_temp) {
                ret = misc_register(&temp_miscdev);
                if (ret) {
                        printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
                                TEMP_MINOR, ret);
                        unregister_reboot_notifier(&pcwd_notifier);
-                        release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4);
+                        release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
-                        current_readport = 0x0000;
+                        pcwd_private.io_addr = 0x0000;
                        return ret;
                }
        }
@@ -798,11 +811,11 @@ static int __devinit pcwatchdog_init(int base_addr)
        if (ret) {
                printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
                        WATCHDOG_MINOR, ret);
-                if (supports_temp)
+                if (pcwd_private.supports_temp)
                        misc_deregister(&temp_miscdev);
                unregister_reboot_notifier(&pcwd_notifier);
-                release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4);
+                release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
-                current_readport = 0x0000;
+                pcwd_private.io_addr = 0x0000;
                return ret;
        }
@@ -820,11 +833,12 @@ static void __devexit pcwatchdog_exit(void)
        /* Deregister */
        misc_deregister(&pcwd_miscdev);
-        if (supports_temp)
+        if (pcwd_private.supports_temp)
                misc_deregister(&temp_miscdev);
        unregister_reboot_notifier(&pcwd_notifier);
-        release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4);
+        release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4);
-        current_readport = 0x0000;
+        pcwd_private.io_addr = 0x0000;
+        cards_found--;
 }
 /*
@@ -887,7 +901,7 @@ static int __init pcwd_init_module(void)
 {
        int i, found = 0;
-        spin_lock_init(&io_lock);
+        spin_lock_init(&pcwd_private.io_lock);
        for (i = 0; pcwd_ioports[i] != 0; i++) {
                if (pcwd_checkcard(pcwd_ioports[i])) {
@@ -906,7 +920,7 @@ static int __init pcwd_init_module(void)
 static void __exit pcwd_cleanup_module(void)
 {
-        if (current_readport)
+        if (pcwd_private.io_addr)
                pcwatchdog_exit();
        return;
 }
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
index b474ea52d6e8..522a9370db94 100644
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
@@ -93,23 +93,25 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
 {
        int ret = -ENOIOCTLCMD;
        int time;
+        void __user *argp = (void __user *)arg;
+        int __user *p = argp;
        switch (cmd) {
        case WDIOC_GETSUPPORT:
-                ret = copy_to_user((struct watchdog_info __user *)arg, &ident,
+                ret = copy_to_user(argp, &ident,
                                   sizeof(ident)) ? -EFAULT : 0;
                break;
        case WDIOC_GETSTATUS:
-                ret = put_user(0, (int __user *)arg);
+                ret = put_user(0, p);
                break;
        case WDIOC_GETBOOTSTATUS:
-                ret = put_user(boot_status, (int __user *)arg);
+                ret = put_user(boot_status, p);
                break;
        case WDIOC_SETTIMEOUT:
-                ret = get_user(time, (int __user *)arg);
+                ret = get_user(time, p);
                if (ret)
                        break;
@@ -123,7 +125,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
                /*fall through*/
        case WDIOC_GETTIMEOUT:
-                ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg);
+                ret = put_user(pre_margin / OSCR_FREQ, p);
                break;
        case WDIOC_KEEPALIVE:
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 3c128b692bce..ec6f2a48895b 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -590,6 +590,7 @@ static struct pcmcia_device_id orinoco_cs_ids[] = {
        PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),
        PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
        PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
+        PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2532W-B EliteConnect Wireless Adapter", 0xc4f8b18b, 0x196bd757),
        PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2632W", 0xc4f8b18b, 0x474a1f2a),
        PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),
        PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index ceb0e474fde4..4138564402b8 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -85,11 +85,10 @@ static volatile enum sclp_mask_state_t {
 /* Maximum retry counts */
 #define SCLP_INIT_RETRY         3
 #define SCLP_MASK_RETRY         3
-#define SCLP_REQUEST_RETRY      3
 /* Timeout intervals in seconds.*/
-#define SCLP_BUSY_INTERVAL      2
+#define SCLP_BUSY_INTERVAL      10
-#define SCLP_RETRY_INTERVAL     5
+#define SCLP_RETRY_INTERVAL     15
 static void sclp_process_queue(void);
 static int sclp_init_mask(int calculate);
@@ -153,11 +152,9 @@ __sclp_start_request(struct sclp_req *req)
        if (sclp_running_state != sclp_running_state_idle)
                return 0;
        del_timer(&sclp_request_timer);
-        if (req->start_count <= SCLP_REQUEST_RETRY) {
+        rc = service_call(req->command, req->sccb);
-                rc = service_call(req->command, req->sccb);
+        req->start_count++;
-                req->start_count++;
-        } else
-                rc = -EIO;
        if (rc == 0) {
                /* Sucessfully started request */
                req->status = SCLP_REQ_RUNNING;
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 92be75d99a56..8cf9905d484b 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -232,7 +232,7 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
                return 0;
        mask = 0x80 >> j;
-        spin_lock(&sch->lock);
+        spin_lock_irq(&sch->lock);
        stsch(sch->schid, &schib);
        if (!schib.pmcw.dnv)
@@ -281,10 +281,10 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
        if (sch->driver && sch->driver->verify)
                sch->driver->verify(&sch->dev);
 out_unlock:
-        spin_unlock(&sch->lock);
+        spin_unlock_irq(&sch->lock);
        return 0;
 out_unreg:
-        spin_unlock(&sch->lock);
+        spin_unlock_irq(&sch->lock);
        sch->lpm = 0;
        if (css_enqueue_subchannel_slow(sch->schid)) {
                css_clear_subchannel_slow_list();
@@ -652,7 +652,7 @@ __chp_add(struct subchannel_id schid, void *data)
        if (!sch)
                /* Check if the subchannel is now available. */
                return __chp_add_new_sch(schid);
-        spin_lock(&sch->lock);
+        spin_lock_irq(&sch->lock);
        for (i=0; i<8; i++)
                if (sch->schib.pmcw.chpid[i] == chp->id) {
                        if (stsch(sch->schid, &sch->schib) != 0) {
@@ -674,7 +674,7 @@ __chp_add(struct subchannel_id schid, void *data)
        if (sch->driver && sch->driver->verify)
                sch->driver->verify(&sch->dev);
-        spin_unlock(&sch->lock);
+        spin_unlock_irq(&sch->lock);
        put_device(&sch->dev);
        return 0;
 }
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 24a54a5a91b8..1c2ab3dede71 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -211,7 +211,6 @@ static struct scsi_host_template ahci_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = AHCI_MAX_SG,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = AHCI_USE_CLUSTERING,
@@ -617,7 +616,8 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
        ata_tf_to_fis(&qc->tf, pp->cmd_tbl, 0);
        if (is_atapi) {
                memset(pp->cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);
-                memcpy(pp->cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb, ap->cdb_len);
+                memcpy(pp->cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb,
+                       qc->dev->cdb_len);
        }
        n_elem = 0;
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 4933ba284885..4cc1108f721a 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -185,7 +185,6 @@ static struct scsi_host_template piix_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@ -415,9 +414,6 @@ static int piix_sata_probe (struct ata_port *ap)
        int orig_mask, mask, i;
        u8 pcs;
-        mask = (PIIX_PORT_PRESENT << ap->hard_port_no) |
-               (PIIX_PORT_ENABLED << ap->hard_port_no);
        pci_read_config_byte(pdev, ICH5_PCS, &pcs);
        orig_mask = (int) pcs & 0xff;
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index bfe0a00b1135..5ab220e9907c 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -520,6 +520,49 @@ void ata_dev_id_string(const u16 *id, unsigned char *s,
        }
 }
+/**
+ *      ata_dev_id_c_string - Convert IDENTIFY DEVICE page into C string
+ *      @id: IDENTIFY DEVICE results we will examine
+ *      @s: string into which data is output
+ *      @ofs: offset into identify device page
+ *      @len: length of string to return. must be an odd number.
+ *
+ *      This function is identical to ata_dev_id_string except that it
+ *      trims trailing spaces and terminates the resulting string with
+ *      null.  @len must be actual maximum length (even number) + 1.
+ *
+ *      LOCKING:
+ *      caller.
+ */
+void ata_dev_id_c_string(const u16 *id, unsigned char *s,
+                         unsigned int ofs, unsigned int len)
+{
+        unsigned char *p;
+        WARN_ON(!(len & 1));
+        ata_dev_id_string(id, s, ofs, len - 1);
+        p = s + strnlen(s, len - 1);
+        while (p > s && p[-1] == ' ')
+                p--;
+        *p = '\0';
+}
+static u64 ata_id_n_sectors(const u16 *id)
+{
+        if (ata_id_has_lba(id)) {
+                if (ata_id_has_lba48(id))
+                        return ata_id_u64(id, 100);
+                else
+                        return ata_id_u32(id, 60);
+        } else {
+                if (ata_id_current_chs_valid(id))
+                        return ata_id_u32(id, 57);
+                else
+                        return id[1] * id[3] * id[6];
+        }
+}
 /**
 *      ata_noop_dev_select - Select device 0/1 on ATA bus
@@ -609,41 +652,41 @@ void ata_dev_select(struct ata_port *ap, unsigned int device,
 /**
 *      ata_dump_id - IDENTIFY DEVICE info debugging output
- *      @dev: Device whose IDENTIFY DEVICE page we will dump
+ *      @id: IDENTIFY DEVICE page to dump
 *
- *      Dump selected 16-bit words from a detected device's
+ *      Dump selected 16-bit words from the given IDENTIFY DEVICE
- *      IDENTIFY PAGE page.
+ *      page.
 *
 *      LOCKING:
 *      caller.
 */
-static inline void ata_dump_id(const struct ata_device *dev)
+static inline void ata_dump_id(const u16 *id)
 {
        DPRINTK("49==0x%04x  "
                "53==0x%04x  "
                "63==0x%04x  "
                "64==0x%04x  "
                "75==0x%04x  \n",
-                dev->id[49],
+                id[49],
-                dev->id[53],
+                id[53],
-                dev->id[63],
+                id[63],
-                dev->id[64],
+                id[64],
-                dev->id[75]);
+                id[75]);
        DPRINTK("80==0x%04x  "
                "81==0x%04x  "
                "82==0x%04x  "
                "83==0x%04x  "
                "84==0x%04x  \n",
-                dev->id[80],
+                id[80],
-                dev->id[81],
+                id[81],
-                dev->id[82],
+                id[82],
-                dev->id[83],
+                id[83],
-                dev->id[84]);
+                id[84]);
        DPRINTK("88==0x%04x  "
                "93==0x%04x\n",
-                dev->id[88],
+                id[88],
-                dev->id[93]);
+                id[93]);
 }
 /*
@@ -877,12 +920,11 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
 {
        struct ata_device *dev = &ap->device[device];
        unsigned int major_version;
-        u16 tmp;
        unsigned long xfer_modes;
        unsigned int using_edd;
        struct ata_taskfile tf;
        unsigned int err_mask;
-        int rc;
+        int i, rc;
        if (!ata_dev_present(dev)) {
                DPRINTK("ENTER/EXIT (host %u, dev %u) -- nodev\n",
@@ -890,7 +932,8 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
                return;
        }
-        if (ap->flags & (ATA_FLAG_SRST | ATA_FLAG_SATA_RESET))
+        if (ap->ops->probe_reset ||
+            ap->flags & (ATA_FLAG_SRST | ATA_FLAG_SATA_RESET))
                using_edd = 0;
        else
                using_edd = 1;
@@ -970,18 +1013,17 @@ retry:
        if (!xfer_modes)
                xfer_modes = ata_pio_modes(dev);
-        ata_dump_id(dev);
+        ata_dump_id(dev->id);
        /* ATA-specific feature tests */
        if (dev->class == ATA_DEV_ATA) {
+                dev->n_sectors = ata_id_n_sectors(dev->id);
                if (!ata_id_is_ata(dev->id))    /* sanity check */
                        goto err_out_nosup;
                /* get major version */
-                tmp = dev->id[ATA_ID_MAJOR_VER];
+                major_version = ata_id_major_version(dev->id);
-                for (major_version = 14; major_version >= 1; major_version--)
-                        if (tmp & (1 << major_version))
-                                break;
                /*
                 * The exact sequence expected by certain pre-ATA4 drives is:
@@ -1003,12 +1045,8 @@ retry:
                if (ata_id_has_lba(dev->id)) {
                        dev->flags |= ATA_DFLAG_LBA;
-                        if (ata_id_has_lba48(dev->id)) {
+                        if (ata_id_has_lba48(dev->id))
                                dev->flags |= ATA_DFLAG_LBA48;
-                                dev->n_sectors = ata_id_u64(dev->id, 100);
-                        } else {
-                                dev->n_sectors = ata_id_u32(dev->id, 60);
-                        }
                        /* print device info to dmesg */
                        printk(KERN_INFO "ata%u: dev %u ATA-%d, max %s, %Lu sectors:%s\n",
@@ -1024,15 +1062,12 @@ retry:
                        dev->cylinders  = dev->id[1];
                        dev->heads      = dev->id[3];
                        dev->sectors    = dev->id[6];
-                        dev->n_sectors  = dev->cylinders * dev->heads * dev->sectors;
                        if (ata_id_current_chs_valid(dev->id)) {
                                /* Current CHS translation is valid. */
                                dev->cylinders = dev->id[54];
                                dev->heads     = dev->id[55];
                                dev->sectors   = dev->id[56];
-                                
-                                dev->n_sectors = ata_id_u32(dev->id, 57);
                        }
                        /* print device info to dmesg */
@@ -1051,7 +1086,6 @@ retry:
                                ap->id, device, dev->multi_count);
                }
-                ap->host->max_cmd_len = 16;
        }
        /* ATAPI-specific feature tests */
@@ -1064,8 +1098,7 @@ retry:
                        printk(KERN_WARNING "ata%u: unsupported CDB len\n", ap->id);
                        goto err_out_nosup;
                }
-                ap->cdb_len = (unsigned int) rc;
+                dev->cdb_len = (unsigned int) rc;
-                ap->host->max_cmd_len = (unsigned char) ap->cdb_len;
                if (ata_id_cdb_intr(dev->id))
                        dev->flags |= ATA_DFLAG_CDB_INTR;
@@ -1076,6 +1109,12 @@ retry:
                       ata_mode_string(xfer_modes));
        }
+        ap->host->max_cmd_len = 0;
+        for (i = 0; i < ATA_MAX_DEVICES; i++)
+                ap->host->max_cmd_len = max_t(unsigned int,
+                                              ap->host->max_cmd_len,
+                                              ap->device[i].cdb_len);
        DPRINTK("EXIT, drv_stat = 0x%x\n", ata_chk_status(ap));
        return;
@@ -1088,9 +1127,10 @@ err_out:
 }
-static inline u8 ata_dev_knobble(const struct ata_port *ap)
+static inline u8 ata_dev_knobble(const struct ata_port *ap,
+                                 struct ata_device *dev)
 {
-        return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(ap->device->id)));
+        return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id)));
 }
 /**
@@ -1104,13 +1144,11 @@ static inline u8 ata_dev_knobble(const struct ata_port *ap)
 void ata_dev_config(struct ata_port *ap, unsigned int i)
 {
        /* limit bridge transfers to udma5, 200 sectors */
-        if (ata_dev_knobble(ap)) {
+        if (ata_dev_knobble(ap, &ap->device[i])) {
                printk(KERN_INFO "ata%u(%u): applying bridge limits\n",
-                        ap->id, ap->device->devno);
+                       ap->id, i);
                ap->udma_mask &= ATA_UDMA5;
-                ap->host->max_sectors = ATA_MAX_SECTORS;
+                ap->device[i].max_sectors = ATA_MAX_SECTORS;
-                ap->host->hostt->max_sectors = ATA_MAX_SECTORS;
-                ap->device[i].flags |= ATA_DFLAG_LOCK_SECTORS;
        }
        if (ap->ops->dev_config)
@@ -1144,8 +1182,11 @@ static int ata_bus_probe(struct ata_port *ap)
                rc = ap->ops->probe_reset(ap, classes);
                if (rc == 0) {
-                        for (i = 0; i < ATA_MAX_DEVICES; i++)
+                        for (i = 0; i < ATA_MAX_DEVICES; i++) {
+                                if (classes[i] == ATA_DEV_UNKNOWN)
+                                        classes[i] = ATA_DEV_NONE;
                                ap->device[i].class = classes[i];
+                        }
                } else {
                        printk(KERN_ERR "ata%u: probe reset failed, "
                               "disabling port\n", ap->id);
@@ -2272,24 +2313,14 @@ static const char * const ata_dma_blacklist [] = {
 static int ata_dma_blacklisted(const struct ata_device *dev)
 {
-        unsigned char model_num[40];
+        unsigned char model_num[41];
-        char *s;
-        unsigned int len;
        int i;
-        ata_dev_id_string(dev->id, model_num, ATA_ID_PROD_OFS,
+        ata_dev_id_c_string(dev->id, model_num, ATA_ID_PROD_OFS,
-                          sizeof(model_num));
+                            sizeof(model_num));
-        s = &model_num[0];
-        len = strnlen(s, sizeof(model_num));
-        /* ATAPI specifies that empty space is blank-filled; remove blanks */
-        while ((len > 0) && (s[len - 1] == ' ')) {
-                len--;
-                s[len] = 0;
-        }
        for (i = 0; i < ARRAY_SIZE(ata_dma_blacklist); i++)
-                if (!strncmp(ata_dma_blacklist[i], s, len))
+                if (!strcmp(ata_dma_blacklist[i], model_num))
                        return 1;
        return 0;
@@ -2485,7 +2516,7 @@ static void ata_dev_reread_id(struct ata_port *ap, struct ata_device *dev)
        swap_buf_le16(dev->id, ATA_ID_WORDS);
-        ata_dump_id(dev);
+        ata_dump_id(dev->id);
        DPRINTK("EXIT\n");
@@ -5179,6 +5210,7 @@ EXPORT_SYMBOL_GPL(ata_scsi_release);
 EXPORT_SYMBOL_GPL(ata_host_intr);
 EXPORT_SYMBOL_GPL(ata_dev_classify);
 EXPORT_SYMBOL_GPL(ata_dev_id_string);
+EXPORT_SYMBOL_GPL(ata_dev_id_c_string);
 EXPORT_SYMBOL_GPL(ata_dev_config);
 EXPORT_SYMBOL_GPL(ata_scsi_simulate);
 EXPORT_SYMBOL_GPL(ata_eh_qc_complete);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 26f07a2617f9..86da46502b3e 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -684,23 +684,23 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
        if (sdev->id < ATA_MAX_DEVICES) {
                struct ata_port *ap;
                struct ata_device *dev;
+                unsigned int max_sectors;
                ap = (struct ata_port *) &sdev->host->hostdata[0];
                dev = &ap->device[sdev->id];
-                /* TODO: 1024 is an arbitrary number, not the
+                /* TODO: 2048 is an arbitrary number, not the
                 * hardware maximum.  This should be increased to
                 * 65534 when Jens Axboe's patch for dynamically
                 * determining max_sectors is merged.
                 */
-                if ((dev->flags & ATA_DFLAG_LBA48) &&
+                max_sectors = ATA_MAX_SECTORS;
-                    ((dev->flags & ATA_DFLAG_LOCK_SECTORS) == 0)) {
+                if (dev->flags & ATA_DFLAG_LBA48)
-                        /*
+                        max_sectors = 2048;
-                         * do not overwrite sdev->host->max_sectors, since
+                if (dev->max_sectors)
-                         * other drives on this host may not support LBA48
+                        max_sectors = dev->max_sectors;
-                         */
-                        blk_queue_max_sectors(sdev->request_queue, 2048);
+                blk_queue_max_sectors(sdev->request_queue, max_sectors);
-                }
                /*
                 * SATA DMA transfers must be multiples of 4 byte, so
@@ -1806,15 +1806,12 @@ static int ata_dev_supports_fua(u16 *id)
        if (!ata_id_has_fua(id))
                return 0;
-        model[40] = '\0';
+        ata_dev_id_c_string(id, model, ATA_ID_PROD_OFS, sizeof(model));
-        fw[8] = '\0';
+        ata_dev_id_c_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw));
-        ata_dev_id_string(id, model, ATA_ID_PROD_OFS, sizeof(model) - 1);
-        ata_dev_id_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw) - 1);
-        if (strncmp(model, "Maxtor", 6))
+        if (strcmp(model, "Maxtor"))
                return 1;
-        if (strncmp(fw, "BANC1G10", 8))
+        if (strcmp(fw, "BANC1G10"))
                return 1;
        return 0; /* blacklisted */
@@ -2149,7 +2146,7 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
        ata_sg_init_one(qc, cmd->sense_buffer, sizeof(cmd->sense_buffer));
        qc->dma_dir = DMA_FROM_DEVICE;
-        memset(&qc->cdb, 0, ap->cdb_len);
+        memset(&qc->cdb, 0, qc->dev->cdb_len);
        qc->cdb[0] = REQUEST_SENSE;
        qc->cdb[4] = SCSI_SENSE_BUFFERSIZE;
@@ -2251,7 +2248,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
                if (ata_check_atapi_dma(qc))
                        using_pio = 1;
-        memcpy(&qc->cdb, scsicmd, qc->ap->cdb_len);
+        memcpy(&qc->cdb, scsicmd, dev->cdb_len);
        qc->complete_fn = atapi_qc_complete;
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index 0f7e45a39fd9..f32af5dc58c4 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -148,7 +148,6 @@ static struct scsi_host_template adma_ata_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ENABLE_CLUSTERING,
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index d35460ff5275..e05751e7aad4 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -383,7 +383,6 @@ static struct scsi_host_template mv_sht = {
        .can_queue              = MV_USE_Q_DEPTH,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = MV_MAX_SG_CT / 2,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 94dc2e1a8f30..5168db981dde 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -234,7 +234,6 @@ static struct scsi_host_template nv_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index a88b563ebcc4..7fa807d7d9e1 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -117,7 +117,6 @@ static struct scsi_host_template pdc_ata_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 5730167d2e74..bfc1dc8e7779 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -137,7 +137,6 @@ static struct scsi_host_template qs_ata_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = QS_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        //FIXME .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index bd2887741d78..15346888faf2 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -140,7 +140,6 @@ static struct scsi_host_template sil_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@ -337,22 +336,13 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
 {
        unsigned int n, quirks = 0;
-        unsigned char model_num[40];
+        unsigned char model_num[41];
-        const char *s;
-        unsigned int len;
-        ata_dev_id_string(dev->id, model_num, ATA_ID_PROD_OFS,
+        ata_dev_id_c_string(dev->id, model_num, ATA_ID_PROD_OFS,
-                          sizeof(model_num));
+                            sizeof(model_num));
-        s = &model_num[0];
-        len = strnlen(s, sizeof(model_num));
-        /* ATAPI specifies that empty space is blank-filled; remove blanks */
-        while ((len > 0) && (s[len - 1] == ' '))
-                len--;
        for (n = 0; sil_blacklist[n].product; n++)
-                if (!memcmp(sil_blacklist[n].product, s,
+                if (!strcmp(sil_blacklist[n].product, model_num)) {
-                            strlen(sil_blacklist[n].product))) {
                        quirks = sil_blacklist[n].quirk;
                        break;
                }
@@ -363,16 +353,14 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
             (quirks & SIL_QUIRK_MOD15WRITE))) {
                printk(KERN_INFO "ata%u(%u): applying Seagate errata fix (mod15write workaround)\n",
                       ap->id, dev->devno);
-                ap->host->max_sectors = 15;
+                dev->max_sectors = 15;
-                ap->host->hostt->max_sectors = 15;
-                dev->flags |= ATA_DFLAG_LOCK_SECTORS;
                return;
        }
        /* limit to udma5 */
        if (quirks & SIL_QUIRK_UDMA5MAX) {
                printk(KERN_INFO "ata%u(%u): applying Maxtor errata fix %s\n",
-                       ap->id, dev->devno, s);
+                       ap->id, dev->devno, model_num);
                ap->udma_mask &= ATA_UDMA5;
                return;
        }
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 228a7fabffff..a0e35a262156 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -285,7 +285,6 @@ static struct scsi_host_template sil24_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@ -371,7 +370,7 @@ static void sil24_dev_config(struct ata_port *ap, struct ata_device *dev)
 {
        void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
-        if (ap->cdb_len == 16)
+        if (dev->cdb_len == 16)
                writel(PORT_CS_CDB16, port + PORT_CTRL_STAT);
        else
                writel(PORT_CS_CDB16, port + PORT_CTRL_CLR);
@@ -543,7 +542,7 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)
                prb = &cb->atapi.prb;
                sge = cb->atapi.sge;
                memset(cb->atapi.cdb, 0, 32);
-                memcpy(cb->atapi.cdb, qc->cdb, ap->cdb_len);
+                memcpy(cb->atapi.cdb, qc->cdb, qc->dev->cdb_len);
                if (qc->tf.protocol != ATA_PROT_ATAPI_NODATA) {
                        if (qc->tf.flags & ATA_TFLAG_WRITE)
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 2f1815715705..7fd45f86de99 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -92,7 +92,6 @@ static struct scsi_host_template sis_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = ATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index f369c3003adf..4aaccd53e736 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -293,7 +293,6 @@ static struct scsi_host_template k2_sata_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 04465fb86e1d..60ebe5ce32c4 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -187,7 +187,6 @@ static struct scsi_host_template pdc_sata_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index c500f2490902..37a487b7d655 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -80,7 +80,6 @@ static struct scsi_host_template uli_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 2e20887dc88f..ff65a0b0457f 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -99,7 +99,6 @@ static struct scsi_host_template svia_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 4cfc03018ca3..976a6b124af9 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -228,7 +228,6 @@ static struct scsi_host_template vsc_sata_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-        .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3e153d313bb0..e64ed16bd42f 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -525,11 +525,6 @@ config FB_GBE_MEM
          This is the amount of memory reserved for the framebuffer,
          which can be any value between 1MB and 8MB.
-config BUS_I2C
-        bool
-        depends on (FB = y) && VISWS
-        default y
 config FB_SUN3
        bool "Sun3 framebuffer support"
        depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index d2dede6ed3e5..996c7b58564e 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1550,6 +1550,7 @@ int fb_get_options(char *name, char **option)
        return retval;
 }
+#ifndef MODULE
 /**
 *      video_setup - process command line options
 *      @options: string of options
@@ -1593,6 +1594,7 @@ static int __init video_setup(char *options)
        return 0;
 }
 __setup("video=", video_setup);
+#endif
    /*
     *  Visible symbols for modules
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index dbcb8962e57d..a7c4e5e8ead6 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -138,6 +138,8 @@ static struct pci_device_id nvidiafb_pci_tbl[] = {
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO,
diff --git a/fs/compat.c b/fs/compat.c
index 70c5af4cc270..a2ba78bdf7f7 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1751,11 +1751,15 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
        ret = compat_core_sys_select(n, inp, outp, exp, &timeout);
        if (tvp) {
+                struct compat_timeval rtv;
                if (current->personality & STICKY_TIMEOUTS)
                        goto sticky;
-                tv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ));
+                rtv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ));
-                tv.tv_sec = timeout;
+                rtv.tv_sec = timeout;
-                if (copy_to_user(tvp, &tv, sizeof(tv))) {
+                if (compat_timeval_compare(&rtv, &tv) < 0)
+                        rtv = tv;
+                if (copy_to_user(tvp, &rtv, sizeof(rtv))) {
 sticky:
                        /*
                         * If an application puts its timeval in read-only
@@ -1822,13 +1826,17 @@ asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,
        } while (!ret && !timeout && tsp && (ts.tv_sec || ts.tv_nsec));
        if (tsp && !(current->personality & STICKY_TIMEOUTS)) {
-                ts.tv_sec += timeout / HZ;
+                struct compat_timespec rts;
-                ts.tv_nsec += (timeout % HZ) * (1000000000/HZ);
-                if (ts.tv_nsec >= 1000000000) {
+                rts.tv_sec = timeout / HZ;
-                        ts.tv_sec++;
+                rts.tv_nsec = (timeout % HZ) * (NSEC_PER_SEC/HZ);
-                        ts.tv_nsec -= 1000000000;
+                if (rts.tv_nsec >= NSEC_PER_SEC) {
+                        rts.tv_sec++;
+                        rts.tv_nsec -= NSEC_PER_SEC;
                }
-                (void)copy_to_user(tsp, &ts, sizeof(ts));
+                if (compat_timespec_compare(&rts, &ts) < 0)
+                        rts = ts;
+                copy_to_user(tsp, &rts, sizeof(rts));
        }
        if (ret == -ERESTARTNOHAND) {
@@ -1918,12 +1926,17 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
                sigprocmask(SIG_SETMASK, &sigsaved, NULL);
        if (tsp && timeout >= 0) {
+                struct compat_timespec rts;
                if (current->personality & STICKY_TIMEOUTS)
                        goto sticky;
                /* Yes, we know it's actually an s64, but it's also positive. */
-                ts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * 1000;
+                rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) *
-                ts.tv_sec = timeout;
+                                        1000;
-                if (copy_to_user(tsp, &ts, sizeof(ts))) {
+                rts.tv_sec = timeout;
+                if (compat_timespec_compare(&rts, &ts) < 0)
+                        rts = ts;
+                if (copy_to_user(tsp, &rts, sizeof(rts))) {
 sticky:
                        /*
                         * If an application puts its timeval in read-only
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index ef5e5414e7a8..d63da756eb49 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1124,8 +1124,6 @@ static void handle_attrs(struct super_block *s)
                                         "reiserfs: cannot support attributes until flag is set in super-block");
                        REISERFS_SB(s)->s_mount_opt &= ~(1 << REISERFS_ATTRS);
                }
-        } else if (le32_to_cpu(rs->s_flags) & reiserfs_attrs_cleared) {
-                REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ATTRS);
        }
 }
diff --git a/fs/select.c b/fs/select.c
index bc60a3e14ef3..6ce68a9c8976 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -398,11 +398,15 @@ asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp,
        ret = core_sys_select(n, inp, outp, exp, &timeout);
        if (tvp) {
+                struct timeval rtv;
                if (current->personality & STICKY_TIMEOUTS)
                        goto sticky;
-                tv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ));
+                rtv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ));
-                tv.tv_sec = timeout;
+                rtv.tv_sec = timeout;
-                if (copy_to_user(tvp, &tv, sizeof(tv))) {
+                if (timeval_compare(&rtv, &tv) < 0)
+                        rtv = tv;
+                if (copy_to_user(tvp, &rtv, sizeof(rtv))) {
 sticky:
                        /*
                         * If an application puts its timeval in read-only
@@ -460,11 +464,16 @@ asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp,
        ret = core_sys_select(n, inp, outp, exp, &timeout);
        if (tsp) {
+                struct timespec rts;
                if (current->personality & STICKY_TIMEOUTS)
                        goto sticky;
-                ts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * 1000;
+                rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) *
-                ts.tv_sec = timeout;
+                                                1000;
-                if (copy_to_user(tsp, &ts, sizeof(ts))) {
+                rts.tv_sec = timeout;
+                if (timespec_compare(&rts, &ts) < 0)
+                        rts = ts;
+                if (copy_to_user(tsp, &rts, sizeof(rts))) {
 sticky:
                        /*
                         * If an application puts its timeval in read-only
@@ -758,12 +767,17 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
                sigprocmask(SIG_SETMASK, &sigsaved, NULL);
        if (tsp && timeout >= 0) {
+                struct timespec rts;
                if (current->personality & STICKY_TIMEOUTS)
                        goto sticky;
                /* Yes, we know it's actually an s64, but it's also positive. */
-                ts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * 1000;
+                rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) *
-                ts.tv_sec = timeout;
+                                                1000;
-                if (copy_to_user(tsp, &ts, sizeof(ts))) {
+                rts.tv_sec = timeout;
+                if (timespec_compare(&rts, &ts) < 0)
+                        rts = ts;
+                if (copy_to_user(tsp, &rts, sizeof(rts))) {
                sticky:
                        /*
                         * If an application puts its timeval in read-only
diff --git a/fs/stat.c b/fs/stat.c
index 24211b030f39..9948cc1685a4 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -261,6 +261,7 @@ asmlinkage long sys_newlstat(char __user *filename, struct stat __user *statbuf)
        return error;
 }
+#ifndef __ARCH_WANT_STAT64
 asmlinkage long sys_newfstatat(int dfd, char __user *filename,
                                struct stat __user *statbuf, int flag)
 {
@@ -281,6 +282,7 @@ asmlinkage long sys_newfstatat(int dfd, char __user *filename,
 out:
        return error;
 }
+#endif
 asmlinkage long sys_newfstat(unsigned int fd, struct stat __user *statbuf)
 {
@@ -395,6 +397,26 @@ asmlinkage long sys_fstat64(unsigned long fd, struct stat64 __user * statbuf)
        return error;
 }
+asmlinkage long sys_fstatat64(int dfd, char __user *filename,
+                               struct stat64 __user *statbuf, int flag)
+{
+        struct kstat stat;
+        int error = -EINVAL;
+        if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)
+                goto out;
+        if (flag & AT_SYMLINK_NOFOLLOW)
+                error = vfs_lstat_fd(dfd, filename, &stat);
+        else
+                error = vfs_stat_fd(dfd, filename, &stat);
+        if (!error)
+                error = cp_new_stat64(&stat, statbuf);
+out:
+        return error;
+}
 #endif /* __ARCH_WANT_STAT64 */
 void inode_add_bytes(struct inode *inode, loff_t bytes)
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index cf6f2cd9c514..dc81a55dd94d 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -305,7 +305,7 @@
 #define __NR_mknodat            297
 #define __NR_fchownat           298
 #define __NR_futimesat          299
-#define __NR_newfstatat         300
+#define __NR_fstatat64          300
 #define __NR_unlinkat           301
 #define __NR_renameat           302
 #define __NR_linkat             303
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
index 61232760cc3b..3628899f48bb 100644
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
@@ -518,8 +518,8 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr
 static inline int 
 __constant_test_bit(unsigned long nr, const volatile unsigned long *addr) {
-    return ((((volatile char *) addr)
+    return (((volatile char *) addr)
-            [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7)))) != 0;
+            [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7))) != 0;
 }
 #define test_bit(nr,addr) \
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 348a88137445..da3fd4a7bb32 100644
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -8,6 +8,8 @@
 #ifndef _ASM_S390_SETUP_H
 #define _ASM_S390_SETUP_H
+#ifdef __KERNEL__
 #include <asm/types.h>
 #define PARMAREA                0x10400
@@ -114,7 +116,7 @@ extern u16 ipl_devno;
                                 IPL_PARMBLOCK_ORIGIN)
 #define IPL_PARMBLOCK_SIZE      (IPL_PARMBLOCK_START->hdr.length)
-#else 
+#else /* __ASSEMBLY__ */
 #ifndef __s390x__
 #define IPL_DEVICE        0x10404
@@ -127,6 +129,6 @@ extern u16 ipl_devno;
 #endif /* __s390x__ */
 #define COMMAND_LINE      0x10480
-#endif
+#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
-#endif
+#endif /* _ASM_S390_SETUP_H */
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index a2ae7628bbaa..9c6e9c300eb9 100644
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -101,6 +101,7 @@ smp_call_function_on(void (*func) (void *info), void *info,
        func(info);
        return 0;
 }
+#define smp_cpu_not_running(cpu)        1
 #define smp_get_cpu(cpu) ({ 0; })
 #define smp_put_cpu(cpu) ({ 0; })
 #endif
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index 29a9f357eb9e..657d582e8149 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -285,7 +285,7 @@
 #define __NR_mknodat            290
 #define __NR_fchownat           291
 #define __NR_futimesat          292
-#define __NR_newfstatat         293
+#define __NR_fstatat64          293
 #define __NR_unlinkat           294
 #define __NR_renameat           295
 #define __NR_linkat             296
@@ -295,8 +295,9 @@
 #define __NR_faccessat          300
 #define __NR_pselect6           301
 #define __NR_ppoll              302
+#define __NR_unshare            303
-#define NR_syscalls 303
+#define NR_syscalls 304
 /* 
 * There are some system calls that are not present on 64 bit, some
@@ -358,6 +359,7 @@
 #undef  __NR_fcntl64
 #undef  __NR_sendfile64
 #undef  __NR_fadvise64_64
+#undef  __NR_fstatat64
 #define __NR_select             142
 #define __NR_getrlimit          191     /* SuS compliant getrlimit */
@@ -380,6 +382,7 @@
 #define __NR_setgid             214
 #define __NR_setfsuid           215
 #define __NR_setfsgid           216
+#define __NR_newfstatat         293
 #endif
diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86_64/hpet.h
index c20c28f5c7a0..08b75c15269a 100644
--- a/include/asm-x86_64/hpet.h
+++ b/include/asm-x86_64/hpet.h
@@ -55,6 +55,8 @@ extern int is_hpet_enabled(void);
 extern int hpet_rtc_timer_init(void);
 extern int oem_force_hpet_timer(void);
+extern int hpet_use_timer;
 #ifdef CONFIG_HPET_EMULATE_RTC
 extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask);
 extern int hpet_set_rtc_irq_bit(unsigned long bit_mask);
diff --git a/include/asm-x86_64/ia32_unistd.h b/include/asm-x86_64/ia32_unistd.h
index 20468983d453..eeb2bcd635de 100644
--- a/include/asm-x86_64/ia32_unistd.h
+++ b/include/asm-x86_64/ia32_unistd.h
@@ -305,7 +305,7 @@
 #define __NR_ia32_mknodat               297
 #define __NR_ia32_fchownat              298
 #define __NR_ia32_futimesat             299
-#define __NR_ia32_newfstatat            300
+#define __NR_ia32_fstatat64             300
 #define __NR_ia32_unlinkat              301
 #define __NR_ia32_renameat              302
 #define __NR_ia32_linkat                303
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 8e88efc565be..469952366ed4 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -270,6 +270,16 @@ struct ata_taskfile {
 #define ata_id_cdb_intr(id)     (((id)[0] & 0x60) == 0x20)
+static inline unsigned int ata_id_major_version(const u16 *id)
+{
+        unsigned int mver;
+        for (mver = 14; mver >= 1; mver--)
+                if (id[ATA_ID_MAJOR_VER] & (1 << mver))
+                        break;
+        return mver;
+}
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command 
diff --git a/include/linux/compat.h b/include/linux/compat.h
index f9ca534787e2..c9ab2a26348c 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -161,5 +161,25 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from);
 int get_compat_sigevent(struct sigevent *event,
                const struct compat_sigevent __user *u_event);
+static inline int compat_timeval_compare(struct compat_timeval *lhs,
+                                        struct compat_timeval *rhs)
+{
+        if (lhs->tv_sec < rhs->tv_sec)
+                return -1;
+        if (lhs->tv_sec > rhs->tv_sec)
+                return 1;
+        return lhs->tv_usec - rhs->tv_usec;
+}
+static inline int compat_timespec_compare(struct compat_timespec *lhs,
+                                        struct compat_timespec *rhs)
+{
+        if (lhs->tv_sec < rhs->tv_sec)
+                return -1;
+        if (lhs->tv_sec > rhs->tv_sec)
+                return 1;
+        return lhs->tv_nsec - rhs->tv_nsec;
+}
 #endif /* CONFIG_COMPAT */
 #endif /* _LINUX_COMPAT_H */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 9873f4c54f1e..67d07c44b2e7 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -122,9 +122,8 @@ enum {
        /* struct ata_device stuff */
        ATA_DFLAG_LBA48         = (1 << 0), /* device supports LBA48 */
        ATA_DFLAG_PIO           = (1 << 1), /* device currently in PIO mode */
-        ATA_DFLAG_LOCK_SECTORS  = (1 << 2), /* don't adjust max_sectors */
+        ATA_DFLAG_LBA           = (1 << 2), /* device supports LBA */
-        ATA_DFLAG_LBA           = (1 << 3), /* device supports LBA */
+        ATA_DFLAG_CDB_INTR      = (1 << 3), /* device asserts INTRQ when ready for CDB */
-        ATA_DFLAG_CDB_INTR      = (1 << 4), /* device asserts INTRQ when ready for CDB */
        ATA_DEV_UNKNOWN         = 0,    /* unknown device */
        ATA_DEV_ATA             = 1,    /* ATA device */
@@ -353,6 +352,8 @@ struct ata_device {
        unsigned int            multi_count;    /* sectors count for
                                                   READ/WRITE MULTIPLE */
+        unsigned int            max_sectors;    /* per-device max sectors */
+        unsigned int            cdb_len;
        /* for CHS addressing */
        u16                     cylinders;      /* Number of cylinders */
@@ -382,7 +383,6 @@ struct ata_port {
        unsigned int            mwdma_mask;
        unsigned int            udma_mask;
        unsigned int            cbl;    /* cable type; ATA_CBL_xxx */
-        unsigned int            cdb_len;
        struct ata_device       device[ATA_MAX_DEVICES];
@@ -543,6 +543,8 @@ extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
 extern unsigned int ata_dev_classify(const struct ata_taskfile *tf);
 extern void ata_dev_id_string(const u16 *id, unsigned char *s,
                              unsigned int ofs, unsigned int len);
+extern void ata_dev_id_c_string(const u16 *id, unsigned char *s,
+                                unsigned int ofs, unsigned int len);
 extern void ata_dev_config(struct ata_port *ap, unsigned int i);
 extern void ata_bmdma_setup (struct ata_queued_cmd *qc);
 extern void ata_bmdma_start (struct ata_queued_cmd *qc);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 7a61ccdcbc4b..82b83da25d77 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1087,6 +1087,7 @@
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X 0x0181
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X 0x0182
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X 0x0183
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000   0x0185
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO    0x0186
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO    0x0187
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL    0x0188
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 3877209d23c3..d73501ba7e44 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -557,6 +557,8 @@ asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
                           int mode);
 asmlinkage long sys_newfstatat(int dfd, char __user *filename,
                               struct stat __user *statbuf, int flag);
+asmlinkage long sys_fstatat64(int dfd, char __user *filename,
+                               struct stat64 __user *statbuf, int flag);
 asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf,
                               int bufsiz);
 asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,
diff --git a/include/linux/time.h b/include/linux/time.h
index 7b4dc36532bb..d9cdba54b789 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -33,11 +33,34 @@ struct timezone {
 #define NSEC_PER_SEC            1000000000L
 #define NSEC_PER_USEC           1000L
-static __inline__ int timespec_equal(struct timespec *a, struct timespec *b)
+static inline int timespec_equal(struct timespec *a, struct timespec *b)
 {
        return (a->tv_sec == b->tv_sec) && (a->tv_nsec == b->tv_nsec);
 }
+/*
+ * lhs < rhs:  return <0
+ * lhs == rhs: return 0
+ * lhs > rhs:  return >0
+ */
+static inline int timespec_compare(struct timespec *lhs, struct timespec *rhs)
+{
+        if (lhs->tv_sec < rhs->tv_sec)
+                return -1;
+        if (lhs->tv_sec > rhs->tv_sec)
+                return 1;
+        return lhs->tv_nsec - rhs->tv_nsec;
+}
+static inline int timeval_compare(struct timeval *lhs, struct timeval *rhs)
+{
+        if (lhs->tv_sec < rhs->tv_sec)
+                return -1;
+        if (lhs->tv_sec > rhs->tv_sec)
+                return 1;
+        return lhs->tv_usec - rhs->tv_usec;
+}
 extern unsigned long mktime(const unsigned int year, const unsigned int mon,
                            const unsigned int day, const unsigned int hour,
                            const unsigned int min, const unsigned int sec);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 5db32fdfaf39..1838c15ca4fd 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -443,6 +443,10 @@ static int shrink_list(struct list_head *page_list, struct scan_control *sc)
                BUG_ON(PageActive(page));
                sc->nr_scanned++;
+                if (!sc->may_swap && page_mapped(page))
+                        goto keep_locked;
                /* Double the slab pressure for mapped and swapcache pages */
                if (page_mapped(page) || PageSwapCache(page))
                        sc->nr_scanned++;
@@ -1191,9 +1195,47 @@ refill_inactive_zone(struct zone *zone, struct scan_control *sc)
        struct page *page;
        struct pagevec pvec;
        int reclaim_mapped = 0;
-        long mapped_ratio;
-        long distress;
+        if (unlikely(sc->may_swap)) {
-        long swap_tendency;
+                long mapped_ratio;
+                long distress;
+                long swap_tendency;
+                /*
+                 * `distress' is a measure of how much trouble we're having
+                 * reclaiming pages.  0 -> no problems.  100 -> great trouble.
+                 */
+                distress = 100 >> zone->prev_priority;
+                /*
+                 * The point of this algorithm is to decide when to start
+                 * reclaiming mapped memory instead of just pagecache.  Work out
+                 * how much memory
+                 * is mapped.
+                 */
+                mapped_ratio = (sc->nr_mapped * 100) / total_memory;
+                /*
+                 * Now decide how much we really want to unmap some pages.  The
+                 * mapped ratio is downgraded - just because there's a lot of
+                 * mapped memory doesn't necessarily mean that page reclaim
+                 * isn't succeeding.
+                 *
+                 * The distress ratio is important - we don't want to start
+                 * going oom.
+                 *
+                 * A 100% value of vm_swappiness overrides this algorithm
+                 * altogether.
+                 */
+                swap_tendency = mapped_ratio / 2 + distress + vm_swappiness;
+                /*
+                 * Now use this metric to decide whether to start moving mapped
+                 * memory onto the inactive list.
+                 */
+                if (swap_tendency >= 100)
+                        reclaim_mapped = 1;
+        }
        lru_add_drain();
        spin_lock_irq(&zone->lru_lock);
@@ -1203,37 +1245,6 @@ refill_inactive_zone(struct zone *zone, struct scan_control *sc)
        zone->nr_active -= pgmoved;
        spin_unlock_irq(&zone->lru_lock);
-        /*
-         * `distress' is a measure of how much trouble we're having reclaiming
-         * pages.  0 -> no problems.  100 -> great trouble.
-         */
-        distress = 100 >> zone->prev_priority;
-        /*
-         * The point of this algorithm is to decide when to start reclaiming
-         * mapped memory instead of just pagecache.  Work out how much memory
-         * is mapped.
-         */
-        mapped_ratio = (sc->nr_mapped * 100) / total_memory;
-        /*
-         * Now decide how much we really want to unmap some pages.  The mapped
-         * ratio is downgraded - just because there's a lot of mapped memory
-         * doesn't necessarily mean that page reclaim isn't succeeding.
-         *
-         * The distress ratio is important - we don't want to start going oom.
-         *
-         * A 100% value of vm_swappiness overrides this algorithm altogether.
-         */
-        swap_tendency = mapped_ratio / 2 + distress + vm_swappiness;
-        /*
-         * Now use this metric to decide whether to start moving mapped memory
-         * onto the inactive list.
-         */
-        if (swap_tendency >= 100)
-                reclaim_mapped = 1;
        while (!list_empty(&l_hold)) {
                cond_resched();
                page = lru_to_page(&l_hold);
@@ -1610,9 +1621,7 @@ scan:
                        sc.nr_reclaimed = 0;
                        sc.priority = priority;
                        sc.swap_cluster_max = nr_pages? nr_pages : SWAP_CLUSTER_MAX;
-                        atomic_inc(&zone->reclaim_in_progress);
                        shrink_zone(zone, &sc);
-                        atomic_dec(&zone->reclaim_in_progress);
                        reclaim_state->reclaimed_slab = 0;
                        nr_slab = shrink_slab(sc.nr_scanned, GFP_KERNEL,
                                                lru_pages);
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index b5018166b0e5..c06cb0983530 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -805,7 +805,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
 print_error:
        if (skb->dev != NULL) {
                printk("[%s]", skb->dev->name);
-                if (has_bridge_parent(skb->dev))
+                if (bridge_parent(skb->dev))
                        printk("[%s]", bridge_parent(skb->dev)->name);
        }
        printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,