# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1251709752 -3600
# Node ID cf95641ba1d0a6a868f161a45a48f8aac9dd54d3
# Parent 030fb43b848ac008912197858084260d7ea8b77b
properly __initdata-annotate command line option string buffers
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/x86/acpi/power.c | 2 +-
xen/arch/x86/domain_build.c | 4 ++--
xen/common/gdbstub.c | 2 +-
xen/common/page_alloc.c | 2 +-
xen/common/schedule.c | 2 +-
xen/drivers/char/console.c | 4 ++--
xen/drivers/char/ns16550.c | 3 ++-
xen/drivers/video/vga.c | 2 +-
8 files changed, 11 insertions(+), 10 deletions(-)
diff -r 030fb43b848a -r cf95641ba1d0 xen/arch/x86/acpi/power.c
--- a/xen/arch/x86/acpi/power.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/arch/x86/acpi/power.c Mon Aug 31 10:09:12 2009 +0100
@@ -32,7 +32,7 @@
uint32_t system_reset_counter = 1;
-static char opt_acpi_sleep[20];
+static char __initdata opt_acpi_sleep[20];
string_param("acpi_sleep", opt_acpi_sleep);
static u8 sleep_states[ACPI_S_STATE_COUNT];
diff -r 030fb43b848a -r cf95641ba1d0 xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/arch/x86/domain_build.c Mon Aug 31 10:09:12 2009 +0100
@@ -101,10 +101,10 @@ struct vcpu *__init alloc_dom0_vcpu0(voi
return alloc_vcpu(dom0, 0, 0);
}
-static unsigned int opt_dom0_shadow;
+static unsigned int __initdata opt_dom0_shadow;
boolean_param("dom0_shadow", opt_dom0_shadow);
-static char opt_dom0_ioports_disable[200] = "";
+static char __initdata opt_dom0_ioports_disable[200] = "";
string_param("dom0_ioports_disable", opt_dom0_ioports_disable);
#if defined(__i386__)
diff -r 030fb43b848a -r cf95641ba1d0 xen/common/gdbstub.c
--- a/xen/common/gdbstub.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/common/gdbstub.c Mon Aug 31 10:09:12 2009 +0100
@@ -65,7 +65,7 @@ static void gdb_smp_pause(void);
static void gdb_smp_pause(void);
static void gdb_smp_resume(void);
-static char opt_gdb[30];
+static char __initdata opt_gdb[30];
string_param("gdb", opt_gdb);
static void gdbstub_console_puts(const char *str);
diff -r 030fb43b848a -r cf95641ba1d0 xen/common/page_alloc.c
--- a/xen/common/page_alloc.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/common/page_alloc.c Mon Aug 31 10:09:12 2009 +0100
@@ -45,7 +45,7 @@
* Comma-separated list of hexadecimal page numbers containing bad bytes.
* e.g. 'badpage=0x3f45,0x8a321'.
*/
-static char opt_badpage[100] = "";
+static char __initdata opt_badpage[100] = "";
string_param("badpage", opt_badpage);
/*
diff -r 030fb43b848a -r cf95641ba1d0 xen/common/schedule.c
--- a/xen/common/schedule.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/common/schedule.c Mon Aug 31 10:09:12 2009 +0100
@@ -35,7 +35,7 @@
#include <xsm/xsm.h>
/* opt_sched: scheduler - default to credit */
-static char opt_sched[10] = "credit";
+static char __initdata opt_sched[10] = "credit";
string_param("sched", opt_sched);
/* if sched_smt_power_savings is set,
diff -r 030fb43b848a -r cf95641ba1d0 xen/drivers/char/console.c
--- a/xen/drivers/char/console.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/drivers/char/console.c Mon Aug 31 10:09:12 2009 +0100
@@ -36,7 +36,7 @@
#include <public/sysctl.h>
/* console: comma-separated list of console outputs. */
-static char opt_console[30] = OPT_CONSOLE_STR;
+static char __initdata opt_console[30] = OPT_CONSOLE_STR;
string_param("console", opt_console);
/* conswitch: a character pair controlling console switching. */
@@ -676,7 +676,7 @@ void __init console_endboot(void)
switch_serial_input();
}
-int console_has(const char *device)
+int __init console_has(const char *device)
{
char *p;
diff -r 030fb43b848a -r cf95641ba1d0 xen/drivers/char/ns16550.c
--- a/xen/drivers/char/ns16550.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/drivers/char/ns16550.c Mon Aug 31 10:09:12 2009 +0100
@@ -25,7 +25,8 @@
* can be specified in place of a numeric baud rate. Polled mode is specified
* by requesting irq 0.
*/
-static char opt_com1[30] = "", opt_com2[30] = "";
+static char __initdata opt_com1[30] = "";
+static char __initdata opt_com2[30] = "";
string_param("com1", opt_com1);
string_param("com2", opt_com2);
diff -r 030fb43b848a -r cf95641ba1d0 xen/drivers/video/vga.c
--- a/xen/drivers/video/vga.c Mon Aug 31 10:08:38 2009 +0100
+++ b/xen/drivers/video/vga.c Mon Aug 31 10:09:12 2009 +0100
@@ -48,7 +48,7 @@ void (*vga_puts)(const char *) = vga_noo
* after domain 0 starts to boot. The default behaviour is to relinquish
* control of the console to domain 0.
*/
-static char opt_vga[30] = "";
+static char __initdata opt_vga[30] = "";
string_param("vga", opt_vga);
/* VGA text-mode definitions. */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home