From fc8ea0ad750ed8f4d0663e5ccac3445d248c315e Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Fri, 2 Jul 2010 16:54:05 +0200
Subject: [PATCH] --- yaml --- r: 205525 b: refs/heads/master c:
 49c19400f60bbe362202d7e7b3e68cc66040d0fa h: refs/heads/master i:   205523:
 d0ea5c339f5befb3fa369e13ae7a68ebd07353a6 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/sysfs/file.c       | 3 ++-
 trunk/include/linux/sysfs.h | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b381a25ccd0f..7cbd0156a41c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3317fad5e9c741e758707879c68e20de2cb08f87
+refs/heads/master: 49c19400f60bbe362202d7e7b3e68cc66040d0fa
diff --git a/trunk/fs/sysfs/file.c b/trunk/fs/sysfs/file.c
index 1beaa739d0a6..1b27b5688f62 100644
--- a/trunk/fs/sysfs/file.c
+++ b/trunk/fs/sysfs/file.c
@@ -593,7 +593,8 @@ EXPORT_SYMBOL_GPL(sysfs_add_file_to_group);
  * @mode: file permissions.
  *
  */
-int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode)
+int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr,
+		     mode_t mode)
 {
 	struct sysfs_dirent *sd;
 	struct iattr newattrs;
diff --git a/trunk/include/linux/sysfs.h b/trunk/include/linux/sysfs.h
index f2694eb4dd3d..8bf06b64487c 100644
--- a/trunk/include/linux/sysfs.h
+++ b/trunk/include/linux/sysfs.h
@@ -136,8 +136,8 @@ int __must_check sysfs_create_file(struct kobject *kobj,
 				   const struct attribute *attr);
 int __must_check sysfs_create_files(struct kobject *kobj,
 				   const struct attribute **attr);
-int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr,
-				  mode_t mode);
+int __must_check sysfs_chmod_file(struct kobject *kobj,
+				  const struct attribute *attr, mode_t mode);
 void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
 void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr);
 
@@ -225,7 +225,7 @@ static inline int sysfs_create_files(struct kobject *kobj,
 }
 
 static inline int sysfs_chmod_file(struct kobject *kobj,
-				   struct attribute *attr, mode_t mode)
+				   const struct attribute *attr, mode_t mode)
 {
 	return 0;
 }