diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-08 08:34:43 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-08 08:34:43 +0000 |
| commit | 988e68616023242d732a0ae70f639e018242b71d (patch) | |
| tree | 481637953adfc3de9ef2a63ccaf2433c0e357315 /linux-2.6.11-xen-sparse | |
| parent | b9ed424f286ecb80aa668d3ff9e387fdb89b03e0 (diff) | |
| download | xen-988e68616023242d732a0ae70f639e018242b71d.tar.gz xen-988e68616023242d732a0ae70f639e018242b71d.tar.bz2 xen-988e68616023242d732a0ae70f639e018242b71d.zip | |
bitkeeper revision 1.1691.1.1 (42a6ada344SrT9VotpxjpMFmC9Wsng)
Increase max cmdline to 1024 characters.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'linux-2.6.11-xen-sparse')
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c | 8 | ||||
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c index c5f6c665fb..938bcabd86 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c @@ -699,12 +699,14 @@ static inline void copy_edd(void) static void __init parse_cmdline_early (char ** cmdline_p) { char c = ' ', *to = command_line, *from = saved_command_line; - int len = 0; + int len = 0, max_cmdline; int userdef = 0; - memcpy(saved_command_line, xen_start_info.cmd_line, MAX_CMDLINE); + if ((max_cmdline = MAX_GUEST_CMDLINE) > COMMAND_LINE_SIZE) + max_cmdline = COMMAND_LINE_SIZE; + memcpy(saved_command_line, xen_start_info.cmd_line, max_cmdline); /* Save unparsed command line copy for /proc/cmdline */ - saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; + saved_command_line[max_cmdline-1] = '\0'; for (;;) { if (c != ' ') diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c index 8638aaa107..8951d61c2a 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c @@ -318,12 +318,13 @@ union xen_start_info_union xen_start_info_union; static __init void parse_cmdline_early (char ** cmdline_p) { char c = ' ', *to = command_line, *from = COMMAND_LINE; - int len = 0; + int len = 0, max_cmdline; - memcpy(saved_command_line, xen_start_info.cmd_line, MAX_CMDLINE); + if ((max_cmdline = MAX_GUEST_CMDLINE) > COMMAND_LINE_SIZE) + max_cmdline = COMMAND_LINE_SIZE; + memcpy(saved_command_line, xen_start_info.cmd_line, max_cmdline); /* Save unparsed command line copy for /proc/cmdline */ - memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE); - saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; + saved_command_line[max_cmdline-1] = '\0'; for (;;) { if (c != ' ') |