diff options
| author | Keir Fraser <keir@xen.org> | 2013-01-30 03:04:42 -0800 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2013-01-30 03:04:42 -0800 |
| commit | d0eed336e521522ee28b21fe350fa162ad1199d6 (patch) | |
| tree | a698cb0e5fc7e8b0a33494bdcd93129f32ddd5ec /xen/drivers/char | |
| parent | 3b8e11e853bfa79e220bfcdcdea5047ad22b35e1 (diff) | |
| download | xen-d0eed336e521522ee28b21fe350fa162ad1199d6.tar.gz xen-d0eed336e521522ee28b21fe350fa162ad1199d6.tar.bz2 xen-d0eed336e521522ee28b21fe350fa162ad1199d6.zip | |
xen: Fix some over-long source lines.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/drivers/char')
| -rw-r--r-- | xen/drivers/char/console.c | 13 |
1 files changed, 8 insertions, 5 deletions
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--; |