UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master'

This commit is contained in:
Jeff Garzik 2006-02-13 00:12:09 -05:00
parent 49430f97dd e9bb4c9929
commit f1b318793d
84 changed files with 646 additions and 470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MAINTAINERS
View File

@ -2232,7 +2232,23 @@ P: Martin Schwidefsky
M: schwidefsky@de.ibm.com M: schwidefsky@de.ibm.com
M: linux390@de.ibm.com M: linux390@de.ibm.com
L: linux-390@vm.marist.edu 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 S: Supported
SAA7146 VIDEO4LINUX-2 DRIVER SAA7146 VIDEO4LINUX-2 DRIVER

2
Makefile
View File

@ -1,7 +1,7 @@
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 16 SUBLEVEL = 16
EXTRAVERSION =-rc2 EXTRAVERSION =-rc3
NAME=Sliding Snow Leopard NAME=Sliding Snow Leopard
# *DOCUMENTATION* # *DOCUMENTATION*

4
arch/i386/kernel/head.S
View File

@ -398,7 +398,11 @@ ignore_int:
pushl 32(%esp) pushl 32(%esp)
pushl 40(%esp) pushl 40(%esp)
pushl $int_msg pushl $int_msg
#ifdef CONFIG_EARLY_PRINTK
call early_printk
#else
call printk call printk
#endif
addl $(5*4),%esp addl $(5*4),%esp
popl %ds popl %ds
popl %es popl %es

2
arch/i386/kernel/syscall_table.S
View File

@ -299,7 +299,7 @@ ENTRY(sys_call_table)
.long sys_mknodat .long sys_mknodat
.long sys_fchownat .long sys_fchownat
.long sys_futimesat .long sys_futimesat
.long sys_newfstatat /* 300 */ .long sys_fstatat64 /* 300 */
.long sys_unlinkat .long sys_unlinkat
.long sys_renameat .long sys_renameat
.long sys_linkat .long sys_linkat

5
arch/m68k/fpsp040/bindec.S
View File

@ -131,9 +131,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |BINDEC idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/binstr.S
View File

@ -60,9 +60,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |BINSTR idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/bugfix.S
View File

@ -152,9 +152,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |BUGFIX idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/decbin.S
View File

@ -69,9 +69,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |DECBIN idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/do_func.S
View File

@ -22,9 +22,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 DO_FUNC: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/fpsp.h
View File

@ -5,9 +5,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 | fpsp.h --- stack frame offsets during FPSP exception handling
| |

5
arch/m68k/fpsp040/gen_except.S
View File

@ -29,9 +29,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 GEN_EXCEPT: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/get_op.S
View File

@ -54,9 +54,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 GET_OP: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/kernel_ex.S
View File

@ -12,9 +12,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 KERNEL_EX: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/res_func.S
View File

@ -16,9 +16,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 RES_FUNC: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/round.S
View File

@ -8,9 +8,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |ROUND idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/sacos.S
View File

@ -38,9 +38,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SACOS idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/sasin.S
View File

@ -38,9 +38,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SASIN idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/satan.S
View File

@ -43,9 +43,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |satan idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/satanh.S
View File

@ -45,9 +45,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |satanh idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/scale.S
View File

@ -21,9 +21,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SCALE idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/scosh.S
View File

@ -49,9 +49,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SCOSH idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/setox.S
View File

@ -331,9 +331,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |setox idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/sgetem.S
View File

@ -24,9 +24,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SGETEM idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/sint.S
View File

@ -51,9 +51,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SINT idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/skeleton.S
View File

@ -30,9 +30,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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) | Modified for Linux-1.3.x by Jes Sorensen (jds@kom.auc.dk)

5
arch/m68k/fpsp040/slog2.S
View File

@ -96,9 +96,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SLOG2 idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/slogn.S
View File

@ -63,9 +63,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |slogn idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/smovecr.S
View File

@ -15,9 +15,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SMOVECR idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/srem_mod.S
View File

@ -66,9 +66,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 SREM_MOD: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/ssin.S
View File

@ -83,9 +83,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SSIN idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/ssinh.S
View File

@ -49,9 +49,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |SSINH idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/stan.S
View File

@ -50,9 +50,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |STAN idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/stanh.S
View File

@ -49,9 +49,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |STANH idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/sto_res.S
View File

@ -19,9 +19,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 STO_RES: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/stwotox.S
View File

@ -76,9 +76,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |STWOTOX idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/tbldo.S
View File

@ -17,9 +17,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |TBLDO idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/util.S
View File

@ -16,9 +16,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 |UTIL idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_bsun.S
View File

@ -13,9 +13,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_BSUN: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_fline.S
View File

@ -13,9 +13,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_FLINE: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_operr.S
View File

@ -43,9 +43,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_OPERR: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_ovfl.S
View File

@ -35,9 +35,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_OVFL: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_snan.S
View File

@ -22,9 +22,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_SNAN: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_store.S
View File

@ -11,9 +11,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_STORE: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_unfl.S
View File

@ -21,9 +21,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_UNFL: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_unimp.S
View File

@ -22,9 +22,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_UNIMP: |idnt 2,1 | Motorola 040 Floating Point Software Package

5
arch/m68k/fpsp040/x_unsupp.S
View File

@ -23,9 +23,8 @@
| Copyright (C) Motorola, Inc. 1990 | Copyright (C) Motorola, Inc. 1990
| All Rights Reserved | 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 X_UNSUPP: |idnt 2,1 | Motorola 040 Floating Point Software Package

9
arch/s390/defconfig
View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # 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_MMU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@ -12,7 +12,6 @@ CONFIG_S390=y
# Code maturity level options # Code maturity level options
# #
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
CONFIG_CLEAN_COMPILE=y
CONFIG_LOCK_KERNEL=y CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
@ -154,6 +153,7 @@ CONFIG_NET=y
# #
# Networking options # Networking options
# #
# CONFIG_NETDEBUG is not set
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not set # CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y CONFIG_UNIX=y
@ -607,6 +607,7 @@ CONFIG_MSDOS_PARTITION=y
# Instrumentation Support # Instrumentation Support
# #
# CONFIG_PROFILING is not set # CONFIG_PROFILING is not set
# CONFIG_STATISTICS is not set
# #
# Kernel hacking # Kernel hacking
@ -624,7 +625,7 @@ CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO 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_DEBUG_VM is not set
CONFIG_FORCED_INLINING=y CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set

20
arch/s390/kernel/compat_linux.c
View File

@ -905,6 +905,26 @@ asmlinkage long sys32_fstat64(unsigned long fd, struct stat64_emu31 __user * sta
return ret; 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 * Linux/i386 didn't use to be able to handle more than
* 4 system call parameters, so these system calls used a memory * 4 system call parameters, so these system calls used a memory

13
arch/s390/kernel/compat_wrapper.S
View File

@ -1523,13 +1523,13 @@ compat_sys_futimesat_wrapper:
llgtr %r4,%r4 # struct timeval * llgtr %r4,%r4 # struct timeval *
jg compat_sys_futimesat 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 llgfr %r2,%r2 # unsigned int
llgtr %r3,%r3 # char * llgtr %r3,%r3 # char *
llgtr %r4,%r4 # struct stat * llgtr %r4,%r4 # struct stat64 *
lgfr %r5,%r5 # int lgfr %r5,%r5 # int
jg compat_sys_newfstatat jg sys32_fstatat
.globl sys_unlinkat_wrapper .globl sys_unlinkat_wrapper
sys_unlinkat_wrapper: sys_unlinkat_wrapper:
@ -1602,3 +1602,8 @@ compat_sys_ppoll_wrapper:
llgtr %r5,%r5 # const sigset_t * llgtr %r5,%r5 # const sigset_t *
llgfr %r6,%r6 # size_t llgfr %r6,%r6 # size_t
jg compat_sys_ppoll jg compat_sys_ppoll
.globl sys_unshare_wrapper
sys_unshare_wrapper:
llgfr %r2,%r2 # unsigned long
jg sys_unshare

5
arch/s390/kernel/machine_kexec.c
View File

@ -12,15 +12,16 @@
* on the S390 architecture. * on the S390 architecture.
*/ */
#include <asm/cio.h>
#include <asm/setup.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/kexec.h> #include <linux/kexec.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/cio.h>
#include <asm/setup.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/smp.h>
static void kexec_halt_all_cpus(void *); static void kexec_halt_all_cpus(void *);

6
arch/s390/kernel/smp.c
View File

@ -52,7 +52,7 @@ extern volatile int __cpu_logical_map[];
struct _lowcore *lowcore_ptr[NR_CPUS]; struct _lowcore *lowcore_ptr[NR_CPUS];
cpumask_t cpu_online_map; 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]; static struct task_struct *current_set[NR_CPUS];
@ -514,9 +514,6 @@ __init smp_check_cpus(unsigned int max_cpus)
num_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("Detected %d CPU's\n",(int) num_cpus);
printk("Boot cpu address %2X\n", boot_cpu_addr); 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_online_map);
cpu_set(0, cpu_present_map); cpu_set(0, cpu_present_map);
cpu_set(0, cpu_possible_map);
S390_lowcore.percpu_offset = __per_cpu_offset[0]; S390_lowcore.percpu_offset = __per_cpu_offset[0];
current_set[0] = current; current_set[0] = current;
} }

3
arch/s390/kernel/syscalls.S
View File

@ -301,7 +301,7 @@ SYSCALL(sys_mkdirat,sys_mkdirat,sys_mkdirat_wrapper)
SYSCALL(sys_mknodat,sys_mknodat,sys_mknodat_wrapper) /* 290 */ SYSCALL(sys_mknodat,sys_mknodat,sys_mknodat_wrapper) /* 290 */
SYSCALL(sys_fchownat,sys_fchownat,sys_fchownat_wrapper) SYSCALL(sys_fchownat,sys_fchownat,sys_fchownat_wrapper)
SYSCALL(sys_futimesat,sys_futimesat,compat_sys_futimesat_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_unlinkat,sys_unlinkat,sys_unlinkat_wrapper)
SYSCALL(sys_renameat,sys_renameat,sys_renameat_wrapper) /* 295 */ SYSCALL(sys_renameat,sys_renameat,sys_renameat_wrapper) /* 295 */
SYSCALL(sys_linkat,sys_linkat,sys_linkat_wrapper) 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_faccessat,sys_faccessat,sys_faccessat_wrapper) /* 300 */
SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6_wrapper) SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6_wrapper)
SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll_wrapper) SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll_wrapper)
SYSCALL(sys_unshare,sys_unshare,sys_unshare_wrapper)

2
arch/x86_64/ia32/ia32entry.S
View File

@ -677,7 +677,7 @@ ia32_sys_call_table:
.quad sys_mknodat .quad sys_mknodat
.quad sys_fchownat .quad sys_fchownat
.quad compat_sys_futimesat .quad compat_sys_futimesat
.quad compat_sys_newfstatat /* 300 */ .quad sys32_fstatat /* 300 */
.quad sys_unlinkat .quad sys_unlinkat
.quad sys_renameat .quad sys_renameat
.quad sys_linkat .quad sys_linkat

22
arch/x86_64/ia32/sys_ia32.c
View File

@ -180,6 +180,28 @@ sys32_fstat64(unsigned int fd, struct stat64 __user *statbuf)
return ret; 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 * Linux/i386 didn't use to be able to handle more than
* 4 system call parameters, so these system calls used a memory * 4 system call parameters, so these system calls used a memory

2
arch/x86_64/kernel/apic.c
View File

@ -708,7 +708,7 @@ static void setup_APIC_timer(unsigned int clocks)
local_irq_save(flags); local_irq_save(flags);
/* wait for irq slice */ /* wait for irq slice */
if (vxtime.hpet_address) { if (vxtime.hpet_address && hpet_use_timer) {
int trigger = hpet_readl(HPET_T0_CMP); int trigger = hpet_readl(HPET_T0_CMP);
while (hpet_readl(HPET_COUNTER) >= trigger) while (hpet_readl(HPET_COUNTER) >= trigger)
/* do nothing */ ; /* do nothing */ ;

6
arch/x86_64/kernel/pci-gart.c
View File

@ -310,7 +310,7 @@ void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int di
for (i = 0; i < nents; i++) { for (i = 0; i < nents; i++) {
struct scatterlist *s = &sg[i]; struct scatterlist *s = &sg[i];
if (!s->dma_length || !s->length) if (!s->dma_length)
break; break;
dma_unmap_single(dev, s->dma_address, s->dma_length, dir); 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); BUG_ON(i > start && s->offset);
if (i == start) { if (i == start) {
*sout = *s;
sout->dma_address = iommu_bus_base; sout->dma_address = iommu_bus_base;
sout->dma_address += iommu_page*PAGE_SIZE + s->offset; sout->dma_address += iommu_page*PAGE_SIZE + s->offset;
sout->dma_length = s->length; 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); SET_LEAK(iommu_page);
addr += PAGE_SIZE; addr += PAGE_SIZE;
iommu_page++; iommu_page++;
} }
} }
BUG_ON(iommu_page - iommu_start != pages); BUG_ON(iommu_page - iommu_start != pages);
return 0; return 0;
@ -391,7 +390,6 @@ static inline int dma_map_cont(struct scatterlist *sg, int start, int stopat,
{ {
if (!need) { if (!need) {
BUG_ON(stopat - start != 1); BUG_ON(stopat - start != 1);
*sout = sg[start];
sout->dma_length = sg[start].length; sout->dma_length = sg[start].length;
return 0; return 0;
} }

12
arch/x86_64/kernel/time.c
View File

@ -59,7 +59,7 @@ static int notsc __initdata = 0;
unsigned int cpu_khz; /* TSC clocks / usec, not used here */ unsigned int cpu_khz; /* TSC clocks / usec, not used here */
static unsigned long hpet_period; /* fsecs / HPET clock */ static unsigned long hpet_period; /* fsecs / HPET clock */
unsigned long hpet_tick; /* HPET clocks / interrupt */ 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; unsigned long vxtime_hz = PIT_TICK_RATE;
int report_lost_ticks; /* command line option */ int report_lost_ticks; /* command line option */
unsigned long long monotonic_base; 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); print_symbol("rip %s\n", regs->rip);
if (vxtime.mode == VXTIME_TSC && vxtime.hpet_address) { if (vxtime.mode == VXTIME_TSC && vxtime.hpet_address) {
printk(KERN_WARNING "Falling back to HPET\n"); 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; vxtime.mode = VXTIME_HPET;
do_gettimeoffset = do_gettimeoffset_hpet; do_gettimeoffset = do_gettimeoffset_hpet;
} }
@ -988,7 +991,10 @@ void __init time_init_gtod(void)
notsc = 1; notsc = 1;
if (vxtime.hpet_address && notsc) { if (vxtime.hpet_address && notsc) {
timetype = hpet_use_timer ? "HPET" : "PIT/HPET"; 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; vxtime.mode = VXTIME_HPET;
do_gettimeoffset = do_gettimeoffset_hpet; do_gettimeoffset = do_gettimeoffset_hpet;
#ifdef CONFIG_X86_PM_TIMER #ifdef CONFIG_X86_PM_TIMER

18
arch/x86_64/kernel/traps.c
View File

@ -90,6 +90,20 @@ static inline void conditional_sti(struct pt_regs *regs)
local_irq_enable(); 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; static int kstack_depth_to_print = 10;
#ifdef CONFIG_KALLSYMS #ifdef CONFIG_KALLSYMS
@ -693,7 +707,7 @@ asmlinkage void __kprobes do_debug(struct pt_regs * regs,
SIGTRAP) == NOTIFY_STOP) SIGTRAP) == NOTIFY_STOP)
return; return;
conditional_sti(regs); preempt_conditional_sti(regs);
/* Mask out spurious debug traps due to lazy DR7 setting */ /* Mask out spurious debug traps due to lazy DR7 setting */
if (condition & (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) { 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: clear_dr7:
set_debugreg(0UL, 7); set_debugreg(0UL, 7);
preempt_conditional_cli(regs);
return; return;
clear_TF_reenable: clear_TF_reenable:
set_tsk_thread_flag(tsk, TIF_SINGLESTEP); set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
regs->eflags &= ~TF_MASK; regs->eflags &= ~TF_MASK;
preempt_conditional_cli(regs);
} }
static int kernel_math_error(struct pt_regs *regs, const char *str, int trapnr) static int kernel_math_error(struct pt_regs *regs, const char *str, int trapnr)

15
drivers/char/tipar.c
View File

@ -250,12 +250,17 @@ tipar_open(struct inode *inode, struct file *file)
{ {
unsigned int minor = iminor(inode) - TIPAR_MINOR; unsigned int minor = iminor(inode) - TIPAR_MINOR;
if (minor > tp_count - 1) if (tp_count == 0 || minor > tp_count - 1)
return -ENXIO; return -ENXIO;
if (test_and_set_bit(minor, &opened)) if (test_and_set_bit(minor, &opened))
return -EBUSY; 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); parport_claim_or_block(table[minor].dev);
init_ti_parallel(minor); init_ti_parallel(minor);
parport_release(table[minor].dev); parport_release(table[minor].dev);
@ -510,16 +515,20 @@ tipar_init_module(void)
err = PTR_ERR(tipar_class); err = PTR_ERR(tipar_class);
goto out_chrdev; 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"); printk(KERN_ERR "tipar: unable to register with parport\n");
err = -EIO; err = -EIO;
goto out; goto out_class;
} }
err = 0; err = 0;
goto out; goto out;
out_class:
class_destroy(tipar_class);
out_chrdev: out_chrdev:
devfs_remove("ticables/par");
unregister_chrdev(TIPAR_MAJOR, "tipar"); unregister_chrdev(TIPAR_MAJOR, "tipar");
out: out:
return err; return err;

450
drivers/char/watchdog/pcwd.c
View File

@ -49,29 +49,37 @@
* More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/ * 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 <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 * 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 * 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_WDRST 0x01 /* Previously reset state */
#define WD_T110 0x02 /* Temperature overheat sense */ #define WD_T110 0x02 /* Temperature overheat sense */
#define WD_HRTBT 0x04 /* Heartbeat sense */ #define WD_HRTBT 0x04 /* Heartbeat sense */
#define WD_RLY2 0x08 /* External relay triggered */ #define WD_RLY2 0x08 /* External relay triggered */
#define WD_SRLY2 0x80 /* Software 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_WTRP 0x01 /* Watchdog Trip status */
#define WD_REVC_HRBT 0x02 /* Watchdog Heartbeat */ #define WD_REVC_HRBT 0x02 /* Watchdog Heartbeat */
#define WD_REVC_TTRP 0x04 /* Temperature Trip status */ #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 */ /* max. time we give an ISA watchdog card to process a command */
/* 500ms for each 4 bit response (according to spec.) */ /* 500ms for each 4 bit response (according to spec.) */
#define ISA_COMMAND_TIMEOUT 1000 #define ISA_COMMAND_TIMEOUT 1000
/* Watchdog's internal commands */ /* 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 * We are using an kernel timer to do the pinging of the watchdog
@ -130,15 +140,17 @@ static int cards_found;
/* internal variables */ /* internal variables */
static atomic_t open_allowed = ATOMIC_INIT(1); static atomic_t open_allowed = ATOMIC_INIT(1);
static char expect_close; static char expect_close;
static struct timer_list timer;
static unsigned long next_heartbeat;
static int temp_panic; 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 */ /* module parameters */
#define WATCHDOG_HEARTBEAT 60 /* 60 sec default heartbeat */ #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 */ int port0, last_port0; /* Double read for stabilising */
/* The WCMD bit must be 1 and the command is only 4 bits in size */ /* 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); udelay(ISA_COMMAND_TIMEOUT);
port0 = inb_p(current_readport); port0 = inb_p(pcwd_private.io_addr);
for (i = 0; i < 25; ++i) { for (i = 0; i < 25; ++i) {
last_port0 = port0; last_port0 = port0;
port0 = inb_p(current_readport); port0 = inb_p(pcwd_private.io_addr);
if (port0 == last_port0) if (port0 == last_port0)
break; /* Data is stable */ break; /* Data is stable */
@ -184,7 +196,7 @@ static int set_command_mode(void)
int i, found=0, count=0; int i, found=0, count=0;
/* Set the card into command mode */ /* Set the card into command mode */
spin_lock(&io_lock); spin_lock(&pcwd_private.io_lock);
while ((!found) && (count < 3)) { while ((!found) && (count < 3)) {
i = send_isa_command(CMD_ISA_IDLE); i = send_isa_command(CMD_ISA_IDLE);
@ -192,15 +204,15 @@ static int set_command_mode(void)
found = 1; found = 1;
else if (i == 0xF3) { else if (i == 0xF3) {
/* Card does not like what we've done to it */ /* 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 */ udelay(1200); /* Spec says wait 1ms */
outb_p(0x00, current_readport + 2); outb_p(0x00, pcwd_private.io_addr + 2);
udelay(ISA_COMMAND_TIMEOUT); udelay(ISA_COMMAND_TIMEOUT);
} }
count++; count++;
} }
spin_unlock(&io_lock); spin_unlock(&pcwd_private.io_lock);
command_mode = found; pcwd_private.command_mode = found;
return(found); return(found);
} }
@ -208,12 +220,95 @@ static int set_command_mode(void)
static void unset_command_mode(void) static void unset_command_mode(void)
{ {
/* Set the card into normal mode */ /* 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); udelay(ISA_COMMAND_TIMEOUT);
spin_unlock(&io_lock); spin_unlock(&pcwd_private.io_lock);
command_mode = 0; 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");
}
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) 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 /* If we got a heartbeat pulse within the WDT_INTERVAL
* we agree to ping the WDT */ * we agree to ping the WDT */
if(time_before(jiffies, next_heartbeat)) { if(time_before(jiffies, pcwd_private.next_heartbeat)) {
/* Ping the watchdog */ /* 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 */ /* 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 &= 0x0F;
wdrst_stat |= WD_WDRST; wdrst_stat |= WD_WDRST;
outb_p(wdrst_stat, current_readport + 1); outb_p(wdrst_stat, pcwd_private.io_addr + 1);
} else { } else {
/* Re-trigger watchdog by writing to port 0 */ /* 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 */ /* 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 { } else {
printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n"); printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
} }
@ -250,19 +345,19 @@ static int pcwd_start(void)
{ {
int stat_reg; int stat_reg;
next_heartbeat = jiffies + (heartbeat * HZ); pcwd_private.next_heartbeat = jiffies + (heartbeat * HZ);
/* Start the timer */ /* Start the timer */
mod_timer(&timer, jiffies + WDT_INTERVAL); mod_timer(&pcwd_private.timer, jiffies + WDT_INTERVAL);
/* Enable the port */ /* 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); 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"); printk(KERN_INFO PFX "Could not start watchdog\n");
return -EIO; return -EIO;
} }
@ -275,18 +370,18 @@ static int pcwd_stop(void)
int stat_reg; int stat_reg;
/* Stop the timer */ /* Stop the timer */
del_timer(&timer); del_timer(&pcwd_private.timer);
/* Disable the board */ /* 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); udelay(ISA_COMMAND_TIMEOUT);
outb_p(0xA5, current_readport + 3); outb_p(0xA5, pcwd_private.io_addr + 3);
udelay(ISA_COMMAND_TIMEOUT); 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"); printk(KERN_INFO PFX "Could not stop watchdog\n");
return -EIO; return -EIO;
} }
@ -297,7 +392,7 @@ static int pcwd_stop(void)
static int pcwd_keepalive(void) static int pcwd_keepalive(void)
{ {
/* user land ping */ /* user land ping */
next_heartbeat = jiffies + (heartbeat * HZ); pcwd_private.next_heartbeat = jiffies + (heartbeat * HZ);
return 0; return 0;
} }
@ -315,23 +410,23 @@ static int pcwd_get_status(int *status)
int card_status; int card_status;
*status=0; *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 /* Rev A cards return status information from
* the base register, which is used for the * the base register, which is used for the
* temperature in other cards. */ * temperature in other cards. */
card_status = inb(current_readport); card_status = inb(pcwd_private.io_addr);
else { else {
/* Rev C cards return card status in the base /* Rev C cards return card status in the base
* address + 1 register. And use different bits * address + 1 register. And use different bits
* to indicate a card initiated reset, and an * to indicate a card initiated reset, and an
* over-temperature condition. And the reboot * over-temperature condition. And the reboot
* status can be reset. */ * 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) if (card_status & WD_WDRST)
*status |= WDIOF_CARDRESET; *status |= WDIOF_CARDRESET;
@ -360,10 +455,10 @@ static int pcwd_get_status(int *status)
static int pcwd_clear_status(void) 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; return 0;
} }
@ -371,20 +466,20 @@ static int pcwd_clear_status(void)
static int pcwd_get_temperature(int *temperature) static int pcwd_get_temperature(int *temperature)
{ {
/* check that port 0 gives temperature info and no command results */ /* check that port 0 gives temperature info and no command results */
if (command_mode) if (pcwd_private.command_mode)
return -1; return -1;
*temperature = 0; *temperature = 0;
if (!supports_temp) if (!pcwd_private.supports_temp)
return -ENODEV; return -ENODEV;
/* /*
* Convert celsius to fahrenheit, since this was * Convert celsius to fahrenheit, since this was
* the decided 'standard' for this return value. * 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; return 0;
} }
@ -425,7 +520,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
return put_user(status, argp); return put_user(status, argp);
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
return put_user(initial_status, argp); return put_user(pcwd_private.boot_status, argp);
case WDIOC_GETTEMP: case WDIOC_GETTEMP:
if (pcwd_get_temperature(&temperature)) if (pcwd_get_temperature(&temperature))
@ -434,7 +529,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
return put_user(temperature, argp); return put_user(temperature, argp);
case WDIOC_SETOPTIONS: case WDIOC_SETOPTIONS:
if (revision == PCWD_REVISION_C) if (pcwd_private.revision == PCWD_REVISION_C)
{ {
if(copy_from_user(&rv, argp, sizeof(int))) if(copy_from_user(&rv, argp, sizeof(int)))
return -EFAULT; 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) static int pcwd_temp_open(struct inode *inode, struct file *file)
{ {
if (!supports_temp) if (!pcwd_private.supports_temp)
return -ENODEV; return -ENODEV;
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
@ -616,68 +711,24 @@ static struct notifier_block pcwd_notifier = {
* Init & exit routines * Init & exit routines
*/ */
static inline void get_support(void)
{
if (inb(current_readport) != 0xF0)
supports_temp = 1;
}
static inline int get_revision(void) static inline int get_revision(void)
{ {
int r = PCWD_REVISION_C; int r = PCWD_REVISION_C;
spin_lock(&io_lock); spin_lock(&pcwd_private.io_lock);
/* REV A cards use only 2 io ports; test /* REV A cards use only 2 io ports; test
* presumes a floating bus reads as 0xff. */ * 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; r=PCWD_REVISION_A;
spin_unlock(&io_lock); spin_unlock(&pcwd_private.io_lock);
return r; 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) static int __devinit pcwatchdog_init(int base_addr)
{ {
int ret; int ret;
char *firmware;
int option_switches;
cards_found++; cards_found++;
if (cards_found == 1) 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"); printk(KERN_ERR PFX "No I/O-Address for card detected\n");
return -ENODEV; return -ENODEV;
} }
current_readport = base_addr; pcwd_private.io_addr = base_addr;
/* Check card's revision */ /* 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", 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; return -EIO;
} }
/* Initial variables */ /* Initial variables */
supports_temp = 0; pcwd_private.supports_temp = 0;
temp_panic = 0; temp_panic = 0;
initial_status = 0x0000; pcwd_private.boot_status = 0x0000;
/* get the boot_status */ /* get the boot_status */
pcwd_get_status(&initial_status); pcwd_get_status(&pcwd_private.boot_status);
/* clear the "card caused reboot" flag */ /* clear the "card caused reboot" flag */
pcwd_clear_status(); 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 */ /* Disable the board */
pcwd_stop(); pcwd_stop();
/* Check whether or not the card supports the temperature device */ /* 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) */ /* Show info about the card itself */
if (revision == PCWD_REVISION_A) pcwd_show_card_info();
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)
printk(KERN_INFO PFX "Temperature Option Detected\n");
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 */ /* 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); ret = register_reboot_notifier(&pcwd_notifier);
if (ret) { if (ret) {
printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
ret); 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; return ret;
} }
if (supports_temp) { if (pcwd_private.supports_temp) {
ret = misc_register(&temp_miscdev); ret = misc_register(&temp_miscdev);
if (ret) { if (ret) {
printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
TEMP_MINOR, ret); TEMP_MINOR, ret);
unregister_reboot_notifier(&pcwd_notifier); 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; return ret;
} }
} }
@ -798,11 +811,11 @@ static int __devinit pcwatchdog_init(int base_addr)
if (ret) { if (ret) {
printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
WATCHDOG_MINOR, ret); WATCHDOG_MINOR, ret);
if (supports_temp) if (pcwd_private.supports_temp)
misc_deregister(&temp_miscdev); misc_deregister(&temp_miscdev);
unregister_reboot_notifier(&pcwd_notifier); 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; return ret;
} }
@ -820,11 +833,12 @@ static void __devexit pcwatchdog_exit(void)
/* Deregister */ /* Deregister */
misc_deregister(&pcwd_miscdev); misc_deregister(&pcwd_miscdev);
if (supports_temp) if (pcwd_private.supports_temp)
misc_deregister(&temp_miscdev); misc_deregister(&temp_miscdev);
unregister_reboot_notifier(&pcwd_notifier); 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; int i, found = 0;
spin_lock_init(&io_lock); spin_lock_init(&pcwd_private.io_lock);
for (i = 0; pcwd_ioports[i] != 0; i++) { for (i = 0; pcwd_ioports[i] != 0; i++) {
if (pcwd_checkcard(pcwd_ioports[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) static void __exit pcwd_cleanup_module(void)
{ {
if (current_readport) if (pcwd_private.io_addr)
pcwatchdog_exit(); pcwatchdog_exit();
return; return;
} }

12
drivers/char/watchdog/sa1100_wdt.c
View File

@ -93,23 +93,25 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
{ {
int ret = -ENOIOCTLCMD; int ret = -ENOIOCTLCMD;
int time; int time;
void __user *argp = (void __user *)arg;
int __user *p = argp;
switch (cmd) { switch (cmd) {
case WDIOC_GETSUPPORT: case WDIOC_GETSUPPORT:
ret = copy_to_user((struct watchdog_info __user *)arg, &ident, ret = copy_to_user(argp, &ident,
sizeof(ident)) ? -EFAULT : 0; sizeof(ident)) ? -EFAULT : 0;
break; break;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
ret = put_user(0, (int __user *)arg); ret = put_user(0, p);
break; break;
case WDIOC_GETBOOTSTATUS: case WDIOC_GETBOOTSTATUS:
ret = put_user(boot_status, (int __user *)arg); ret = put_user(boot_status, p);
break; break;
case WDIOC_SETTIMEOUT: case WDIOC_SETTIMEOUT:
ret = get_user(time, (int __user *)arg); ret = get_user(time, p);
if (ret) if (ret)
break; break;
@ -123,7 +125,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
/*fall through*/ /*fall through*/
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg); ret = put_user(pre_margin / OSCR_FREQ, p);
break; break;
case WDIOC_KEEPALIVE: case WDIOC_KEEPALIVE:

1
drivers/net/wireless/orinoco_cs.c
View File

@ -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 PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),
PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26), 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("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("SMC", "SMC2632W", 0xc4f8b18b, 0x474a1f2a),
PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e), 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), PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),

13
drivers/s390/char/sclp.c
View File

@ -85,11 +85,10 @@ static volatile enum sclp_mask_state_t {
/* Maximum retry counts */ /* Maximum retry counts */
#define SCLP_INIT_RETRY 3 #define SCLP_INIT_RETRY 3
#define SCLP_MASK_RETRY 3 #define SCLP_MASK_RETRY 3
#define SCLP_REQUEST_RETRY 3
/* Timeout intervals in seconds.*/ /* 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 void sclp_process_queue(void);
static int sclp_init_mask(int calculate); 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) if (sclp_running_state != sclp_running_state_idle)
return 0; return 0;
del_timer(&sclp_request_timer); 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) { if (rc == 0) {
/* Sucessfully started request */ /* Sucessfully started request */
req->status = SCLP_REQ_RUNNING; req->status = SCLP_REQ_RUNNING;

10
drivers/s390/cio/chsc.c
View File

@ -232,7 +232,7 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
return 0; return 0;
mask = 0x80 >> j; mask = 0x80 >> j;
spin_lock(&sch->lock); spin_lock_irq(&sch->lock);
stsch(sch->schid, &schib); stsch(sch->schid, &schib);
if (!schib.pmcw.dnv) if (!schib.pmcw.dnv)
@ -281,10 +281,10 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
if (sch->driver && sch->driver->verify) if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev); sch->driver->verify(&sch->dev);
out_unlock: out_unlock:
spin_unlock(&sch->lock); spin_unlock_irq(&sch->lock);
return 0; return 0;
out_unreg: out_unreg:
spin_unlock(&sch->lock); spin_unlock_irq(&sch->lock);
sch->lpm = 0; sch->lpm = 0;
if (css_enqueue_subchannel_slow(sch->schid)) { if (css_enqueue_subchannel_slow(sch->schid)) {
css_clear_subchannel_slow_list(); css_clear_subchannel_slow_list();
@ -652,7 +652,7 @@ __chp_add(struct subchannel_id schid, void *data)
if (!sch) if (!sch)
/* Check if the subchannel is now available. */ /* Check if the subchannel is now available. */
return __chp_add_new_sch(schid); return __chp_add_new_sch(schid);
spin_lock(&sch->lock); spin_lock_irq(&sch->lock);
for (i=0; i<8; i++) for (i=0; i<8; i++)
if (sch->schib.pmcw.chpid[i] == chp->id) { if (sch->schib.pmcw.chpid[i] == chp->id) {
if (stsch(sch->schid, &sch->schib) != 0) { 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) if (sch->driver && sch->driver->verify)
sch->driver->verify(&sch->dev); sch->driver->verify(&sch->dev);
spin_unlock(&sch->lock); spin_unlock_irq(&sch->lock);
put_device(&sch->dev); put_device(&sch->dev);
return 0; return 0;
} }

5
drivers/video/Kconfig
View File

@ -525,11 +525,6 @@ config FB_GBE_MEM
This is the amount of memory reserved for the framebuffer, This is the amount of memory reserved for the framebuffer,
which can be any value between 1MB and 8MB. which can be any value between 1MB and 8MB.
config BUS_I2C
bool
depends on (FB = y) && VISWS
default y
config FB_SUN3 config FB_SUN3
bool "Sun3 framebuffer support" bool "Sun3 framebuffer support"
depends on (FB = y) && (SUN3 || SUN3X) && BROKEN depends on (FB = y) && (SUN3 || SUN3X) && BROKEN

2
drivers/video/fbmem.c
View File

@ -1550,6 +1550,7 @@ int fb_get_options(char *name, char **option)
return retval; return retval;
} }
#ifndef MODULE
/** /**
* video_setup - process command line options * video_setup - process command line options
* @options: string of options * @options: string of options
@ -1593,6 +1594,7 @@ static int __init video_setup(char *options)
return 0; return 0;
} }
__setup("video=", video_setup); __setup("video=", video_setup);
#endif
/* /*
* Visible symbols for modules * Visible symbols for modules

2
drivers/video/nvidia/nvidia.c
View File

@ -138,6 +138,8 @@ static struct pci_device_id nvidiafb_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X, {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 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_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO, {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO,

37
fs/compat.c
View File

@ -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); ret = compat_core_sys_select(n, inp, outp, exp, &timeout);
if (tvp) { if (tvp) {
struct compat_timeval rtv;
if (current->personality & STICKY_TIMEOUTS) if (current->personality & STICKY_TIMEOUTS)
goto sticky; 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: sticky:
/* /*
* If an application puts its timeval in read-only * 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)); } while (!ret && !timeout && tsp && (ts.tv_sec || ts.tv_nsec));
if (tsp && !(current->personality & STICKY_TIMEOUTS)) { 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) { if (ret == -ERESTARTNOHAND) {
@ -1918,12 +1926,17 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
sigprocmask(SIG_SETMASK, &sigsaved, NULL); sigprocmask(SIG_SETMASK, &sigsaved, NULL);
if (tsp && timeout >= 0) { if (tsp && timeout >= 0) {
struct compat_timespec rts;
if (current->personality & STICKY_TIMEOUTS) if (current->personality & STICKY_TIMEOUTS)
goto sticky; goto sticky;
/* Yes, we know it's actually an s64, but it's also positive. */ /* 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: sticky:
/* /*
* If an application puts its timeval in read-only * If an application puts its timeval in read-only

2
fs/reiserfs/super.c
View File

@ -1124,8 +1124,6 @@ static void handle_attrs(struct super_block *s)
"reiserfs: cannot support attributes until flag is set in super-block"); "reiserfs: cannot support attributes until flag is set in super-block");
REISERFS_SB(s)->s_mount_opt &= ~(1 << REISERFS_ATTRS); 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);
} }
} }

32
fs/select.c
View File

@ -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); ret = core_sys_select(n, inp, outp, exp, &timeout);
if (tvp) { if (tvp) {
struct timeval rtv;
if (current->personality & STICKY_TIMEOUTS) if (current->personality & STICKY_TIMEOUTS)
goto sticky; 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: sticky:
/* /*
* If an application puts its timeval in read-only * 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); ret = core_sys_select(n, inp, outp, exp, &timeout);
if (tsp) { if (tsp) {
struct timespec rts;
if (current->personality & STICKY_TIMEOUTS) if (current->personality & STICKY_TIMEOUTS)
goto sticky; 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: sticky:
/* /*
* If an application puts its timeval in read-only * 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); sigprocmask(SIG_SETMASK, &sigsaved, NULL);
if (tsp && timeout >= 0) { if (tsp && timeout >= 0) {
struct timespec rts;
if (current->personality & STICKY_TIMEOUTS) if (current->personality & STICKY_TIMEOUTS)
goto sticky; goto sticky;
/* Yes, we know it's actually an s64, but it's also positive. */ /* 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: sticky:
/* /*
* If an application puts its timeval in read-only * If an application puts its timeval in read-only

22
fs/stat.c
View File

@ -261,6 +261,7 @@ asmlinkage long sys_newlstat(char __user *filename, struct stat __user *statbuf)
return error; return error;
} }
#ifndef __ARCH_WANT_STAT64
asmlinkage long sys_newfstatat(int dfd, char __user *filename, asmlinkage long sys_newfstatat(int dfd, char __user *filename,
struct stat __user *statbuf, int flag) struct stat __user *statbuf, int flag)
{ {
@ -281,6 +282,7 @@ asmlinkage long sys_newfstatat(int dfd, char __user *filename,
out: out:
return error; return error;
} }
#endif
asmlinkage long sys_newfstat(unsigned int fd, struct stat __user *statbuf) 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; 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 */ #endif /* __ARCH_WANT_STAT64 */
void inode_add_bytes(struct inode *inode, loff_t bytes) void inode_add_bytes(struct inode *inode, loff_t bytes)

2
include/asm-i386/unistd.h
View File

@ -305,7 +305,7 @@
#define __NR_mknodat 297 #define __NR_mknodat 297
#define __NR_fchownat 298 #define __NR_fchownat 298
#define __NR_futimesat 299 #define __NR_futimesat 299
#define __NR_newfstatat 300 #define __NR_fstatat64 300
#define __NR_unlinkat 301 #define __NR_unlinkat 301
#define __NR_renameat 302 #define __NR_renameat 302
#define __NR_linkat 303 #define __NR_linkat 303

4
include/asm-s390/bitops.h
View File

@ -518,8 +518,8 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr
static inline int static inline int
__constant_test_bit(unsigned long nr, const volatile unsigned long *addr) { __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) \ #define test_bit(nr,addr) \

10
include/asm-s390/setup.h
View File

@ -8,6 +8,8 @@
#ifndef _ASM_S390_SETUP_H #ifndef _ASM_S390_SETUP_H
#define _ASM_S390_SETUP_H #define _ASM_S390_SETUP_H
#ifdef __KERNEL__
#include <asm/types.h> #include <asm/types.h>
#define PARMAREA 0x10400 #define PARMAREA 0x10400
@ -114,7 +116,7 @@ extern u16 ipl_devno;
IPL_PARMBLOCK_ORIGIN) IPL_PARMBLOCK_ORIGIN)
#define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length) #define IPL_PARMBLOCK_SIZE (IPL_PARMBLOCK_START->hdr.length)
#else #else /* __ASSEMBLY__ */
#ifndef __s390x__ #ifndef __s390x__
#define IPL_DEVICE 0x10404 #define IPL_DEVICE 0x10404
@ -127,6 +129,6 @@ extern u16 ipl_devno;
#endif /* __s390x__ */ #endif /* __s390x__ */
#define COMMAND_LINE 0x10480 #define COMMAND_LINE 0x10480
#endif #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif #endif /* _ASM_S390_SETUP_H */

1
include/asm-s390/smp.h
View File

@ -101,6 +101,7 @@ smp_call_function_on(void (*func) (void *info), void *info,
func(info); func(info);
return 0; return 0;
} }
#define smp_cpu_not_running(cpu) 1
#define smp_get_cpu(cpu) ({ 0; }) #define smp_get_cpu(cpu) ({ 0; })
#define smp_put_cpu(cpu) ({ 0; }) #define smp_put_cpu(cpu) ({ 0; })
#endif #endif

7
include/asm-s390/unistd.h
View File

@ -285,7 +285,7 @@
#define __NR_mknodat 290 #define __NR_mknodat 290
#define __NR_fchownat 291 #define __NR_fchownat 291
#define __NR_futimesat 292 #define __NR_futimesat 292
#define __NR_newfstatat 293 #define __NR_fstatat64 293
#define __NR_unlinkat 294 #define __NR_unlinkat 294
#define __NR_renameat 295 #define __NR_renameat 295
#define __NR_linkat 296 #define __NR_linkat 296
@ -295,8 +295,9 @@
#define __NR_faccessat 300 #define __NR_faccessat 300
#define __NR_pselect6 301 #define __NR_pselect6 301
#define __NR_ppoll 302 #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 * There are some system calls that are not present on 64 bit, some
@ -358,6 +359,7 @@
#undef __NR_fcntl64 #undef __NR_fcntl64
#undef __NR_sendfile64 #undef __NR_sendfile64
#undef __NR_fadvise64_64 #undef __NR_fadvise64_64
#undef __NR_fstatat64
#define __NR_select 142 #define __NR_select 142
#define __NR_getrlimit 191 /* SuS compliant getrlimit */ #define __NR_getrlimit 191 /* SuS compliant getrlimit */
@ -380,6 +382,7 @@
#define __NR_setgid 214 #define __NR_setgid 214
#define __NR_setfsuid 215 #define __NR_setfsuid 215
#define __NR_setfsgid 216 #define __NR_setfsgid 216
#define __NR_newfstatat 293
#endif #endif

2
include/asm-x86_64/hpet.h
View File

@ -55,6 +55,8 @@ extern int is_hpet_enabled(void);
extern int hpet_rtc_timer_init(void); extern int hpet_rtc_timer_init(void);
extern int oem_force_hpet_timer(void); extern int oem_force_hpet_timer(void);
extern int hpet_use_timer;
#ifdef CONFIG_HPET_EMULATE_RTC #ifdef CONFIG_HPET_EMULATE_RTC
extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask); extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask);
extern int hpet_set_rtc_irq_bit(unsigned long bit_mask); extern int hpet_set_rtc_irq_bit(unsigned long bit_mask);

2
include/asm-x86_64/ia32_unistd.h
View File

@ -305,7 +305,7 @@
#define __NR_ia32_mknodat 297 #define __NR_ia32_mknodat 297
#define __NR_ia32_fchownat 298 #define __NR_ia32_fchownat 298
#define __NR_ia32_futimesat 299 #define __NR_ia32_futimesat 299
#define __NR_ia32_newfstatat 300 #define __NR_ia32_fstatat64 300
#define __NR_ia32_unlinkat 301 #define __NR_ia32_unlinkat 301
#define __NR_ia32_renameat 302 #define __NR_ia32_renameat 302
#define __NR_ia32_linkat 303 #define __NR_ia32_linkat 303

20
include/linux/compat.h
View File

@ -161,5 +161,25 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from);
int get_compat_sigevent(struct sigevent *event, int get_compat_sigevent(struct sigevent *event,
const struct compat_sigevent __user *u_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 /* CONFIG_COMPAT */
#endif /* _LINUX_COMPAT_H */ #endif /* _LINUX_COMPAT_H */

1
include/linux/pci_ids.h
View File

@ -1087,6 +1087,7 @@
#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X 0x0181 #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_440SE_8X 0x0182
#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X 0x0183 #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_448_GO 0x0186
#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO 0x0187 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO 0x0187
#define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL 0x0188 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL 0x0188

2
include/linux/syscalls.h
View File

@ -557,6 +557,8 @@ asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
int mode); int mode);
asmlinkage long sys_newfstatat(int dfd, char __user *filename, asmlinkage long sys_newfstatat(int dfd, char __user *filename,
struct stat __user *statbuf, int flag); 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, asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf,
int bufsiz); int bufsiz);
asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,

25
include/linux/time.h
View File

@ -33,11 +33,34 @@ struct timezone {
#define NSEC_PER_SEC 1000000000L #define NSEC_PER_SEC 1000000000L
#define NSEC_PER_USEC 1000L #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); 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, extern unsigned long mktime(const unsigned int year, const unsigned int mon,
const unsigned int day, const unsigned int hour, const unsigned int day, const unsigned int hour,
const unsigned int min, const unsigned int sec); const unsigned int min, const unsigned int sec);

81
mm/vmscan.c
View File

@ -443,6 +443,10 @@ static int shrink_list(struct list_head *page_list, struct scan_control *sc)
BUG_ON(PageActive(page)); BUG_ON(PageActive(page));
sc->nr_scanned++; sc->nr_scanned++;
if (!sc->may_swap && page_mapped(page))
goto keep_locked;
/* Double the slab pressure for mapped and swapcache pages */ /* Double the slab pressure for mapped and swapcache pages */
if (page_mapped(page) || PageSwapCache(page)) if (page_mapped(page) || PageSwapCache(page))
sc->nr_scanned++; sc->nr_scanned++;
@ -1191,9 +1195,47 @@ refill_inactive_zone(struct zone *zone, struct scan_control *sc)
struct page *page; struct page *page;
struct pagevec pvec; struct pagevec pvec;
int reclaim_mapped = 0; 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(); lru_add_drain();
spin_lock_irq(&zone->lru_lock); spin_lock_irq(&zone->lru_lock);
@ -1203,37 +1245,6 @@ refill_inactive_zone(struct zone *zone, struct scan_control *sc)
zone->nr_active -= pgmoved; zone->nr_active -= pgmoved;
spin_unlock_irq(&zone->lru_lock); 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)) { while (!list_empty(&l_hold)) {
cond_resched(); cond_resched();
page = lru_to_page(&l_hold); page = lru_to_page(&l_hold);
@ -1610,9 +1621,7 @@ scan:
sc.nr_reclaimed = 0; sc.nr_reclaimed = 0;
sc.priority = priority; sc.priority = priority;
sc.swap_cluster_max = nr_pages? nr_pages : SWAP_CLUSTER_MAX; sc.swap_cluster_max = nr_pages? nr_pages : SWAP_CLUSTER_MAX;
atomic_inc(&zone->reclaim_in_progress);
shrink_zone(zone, &sc); shrink_zone(zone, &sc);
atomic_dec(&zone->reclaim_in_progress);
reclaim_state->reclaimed_slab = 0; reclaim_state->reclaimed_slab = 0;
nr_slab = shrink_slab(sc.nr_scanned, GFP_KERNEL, nr_slab = shrink_slab(sc.nr_scanned, GFP_KERNEL,
lru_pages); lru_pages);

2
net/bridge/br_netfilter.c
View File

@ -805,7 +805,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
print_error: print_error:
if (skb->dev != NULL) { if (skb->dev != NULL) {
printk("[%s]", skb->dev->name); printk("[%s]", skb->dev->name);
if (has_bridge_parent(skb->dev)) if (bridge_parent(skb->dev))
printk("[%s]", bridge_parent(skb->dev)->name); printk("[%s]", bridge_parent(skb->dev)->name);
} }
printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,