xen: Fix some over-long source lines.

Signed-off-by: Keir Fraser <keir@xen.org>

4 files changed, 14 insertions, 8 deletions

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index b99dd1a5fd..d251aa1401 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -1042,7 +1042,7 @@ __next:
  *****************************************************************************/
 
 /* used for system time scaling */
-static u32 __read_mostly bus_scale; /* scaling factor convert ns to bus cycles */
+static u32 __read_mostly bus_scale; /* scaling factor: ns -> bus cycles */
 
 /*
  * The timer chip is already set up at HZ interrupts per second here,
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index e06ada1a70..2b9dbe3e88 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -94,7 +94,8 @@ char __attribute__ ((__section__(".bss.stack_aligned"))) cpu0_stack[STACK_SIZE];
 
 struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 };
 
-unsigned long __read_mostly mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE;
+unsigned long __read_mostly mmu_cr4_features =
+    X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE;
 
 bool_t __initdata acpi_disabled;
 bool_t __initdata acpi_force;
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index ff15417a2b..4331386c69 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -219,7 +219,9 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs)
     }
 }
 
-static struct irqaction __read_mostly irq0 = { timer_interrupt, "timer", NULL };
+static struct irqaction __read_mostly irq0 = {
+    timer_interrupt, "timer", NULL
+};
 
 /* ------ Calibrate the TSC ------- 
  * Return processor ticks per second / CALIBRATE_FRAC.
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 1908790df2..8d081c3d7b 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -98,8 +98,10 @@ static DEFINE_SPINLOCK(console_lock);
 
 static int __read_mostly xenlog_upper_thresh = XENLOG_UPPER_THRESHOLD;
 static int __read_mostly xenlog_lower_thresh = XENLOG_LOWER_THRESHOLD;
-static int __read_mostly xenlog_guest_upper_thresh = XENLOG_GUEST_UPPER_THRESHOLD;
-static int __read_mostly xenlog_guest_lower_thresh = XENLOG_GUEST_LOWER_THRESHOLD;
+static int __read_mostly xenlog_guest_upper_thresh =
+    XENLOG_GUEST_UPPER_THRESHOLD;
+static int __read_mostly xenlog_guest_lower_thresh =
+    XENLOG_GUEST_LOWER_THRESHOLD;
 
 static void parse_loglvl(char *s);
 static void parse_guest_loglvl(char *s);
@@ -309,7 +311,7 @@ static struct keyhandler dump_console_ring_keyhandler = {
 
 /* CTRL-<switch_char> switches input direction between Xen and DOM0. */
 #define switch_code (opt_conswitch[0]-'a'+1)
-static int __read_mostly xen_rx = 1; /* FALSE => serial input passed to domain 0. */
+static int __read_mostly xen_rx = 1; /* FALSE => input passed to domain 0. */
 
 static void switch_serial_input(void)
 {
@@ -625,7 +627,7 @@ void __init console_init_preirq(void)
 void __init console_init_postirq(void)
 {
     char *ring;
-    unsigned int i, order;
+    unsigned int i, order, memflags;
 
     serial_init_postirq();
 
@@ -633,7 +635,8 @@ void __init console_init_postirq(void)
         opt_conring_size = num_present_cpus() << (9 + xenlog_lower_thresh);
 
     order = get_order_from_bytes(max(opt_conring_size, conring_size));
-    while ( (ring = alloc_xenheap_pages(order, MEMF_bits(crashinfo_maxaddr_bits))) == NULL )
+    memflags = MEMF_bits(crashinfo_maxaddr_bits);
+    while ( (ring = alloc_xenheap_pages(order, memflags)) == NULL )
     {
         BUG_ON(order == 0);
         order--;