summaryrefslogtreecommitdiffstats
path: root/arch/s390/tools/silo/silo.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
commit116674acc97ba75a720329996877077d988443a2 (patch)
tree6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /arch/s390/tools/silo/silo.c
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'arch/s390/tools/silo/silo.c')
-rw-r--r--arch/s390/tools/silo/silo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/tools/silo/silo.c b/arch/s390/tools/silo/silo.c
index 827082f5c..9ac04ac2b 100644
--- a/arch/s390/tools/silo/silo.c
+++ b/arch/s390/tools/silo/silo.c
@@ -45,7 +45,7 @@ CONFIG cf_options[] = {
/* from dasd.h */
#define DASD_PARTN_BITS 2
-#define BIODASDRWTB _IOWR('D',5,int)
+#define BIODASDRWTB _IOWR('D',0,int)
/* end */
#define SILO_CFG "/etc/silo.conf"
@@ -554,7 +554,7 @@ int
main (int argct, char *argv[])
{
int rc = 0;
- char *save;
+ char *save=NULL;
char *tmpdir=getenv("TMPDIR");
if (tmpdir) {
NTRY( save=(char*)malloc(strlen(tmpdir)));