diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /arch/s390/hypfs/hypfs.h | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'arch/s390/hypfs/hypfs.h')
| -rw-r--r-- | arch/s390/hypfs/hypfs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h index f3dbd91965c6..aea572009d60 100644 --- a/arch/s390/hypfs/hypfs.h +++ b/arch/s390/hypfs/hypfs.h | |||
| @@ -27,4 +27,13 @@ extern struct dentry *hypfs_create_str(struct super_block *sb, | |||
| 27 | struct dentry *dir, const char *name, | 27 | struct dentry *dir, const char *name, |
| 28 | char *string); | 28 | char *string); |
| 29 | 29 | ||
| 30 | /* LPAR Hypervisor */ | ||
| 31 | extern int hypfs_diag_init(void); | ||
| 32 | extern void hypfs_diag_exit(void); | ||
| 33 | extern int hypfs_diag_create_files(struct super_block *sb, struct dentry *root); | ||
| 34 | |||
| 35 | /* VM Hypervisor */ | ||
| 36 | extern int hypfs_vm_init(void); | ||
| 37 | extern int hypfs_vm_create_files(struct super_block *sb, struct dentry *root); | ||
| 38 | |||
| 30 | #endif /* _HYPFS_H_ */ | 39 | #endif /* _HYPFS_H_ */ |