linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 6/6] [-mm]: ACPI: duplicate ACPI "info" attribute in sysfs
@ 2007-01-06 11:35 Zhang Rui
  2007-01-06 21:36 ` David Brownell
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Zhang Rui @ 2007-01-06 11:35 UTC (permalink / raw)
  To: lenb; +Cc: linux-acpi@vger, linux-pm

From: Zhang Rui <rui.zhang@intel.com>

Add "info" attribute to indicates ACPICA version.
/proc/acpi/info is deprecated by /sys/firmware/acpi/info.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/acpi/Kconfig  |    3 ++-
 drivers/acpi/system.c |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 6 deletions(-)

Index: linux-2.6.20-rc2-mm1/drivers/acpi/system.c
===================================================================
--- linux-2.6.20-rc2-mm1.orig/drivers/acpi/system.c	2007-01-06 13:51:39.000000000 +0800
+++ linux-2.6.20-rc2-mm1/drivers/acpi/system.c	2007-01-06 14:49:45.000000000 +0800
@@ -29,6 +29,7 @@
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_drivers.h>
+#include <acpi/acpi_bus.h>
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("acpi_system")
@@ -42,8 +43,32 @@ ACPI_MODULE_NAME("acpi_system")
 extern struct fadt_descriptor acpi_fadt;
 
 /* --------------------------------------------------------------------------
+                              FS Interface (/sys)
+   -------------------------------------------------------------------------- */
+extern struct subsystem acpi_subsys;
+
+static ssize_t info_show(struct subsystem *subsys, char *buf)
+{
+	return 	sprintf(buf, "version:                 %x\n", ACPI_CA_VERSION);
+}
+
+static struct subsys_attribute info_attr = {
+	.attr	= {
+		.name = __stringify(info),
+		.mode = 0444,
+	},
+	.show = info_show,
+	.store = NULL,
+};
+
+static int acpi_system_info_add_sysfs(void)
+{
+	return sysfs_create_file(&acpi_subsys.kset.kobj, &info_attr.attr);
+}
+/* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
+#ifdef CONFIG_ACPI_PROCFS
 
 static int acpi_system_read_info(struct seq_file *seq, void *offset)
 {
@@ -63,6 +88,7 @@ static const struct file_operations acpi
 	.llseek = seq_lseek,
 	.release = single_release,
 };
+#endif
 
 static ssize_t acpi_system_read_dsdt(struct file *, char __user *, size_t,
 				     loff_t *);
@@ -118,16 +144,13 @@ acpi_system_read_fadt(struct file *file,
 	return res;
 }
 
-static int __init acpi_system_init(void)
+static int  acpi_system_procfs_init(void)
 {
 	struct proc_dir_entry *entry;
 	int error = 0;
 	char *name;
 
-
-	if (acpi_disabled)
-		return 0;
-
+#ifdef CONFIG_ACPI_PROCFS
 	/* 'info' [R] */
 	name = ACPI_SYSTEM_FILE_INFO;
 	entry = create_proc_entry(name, S_IRUGO, acpi_root_dir);
@@ -136,6 +159,7 @@ static int __init acpi_system_init(void)
 	else {
 		entry->proc_fops = &acpi_system_info_ops;
 	}
+#endif
 
 	/* 'dsdt' [R] */
 	name = ACPI_SYSTEM_FILE_DSDT;
@@ -165,4 +189,18 @@ static int __init acpi_system_init(void)
 	goto Done;
 }
 
+static int __init acpi_system_init(void) {
+	int result;
+
+	if (acpi_disabled)
+		return 0;
+
+	result = acpi_system_info_add_sysfs();
+	if(result)
+		return result;
+
+	result = acpi_system_procfs_init();
+
+	return result;
+}
 subsys_initcall(acpi_system_init);
Index: linux-2.6.20-rc2-mm1/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.20-rc2-mm1.orig/drivers/acpi/Kconfig	2007-01-06 14:37:10.000000000 +0800
+++ linux-2.6.20-rc2-mm1/drivers/acpi/Kconfig	2007-01-06 14:46:24.000000000 +0800
@@ -78,7 +78,8 @@ config ACPI_PROCFS
 	    /proc/acpi/sleep is deprecated by /sys/power/state.
 	    /proc/acpi/alarm is deprecated by /sys/power/alarm.
 	    /proc/acpi/wakeup is deprecated by
-	    /sys/devices/acpi_system/.../device/sleep_state && wakeup. )
+	    /sys/devices/acpi_system/.../device/sleep_state && wakeup.
+	    /proc/acpi/info is deprecated by /sys/firmware/acpi/info. )
 
 config ACPI_AC
 	tristate "AC Adapter"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 6/6] [-mm]: ACPI: duplicate ACPI "info" attribute in sysfs
  2007-01-06 11:35 [PATCH 6/6] [-mm]: ACPI: duplicate ACPI "info" attribute in sysfs Zhang Rui
@ 2007-01-06 21:36 ` David Brownell
  2007-01-07 15:39 ` [linux-pm] " Pavel Machek
  2007-01-21  5:50 ` [PATCH 3/3] [-mm]: ACPI: add ACPICA version " Zhang Rui
  2 siblings, 0 replies; 6+ messages in thread
From: David Brownell @ 2007-01-06 21:36 UTC (permalink / raw)
  To: linux-pm; +Cc: linux-acpi@vger, linux-pm

On Saturday 06 January 2007 3:35 am, Zhang Rui wrote:

> +static struct subsys_attribute info_attr = {
> +	.attr	= {
> +		.name = __stringify(info),
> +		.mode = 0444,
> +	},
> +	.show = info_show,
> +	.store = NULL,
> +};

Please don't expand __ATTR_RO(info) by hand; notice what
your manual version omitted, for one thing ...

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [linux-pm] [PATCH 6/6] [-mm]: ACPI: duplicate ACPI "info" attribute in sysfs
  2007-01-06 11:35 [PATCH 6/6] [-mm]: ACPI: duplicate ACPI "info" attribute in sysfs Zhang Rui
  2007-01-06 21:36 ` David Brownell
@ 2007-01-07 15:39 ` Pavel Machek
  2007-01-21  5:50 ` [PATCH 3/3] [-mm]: ACPI: add ACPICA version " Zhang Rui
  2 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2007-01-07 15:39 UTC (permalink / raw)
  To: Zhang Rui; +Cc: lenb, linux-acpi@vger, linux-pm

Hi!

>  
>  /* --------------------------------------------------------------------------
> +                              FS Interface (/sys)
> +   -------------------------------------------------------------------------- */
> +extern struct subsystem acpi_subsys;
> +
> +static ssize_t info_show(struct subsystem *subsys, char *buf)
> +{
> +	return 	sprintf(buf, "version:                 %x\n", ACPI_CA_VERSION);
> +}

One value per file... so it should omit "version: " string at the very least.

Plus I do not think we should have this file at all. ACPI is pretty
much in sync with kernel these days, and we do not have 

/sys/scsi/scsi_core version nor /sys/vm/vm_internals_version etc.

									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 3/3] [-mm]: ACPI: add ACPICA version in sysfs
  2007-01-06 11:35 [PATCH 6/6] [-mm]: ACPI: duplicate ACPI "info" attribute in sysfs Zhang Rui
  2007-01-06 21:36 ` David Brownell
  2007-01-07 15:39 ` [linux-pm] " Pavel Machek
@ 2007-01-21  5:50 ` Zhang Rui
  2007-01-25  2:42   ` Len Brown
  2 siblings, 1 reply; 6+ messages in thread
From: Zhang Rui @ 2007-01-21  5:50 UTC (permalink / raw)
  To: lenb; +Cc: linux-acpi@vger

From: Zhang Rui <rui.zhang@intel.com>

Add an ACPI attribute to indicate ACPICA version.
/proc/acpi/version is deprecated by /sys/firmware/acpi/info.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/acpi/Kconfig    |    3 ++-
 drivers/acpi/system.c   |   43 +++++++++++++++++++++++++++++++++++++------
 include/acpi/acpi_bus.h |    7 +++++++
 3 files changed, 46 insertions(+), 7 deletions(-)

Index: linux-2.6.20-rc4-mm1/drivers/acpi/system.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/drivers/acpi/system.c	2007-01-21 12:58:31.000000000 +0800
+++ linux-2.6.20-rc4-mm1/drivers/acpi/system.c	2007-01-21 13:03:44.000000000 +0800
@@ -29,6 +29,7 @@
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_drivers.h>
+#include <acpi/acpi_bus.h>
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("acpi_system")
@@ -42,8 +43,24 @@ ACPI_MODULE_NAME("acpi_system")
 extern struct fadt_descriptor acpi_fadt;
 
 /* --------------------------------------------------------------------------
+                              FS Interface (/sys)
+   -------------------------------------------------------------------------- */
+extern struct subsystem acpi_subsys;
+
+static ssize_t version_show(struct subsystem *subsys, char *buf)
+{
+	return 	sprintf(buf, "%x\n", ACPI_CA_VERSION);
+}
+acpi_ro_attr(version);
+
+static int acpi_system_info_add_sysfs(void)
+{
+	return sysfs_create_file(&acpi_subsys.kset.kobj, &version_attr.attr);
+}
+/* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
+#ifdef CONFIG_ACPI_PROCFS
 
 static int acpi_system_read_info(struct seq_file *seq, void *offset)
 {
@@ -63,6 +80,7 @@ static const struct file_operations acpi
 	.llseek = seq_lseek,
 	.release = single_release,
 };
+#endif
 
 static ssize_t acpi_system_read_dsdt(struct file *, char __user *, size_t,
 				     loff_t *);
@@ -118,16 +136,13 @@ acpi_system_read_fadt(struct file *file,
 	return res;
 }
 
-static int __init acpi_system_init(void)
+static int  acpi_system_procfs_init(void)
 {
 	struct proc_dir_entry *entry;
 	int error = 0;
 	char *name;
 
-
-	if (acpi_disabled)
-		return 0;
-
+#ifdef CONFIG_ACPI_PROCFS
 	/* 'info' [R] */
 	name = ACPI_SYSTEM_FILE_INFO;
 	entry = create_proc_entry(name, S_IRUGO, acpi_root_dir);
@@ -136,6 +151,7 @@ static int __init acpi_system_init(void)
 	else {
 		entry->proc_fops = &acpi_system_info_ops;
 	}
+#endif
 
 	/* 'dsdt' [R] */
 	name = ACPI_SYSTEM_FILE_DSDT;
@@ -159,10 +175,25 @@ static int __init acpi_system_init(void)
       Error:
 	remove_proc_entry(ACPI_SYSTEM_FILE_FADT, acpi_root_dir);
 	remove_proc_entry(ACPI_SYSTEM_FILE_DSDT, acpi_root_dir);
+#ifdef CONFIG_ACPI_PROCFS
 	remove_proc_entry(ACPI_SYSTEM_FILE_INFO, acpi_root_dir);
-
+#endif
 	error = -EFAULT;
 	goto Done;
 }
 
+static int __init acpi_system_init(void) {
+	int result;
+
+	if (acpi_disabled)
+		return 0;
+
+	result = acpi_system_info_add_sysfs();
+	if (result)
+		return result;
+
+	result = acpi_system_procfs_init();
+
+	return result;
+}
 subsys_initcall(acpi_system_init);
Index: linux-2.6.20-rc4-mm1/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.20-rc4-mm1.orig/drivers/acpi/Kconfig	2007-01-21 12:58:31.000000000 +0800
+++ linux-2.6.20-rc4-mm1/drivers/acpi/Kconfig	2007-01-21 13:02:23.000000000 +0800
@@ -87,7 +87,8 @@ config ACPI_PROCFS
 	  and this proc interface will be removed some time later,
 	  it's marked as deprecated.
 	  ( /proc/acpi/debug_layer && debug_level are deprecated by
-	    /sys/module/acpi/parameters/debug_layer && debug_level. )
+	    /sys/module/acpi/parameters/debug_layer && debug_level.
+	    /proc/acpi/info is deprecated by /sys/firmware/acpi/version )
 
 config ACPI_AC
 	tristate "AC Adapter"
Index: linux-2.6.20-rc4-mm1/include/acpi/acpi_bus.h
===================================================================
--- linux-2.6.20-rc4-mm1.orig/include/acpi/acpi_bus.h	2007-01-21 12:58:31.000000000 +0800
+++ linux-2.6.20-rc4-mm1/include/acpi/acpi_bus.h	2007-01-21 13:04:34.000000000 +0800
@@ -320,6 +320,13 @@ struct acpi_bus_event {
 extern struct subsystem acpi_subsys;
 
 /*
+ * This is for ACPI read only data
+ * Like ACPICA version, ACPI tables, etc.
+ */
+#define acpi_ro_attr(_name)	\
+static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
+
+/*
  * External Functions
  */
 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] [-mm]: ACPI: add ACPICA version in sysfs
  2007-01-21  5:50 ` [PATCH 3/3] [-mm]: ACPI: add ACPICA version " Zhang Rui
@ 2007-01-25  2:42   ` Len Brown
  0 siblings, 0 replies; 6+ messages in thread
From: Len Brown @ 2007-01-25  2:42 UTC (permalink / raw)
  To: Zhang Rui; +Cc: linux-acpi@vger

How about instead something like this?

module_param(acpica_version, uint, 0444);

unsigned int acpica_version = ACPI_CA_VERSION;

On Sunday 21 January 2007 00:50, Zhang Rui wrote:
> From: Zhang Rui <rui.zhang@intel.com>
> 
> Add an ACPI attribute to indicate ACPICA version.
> /proc/acpi/version is deprecated by /sys/firmware/acpi/info.
> 
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
>  drivers/acpi/Kconfig    |    3 ++-
>  drivers/acpi/system.c   |   43 +++++++++++++++++++++++++++++++++++++------
>  include/acpi/acpi_bus.h |    7 +++++++
>  3 files changed, 46 insertions(+), 7 deletions(-)
> 
> Index: linux-2.6.20-rc4-mm1/drivers/acpi/system.c
> ===================================================================
> --- linux-2.6.20-rc4-mm1.orig/drivers/acpi/system.c	2007-01-21 12:58:31.000000000 +0800
> +++ linux-2.6.20-rc4-mm1/drivers/acpi/system.c	2007-01-21 13:03:44.000000000 +0800
> @@ -29,6 +29,7 @@
>  #include <asm/uaccess.h>
>  
>  #include <acpi/acpi_drivers.h>
> +#include <acpi/acpi_bus.h>
>  
>  #define _COMPONENT		ACPI_SYSTEM_COMPONENT
>  ACPI_MODULE_NAME("acpi_system")
> @@ -42,8 +43,24 @@ ACPI_MODULE_NAME("acpi_system")
>  extern struct fadt_descriptor acpi_fadt;
>  
>  /* --------------------------------------------------------------------------
> +                              FS Interface (/sys)
> +   -------------------------------------------------------------------------- */
> +extern struct subsystem acpi_subsys;
> +
> +static ssize_t version_show(struct subsystem *subsys, char *buf)
> +{
> +	return 	sprintf(buf, "%x\n", ACPI_CA_VERSION);
> +}
> +acpi_ro_attr(version);
> +
> +static int acpi_system_info_add_sysfs(void)
> +{
> +	return sysfs_create_file(&acpi_subsys.kset.kobj, &version_attr.attr);
> +}
> +/* --------------------------------------------------------------------------
>                                FS Interface (/proc)
>     -------------------------------------------------------------------------- */
> +#ifdef CONFIG_ACPI_PROCFS
>  
>  static int acpi_system_read_info(struct seq_file *seq, void *offset)
>  {
> @@ -63,6 +80,7 @@ static const struct file_operations acpi
>  	.llseek = seq_lseek,
>  	.release = single_release,
>  };
> +#endif
>  
>  static ssize_t acpi_system_read_dsdt(struct file *, char __user *, size_t,
>  				     loff_t *);
> @@ -118,16 +136,13 @@ acpi_system_read_fadt(struct file *file,
>  	return res;
>  }
>  
> -static int __init acpi_system_init(void)
> +static int  acpi_system_procfs_init(void)
>  {
>  	struct proc_dir_entry *entry;
>  	int error = 0;
>  	char *name;
>  
> -
> -	if (acpi_disabled)
> -		return 0;
> -
> +#ifdef CONFIG_ACPI_PROCFS
>  	/* 'info' [R] */
>  	name = ACPI_SYSTEM_FILE_INFO;
>  	entry = create_proc_entry(name, S_IRUGO, acpi_root_dir);
> @@ -136,6 +151,7 @@ static int __init acpi_system_init(void)
>  	else {
>  		entry->proc_fops = &acpi_system_info_ops;
>  	}
> +#endif
>  
>  	/* 'dsdt' [R] */
>  	name = ACPI_SYSTEM_FILE_DSDT;
> @@ -159,10 +175,25 @@ static int __init acpi_system_init(void)
>        Error:
>  	remove_proc_entry(ACPI_SYSTEM_FILE_FADT, acpi_root_dir);
>  	remove_proc_entry(ACPI_SYSTEM_FILE_DSDT, acpi_root_dir);
> +#ifdef CONFIG_ACPI_PROCFS
>  	remove_proc_entry(ACPI_SYSTEM_FILE_INFO, acpi_root_dir);
> -
> +#endif
>  	error = -EFAULT;
>  	goto Done;
>  }
>  
> +static int __init acpi_system_init(void) {
> +	int result;
> +
> +	if (acpi_disabled)
> +		return 0;
> +
> +	result = acpi_system_info_add_sysfs();
> +	if (result)
> +		return result;
> +
> +	result = acpi_system_procfs_init();
> +
> +	return result;
> +}
>  subsys_initcall(acpi_system_init);
> Index: linux-2.6.20-rc4-mm1/drivers/acpi/Kconfig
> ===================================================================
> --- linux-2.6.20-rc4-mm1.orig/drivers/acpi/Kconfig	2007-01-21 12:58:31.000000000 +0800
> +++ linux-2.6.20-rc4-mm1/drivers/acpi/Kconfig	2007-01-21 13:02:23.000000000 +0800
> @@ -87,7 +87,8 @@ config ACPI_PROCFS
>  	  and this proc interface will be removed some time later,
>  	  it's marked as deprecated.
>  	  ( /proc/acpi/debug_layer && debug_level are deprecated by
> -	    /sys/module/acpi/parameters/debug_layer && debug_level. )
> +	    /sys/module/acpi/parameters/debug_layer && debug_level.
> +	    /proc/acpi/info is deprecated by /sys/firmware/acpi/version )
>  
>  config ACPI_AC
>  	tristate "AC Adapter"
> Index: linux-2.6.20-rc4-mm1/include/acpi/acpi_bus.h
> ===================================================================
> --- linux-2.6.20-rc4-mm1.orig/include/acpi/acpi_bus.h	2007-01-21 12:58:31.000000000 +0800
> +++ linux-2.6.20-rc4-mm1/include/acpi/acpi_bus.h	2007-01-21 13:04:34.000000000 +0800
> @@ -320,6 +320,13 @@ struct acpi_bus_event {
>  extern struct subsystem acpi_subsys;
>  
>  /*
> + * This is for ACPI read only data
> + * Like ACPICA version, ACPI tables, etc.
> + */
> +#define acpi_ro_attr(_name)	\
> +static struct subsys_attribute _name##_attr = __ATTR_RO(_name)
> +
> +/*
>   * External Functions
>   */
>  
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 3/3] [-mm]: ACPI: add ACPICA version in sysfs
@ 2007-01-29  3:02 Zhang Rui
  0 siblings, 0 replies; 6+ messages in thread
From: Zhang Rui @ 2007-01-29  3:02 UTC (permalink / raw)
  To: lenb; +Cc: linux-acpi@vger

From: Zhang Rui <rui.zhang@intel.com>

Add an ACPI attribute to indicate ACPICA version.
/proc/acpi/version is deprecated by /sys/module/acpi/parameters/acpica_version.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/acpi/Kconfig  |    4 +++-
 drivers/acpi/system.c |   24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

Index: linux-2.6.20-rc4-mm1/drivers/acpi/system.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/drivers/acpi/system.c	2007-01-29 09:24:06.000000000 +0800
+++ linux-2.6.20-rc4-mm1/drivers/acpi/system.c	2007-01-29 11:00:21.000000000 +0800
@@ -32,6 +32,11 @@
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("acpi_system")
+#ifdef MODULE_PARAM_PREFIX
+#undef MODULE_PARAM_PREFIX
+#endif
+#define MODULE_PARAM_PREFIX "acpi."
+
 #define ACPI_SYSTEM_CLASS		"system"
 #define ACPI_SYSTEM_DRIVER_NAME		"ACPI System Driver"
 #define ACPI_SYSTEM_DEVICE_NAME		"System"
@@ -41,9 +46,23 @@ ACPI_MODULE_NAME("acpi_system")
 #define ACPI_SYSTEM_FILE_FADT		"fadt"
 extern struct fadt_descriptor acpi_fadt;
 
+/*
+ * Make ACPICA version work as module param
+ */
+static int param_get_acpica_version(char *buffer, struct kernel_param *kp) {
+	int result;
+
+	result = sprintf(buffer, "%x", ACPI_CA_VERSION);
+
+	return result;
+}
+
+module_param_call(acpica_version, NULL, param_get_acpica_version, NULL, 0444);
+
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
+#ifdef CONFIG_ACPI_PROCFS
 
 static int acpi_system_read_info(struct seq_file *seq, void *offset)
 {
@@ -63,6 +82,7 @@ static const struct file_operations acpi
 	.llseek = seq_lseek,
 	.release = single_release,
 };
+#endif
 
 static ssize_t acpi_system_read_dsdt(struct file *, char __user *, size_t,
 				     loff_t *);
@@ -128,6 +148,7 @@ static int __init acpi_system_init(void)
 	if (acpi_disabled)
 		return 0;
 
+#ifdef CONFIG_ACPI_PROCFS
 	/* 'info' [R] */
 	name = ACPI_SYSTEM_FILE_INFO;
 	entry = create_proc_entry(name, S_IRUGO, acpi_root_dir);
@@ -136,6 +157,7 @@ static int __init acpi_system_init(void)
 	else {
 		entry->proc_fops = &acpi_system_info_ops;
 	}
+#endif
 
 	/* 'dsdt' [R] */
 	name = ACPI_SYSTEM_FILE_DSDT;
@@ -159,7 +181,9 @@ static int __init acpi_system_init(void)
       Error:
 	remove_proc_entry(ACPI_SYSTEM_FILE_FADT, acpi_root_dir);
 	remove_proc_entry(ACPI_SYSTEM_FILE_DSDT, acpi_root_dir);
+#ifdef CONFIG_ACPI_PROCFS
 	remove_proc_entry(ACPI_SYSTEM_FILE_INFO, acpi_root_dir);
+#endif
 
 	error = -EFAULT;
 	goto Done;
Index: linux-2.6.20-rc4-mm1/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.20-rc4-mm1.orig/drivers/acpi/Kconfig	2007-01-29 09:27:11.000000000 +0800
+++ linux-2.6.20-rc4-mm1/drivers/acpi/Kconfig	2007-01-29 09:27:13.000000000 +0800
@@ -87,7 +87,9 @@ config ACPI_PROCFS
 	  and this proc interface will be removed some time later,
 	  it's marked as deprecated.
 	  ( /proc/acpi/debug_layer && debug_level are deprecated by
-	    /sys/module/acpi/parameters/debug_layer && debug_level. )
+	    /sys/module/acpi/parameters/debug_layer && debug_level.
+	    /proc/acpi/info is deprecated by
+	    /sys/module/acpi/parameters/acpica_version )
 
 config ACPI_AC
 	tristate "AC Adapter"

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2007-01-29  3:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-06 11:35 [PATCH 6/6] [-mm]: ACPI: duplicate ACPI "info" attribute in sysfs Zhang Rui
2007-01-06 21:36 ` David Brownell
2007-01-07 15:39 ` [linux-pm] " Pavel Machek
2007-01-21  5:50 ` [PATCH 3/3] [-mm]: ACPI: add ACPICA version " Zhang Rui
2007-01-25  2:42   ` Len Brown
  -- strict thread matches above, loose matches on Subject: below --
2007-01-29  3:02 Zhang Rui

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).