Re: [PATCH 1/3] memparse(): constify argument

[Ingo Molnar]

* Jeremy Fitzhardinge <jeremy@xxxxxxxx> wrote:

> memparse()'s first argument can be const, so it should be.
>
> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>

this one clashed with upstream commit v2.6.26-6912-gfd19382, i've fixed 
it up as below.

	Ingo

-------
Subject: generic, memparse(): constify argument
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Thu, 24 Jul 2008 16:27:46 -0700

memparse()'s first argument can be const, so it should be.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 include/linux/kernel.h |    2 +-
 lib/cmdline.c          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

===================================================================
Index: tip/include/linux/kernel.h
===================================================================
--- tip.orig/include/linux/kernel.h
+++ tip/include/linux/kernel.h
@@ -176,7 +176,7 @@ extern int vsscanf(const char *, const c
 
 extern int get_option(char **str, int *pint);
 extern char *get_options(const char *str, int nints, int *ints);
-extern unsigned long long memparse(char *ptr, char **retptr);
+extern unsigned long long memparse(const char *ptr, char **retptr);
 
 extern int core_kernel_text(unsigned long addr);
 extern int __kernel_text_address(unsigned long addr);
Index: tip/lib/cmdline.c
===================================================================
--- tip.orig/lib/cmdline.c
+++ tip/lib/cmdline.c
@@ -126,7 +126,7 @@ char *get_options(const char *str, int n
  *	megabyte, or one gigabyte, respectively.
  */
 
-unsigned long long memparse(char *ptr, char **retptr)
+unsigned long long memparse(const char *ptr, char **retptr)
 {
 	char *endptr;	/* local pointer to end of parsed string */
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/