2006-05-23 18:54:18

by Andreas Mohr

Subject: [PATCH] -mm: constify parts of kernel/power/

Hello all,

patch run-tested on linux-2.6.17-rc4-mm3.

Signed-off-by: Andreas Mohr <[email protected]>


diff -urN linux-2.6.17-rc4-mm3.orig/kernel/power/disk.c linux-2.6.17-rc4-mm3.my/kernel/power/disk.c
--- linux-2.6.17-rc4-mm3.orig/kernel/power/disk.c 2006-05-23 19:14:17.000000000 +0200
+++ linux-2.6.17-rc4-mm3/kernel/power/disk.c 2006-05-23 16:53:04.000000000 +0200
@@ -214,7 +214,7 @@
}


-static char * pm_disk_modes[] = {
+static const char * const pm_disk_modes[] = {
[PM_DISK_FIRMWARE] = "firmware",
[PM_DISK_PLATFORM] = "platform",
[PM_DISK_SHUTDOWN] = "shutdown",
diff -urN linux-2.6.17-rc4-mm3.orig/kernel/power/main.c linux-2.6.17-rc4-mm3.my/kernel/power/main.c
--- linux-2.6.17-rc4-mm3.orig/kernel/power/main.c 2006-05-23 19:13:20.000000000 +0200
+++ linux-2.6.17-rc4-mm3/kernel/power/main.c 2006-05-23 16:42:42.000000000 +0200
@@ -143,7 +143,7 @@



-static char *pm_states[PM_SUSPEND_MAX] = {
+static const char * const pm_states[PM_SUSPEND_MAX] = {
[PM_SUSPEND_STANDBY] = "standby",
[PM_SUSPEND_MEM] = "mem",
#ifdef CONFIG_SOFTWARE_SUSPEND
@@ -260,7 +260,7 @@
static ssize_t state_store(struct subsystem * subsys, const char * buf, size_t n)
{
suspend_state_t state = PM_SUSPEND_STANDBY;
- char ** s;
+ const char * const * s;
char *p;
int error;
int len;

2006-05-23 21:13:50

by Pavel Machek

Subject: Re: [PATCH] -mm: constify parts of kernel/power/

Hi!

> patch run-tested on linux-2.6.17-rc4-mm3.
>
> Signed-off-by: Andreas Mohr <[email protected]>

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