Since hpyfs is s390 specific we have to do the following:
- rename hypfs filesystem to s390-hypfs
- rename config option to S390_HYPFS_FS
Acked-by: Martin Schwidefsky <[email protected]>
Signed-off-by: Michael Holzheu <[email protected]>
---
arch/s390/Kconfig | 2 +-
arch/s390/hypfs/Makefile | 2 +-
arch/s390/hypfs/inode.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -urpN linux-2.6.16-hypfs-2006-04-28-update1/arch/s390/Kconfig linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/Kconfig
--- linux-2.6.16-hypfs-2006-04-28-update1/arch/s390/Kconfig 2006-05-04 10:22:24.000000000 +0200
+++ linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/Kconfig 2006-05-04 10:25:32.000000000 +0200
@@ -442,7 +442,7 @@ config NO_IDLE_HZ_INIT
The HZ timer is switched off in idle by default. That means the
HZ timer is already disabled at boot time.
-config HYPFS_FS
+config S390_HYPFS_FS
bool "s390 hypervisor file system support"
default y
help
diff -urpN linux-2.6.16-hypfs-2006-04-28-update1/arch/s390/hypfs/Makefile linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/hypfs/Makefile
--- linux-2.6.16-hypfs-2006-04-28-update1/arch/s390/hypfs/Makefile 2006-05-04 10:22:19.000000000 +0200
+++ linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/hypfs/Makefile 2006-05-04 10:23:23.000000000 +0200
@@ -2,6 +2,6 @@
# Makefile for the linux hypfs filesystem routines.
#
-obj-$(CONFIG_HYPFS_FS) += hypfs.o
+obj-$(CONFIG_S390_HYPFS_FS) += hypfs.o
hypfs-objs := inode.o hypfs_diag.o
diff -urpN linux-2.6.16-hypfs-2006-04-28-update1/arch/s390/hypfs/inode.c linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/hypfs/inode.c
--- linux-2.6.16-hypfs-2006-04-28-update1/arch/s390/hypfs/inode.c 2006-05-04 10:22:24.000000000 +0200
+++ linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/hypfs/inode.c 2006-05-04 10:23:49.000000000 +0200
@@ -422,7 +422,7 @@ static struct file_operations hypfs_file
static struct file_system_type hypfs_type = {
.owner = THIS_MODULE,
- .name = "hypfs",
+ .name = "s390-hypfs",
.get_sb = hypfs_get_super,
.kill_sb = kill_litter_super
};
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
