diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/.cvsignore | 1 | ||||
| -rw-r--r-- | kernel/configure.ac | 4 | ||||
| -rw-r--r-- | kernel/control.c | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/kernel/.cvsignore b/kernel/.cvsignore index 907cdec..ed24c33 100644 --- a/kernel/.cvsignore +++ b/kernel/.cvsignore @@ -9,3 +9,4 @@ config.* *.s .tmp_versions .*.d +*.symvers diff --git a/kernel/configure.ac b/kernel/configure.ac index 21dc036..c3c1f3f 100644 --- a/kernel/configure.ac +++ b/kernel/configure.ac @@ -76,8 +76,10 @@ if test "$ENABLE_FUSE_MODULE" = y; then AC_MSG_RESULT([$kernelbuild]) AC_MSG_CHECKING([kernel source version]) - if test -r $kernelbuild/include/linux/version.h; then + if test -r $kernelbuild/include/linux/version.h && fgrep -q UTS_RELEASE $kernelbuild/include/linux/version.h; then kernsrcver=`(echo "#include <linux/version.h>"; echo "kernsrcver=UTS_RELEASE") | cpp -I $kernelbuild/include | grep "^kernsrcver=" | cut -d \" -f 2` + elif test -r $kernelbuild/include/linux/utsrelease.h && fgrep -q UTS_RELEASE $kernelbuild/include/linux/utsrelease.h; then + kernsrcver=`(echo "#include <linux/utsrelease.h>"; echo "kernsrcver=UTS_RELEASE") | cpp -I $kernelbuild/include | grep "^kernsrcver=" | cut -d \" -f 2` fi if test -z "$kernsrcver"; then AC_MSG_RESULT([Not found]) diff --git a/kernel/control.c b/kernel/control.c index b17adb3..28956ef 100644 --- a/kernel/control.c +++ b/kernel/control.c @@ -74,7 +74,12 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent, const char *name, int mode, int nlink, struct inode_operations *iop, - struct file_operations *fop) +#ifdef KERNEL_2_6_17_PLUS + const struct file_operations *fop +#else + struct file_operations *fop +#endif +) { struct dentry *dentry; struct inode *inode; |