patch-2.4.4 linux/include/asm-s390x/setup.h
Next file: linux/include/asm-s390x/signal.h
Previous file: linux/include/asm-s390x/semaphore.h
Back to the patch index
Back to the overall index
- Lines: 65
- Date:
Wed Apr 11 19:02:29 2001
- Orig file:
v2.4.3/linux/include/asm-s390x/setup.h
- Orig date:
Tue Feb 13 14:13:44 2001
diff -u --recursive --new-file v2.4.3/linux/include/asm-s390x/setup.h linux/include/asm-s390x/setup.h
@@ -8,45 +8,34 @@
#ifndef _ASM_S390_SETUP_H
#define _ASM_S390_SETUP_H
-#define PARMAREA 0x10400
+#define PARMAREA 0x10400
+#define COMMAND_LINE_SIZE 896
+#define RAMDISK_ORIGIN 0x800000
+#define RAMDISK_SIZE 0x800000
#ifndef __ASSEMBLER__
-#define ORIG_ROOT_DEV (*(unsigned long *) (0x10400))
-#define MOUNT_ROOT_RDONLY (*(unsigned short *) (0x10408))
-#define MEMORY_SIZE (*(unsigned long *) (0x1040a))
-#define MACHINE_FLAGS (*(unsigned long *) (0x10412))
-#define INITRD_START (*(unsigned long *) (0x1041a))
-#define INITRD_SIZE (*(unsigned long *) (0x10422))
-#define RAMDISK_FLAGS (*(unsigned short *) (0x1042a))
+#define IPL_DEVICE (*(unsigned long *) (0x10400))
+#define INITRD_START (*(unsigned long *) (0x10408))
+#define INITRD_SIZE (*(unsigned long *) (0x10410))
#define COMMAND_LINE ((char *) (0x10480))
-#else
-
-#define ORIG_ROOT_DEV 0x10400
-#define MOUNT_ROOT_RDONLY 0x10408
-#define MEMORY_SIZE 0x1040a
-#define MACHINE_FLAGS 0x10412
-#define INITRD_START 0x1041a
-#define INITRD_SIZE 0x10422
-#define RAMDISK_FLAGS 0x1042a
-#define COMMAND_LINE 0x10480
-
-#endif
-
-#define COMMAND_LINE_SIZE 896
/*
* Machine features detected in head.S
*/
-#define MACHINE_IS_VM (MACHINE_FLAGS & 1)
-#define MACHINE_IS_P390 (MACHINE_FLAGS & 4)
+extern unsigned long machine_flags;
-#define RAMDISK_ORIGIN 0x800000
-#define RAMDISK_SIZE 0x800000
-#define RAMDISK_BLKSIZE 0x1000
-#define RAMDISK_IMAGE_START_MASK 0x07FF
-#define RAMDISK_PROMPT_FLAG 0x8000
-#define RAMDISK_LOAD_FLAG 0x4000
+#define MACHINE_IS_VM (machine_flags & 1)
+#define MACHINE_IS_P390 (machine_flags & 4)
+#define MACHINE_HAS_MVPG (machine_flags & 16)
+#else
+
+#define IPL_DEVICE 0x10400
+#define INITRD_START 0x10408
+#define INITRD_SIZE 0x10410
+#define COMMAND_LINE 0x10480
+
+#endif
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)