The patch titled
constify parts of kernel/power/
has been added to the -mm tree. Its filename is
constify-parts-of-kernel-power.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: constify parts of kernel/power/
From: Andreas Mohr <andi@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andreas Mohr <andi@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/power/disk.c | 2 +-
kernel/power/main.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/power/disk.c~constify-parts-of-kernel-power kernel/power/disk.c
--- 25/kernel/power/disk.c~constify-parts-of-kernel-power Wed May 24 13:48:43 2006
+++ 25-akpm/kernel/power/disk.c Wed May 24 13:48:43 2006
@@ -214,7 +214,7 @@ static int software_resume(void)
}
-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 -puN kernel/power/main.c~constify-parts-of-kernel-power kernel/power/main.c
--- 25/kernel/power/main.c~constify-parts-of-kernel-power Wed May 24 13:48:43 2006
+++ 25-akpm/kernel/power/main.c Wed May 24 13:48:43 2006
@@ -143,7 +143,7 @@ static void suspend_finish(suspend_state
-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_show(struct subsyst
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;
_
Patches currently in -mm which might be from andi@xxxxxxxxxxxxxxxxxxxxxxx are
origin.patch
git-acpi.patch
mm-constify-drivers-char-keyboardc.patch
acx1xx-wireless-driver.patch
i386-apmc-optimization.patch
x86-make-using_apic_timer-__read_mostly.patch
x86-cyrix-code-config_pci-fix--add-__initdata.patch
x86-constify-some-parts-of-arch-i386-kernel-cpu.patch
x86-make-i387-mxcsr_feature_mask-__read_mostly.patch
x86-make-acpi-errata-__read_mostly.patch
x86-constify-arch-i386-pci-irqc.patch
x86-use-proper-defines-for-i8259a-i-o.patch
x86-powerpc-make-hardirq_ctx-and-softirq_ctx-__read_mostly.patch
make-noirqdebug-irqfixup-__read_mostly-add-unlikely.patch
make-debug_mutex_on-__read_mostly.patch
constify-parts-of-kernel-power.patch
make-pmtmr_ioport-__read_mostly.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
