ia64/xen-unstable

changeset 15765:9341dd055619

[IA64] Remove unused var opt_xenheap_megabytes

x86 and ppc use opt_xenheap_megabytes; ia64 doesn't so remove it. Also clean
up some comments; add some __init and __initdata where appropriate

Signed-off-by: Aron Griffis <aron@hp.com>
author Alex Williamson <alex.williamson@hp.com>
date Tue Aug 28 12:27:39 2007 -0600 (2007-08-28)
parents f88eea67a469
children 3cd445aecf59
files xen/arch/ia64/xen/xensetup.c
line diff
     1.1 --- a/xen/arch/ia64/xen/xensetup.c	Tue Aug 28 12:25:37 2007 -0600
     1.2 +++ b/xen/arch/ia64/xen/xensetup.c	Tue Aug 28 12:27:39 2007 -0600
     1.3 @@ -52,35 +52,24 @@ extern void init_IRQ(void);
     1.4  extern void trap_init(void);
     1.5  extern void xen_patch_kernel(void);
     1.6  
     1.7 -/* opt_nosmp: If true, secondary processors are ignored. */
     1.8 -static int opt_nosmp;
     1.9 +/* nosmp: ignore secondary processors */
    1.10 +static int __initdata opt_nosmp;
    1.11  boolean_param("nosmp", opt_nosmp);
    1.12  
    1.13 -/* maxcpus: maximum number of CPUs to activate. */
    1.14 +/* maxcpus: maximum number of CPUs to activate */
    1.15  static unsigned int __initdata max_cpus = NR_CPUS;
    1.16  integer_param("maxcpus", max_cpus); 
    1.17  
    1.18 -/* xencons: if true enable xenconsole input (and irq).
    1.19 +/* xencons: toggle xenconsole input (and irq).
    1.20     Note: you have to disable 8250 serials in domains (to avoid use of the
    1.21     same resource).  */
    1.22  static int __initdata opt_xencons = 1;
    1.23  integer_param("xencons", opt_xencons);
    1.24  
    1.25 -/* Toggle to allow non-legacy xencons UARTs to run in polling mode */
    1.26 +/* xencons_poll: toggle non-legacy xencons UARTs to run in polling mode */
    1.27  static int __initdata opt_xencons_poll;
    1.28  boolean_param("xencons_poll", opt_xencons_poll);
    1.29  
    1.30 -/*
    1.31 - * opt_xenheap_megabytes: Size of Xen heap in megabytes, including:
    1.32 - *	xen image
    1.33 - *	bootmap bits
    1.34 - *	xen heap
    1.35 - * Note: To allow xenheap size configurable, the prerequisite is
    1.36 - * to configure elilo allowing relocation defaultly. Then since
    1.37 - * elilo chooses 256M as alignment when relocating, alignment issue
    1.38 - * on IPF can be addressed.
    1.39 - */
    1.40 -unsigned int opt_xenheap_megabytes = XENHEAP_DEFAULT_MB;
    1.41  unsigned long xenheap_size = XENHEAP_DEFAULT_SIZE;
    1.42  unsigned long xen_pstart;
    1.43  void *xen_pickle_offset __read_mostly;
    1.44 @@ -105,7 +94,7 @@ static void __init do_initcalls(void)
    1.45  }
    1.46  
    1.47  /*
    1.48 - * IPF loader only supports one commaind line currently, for
    1.49 + * IPF loader only supports one command line currently, for
    1.50   * both xen and guest kernel. This function provides pre-parse
    1.51   * to mixed command line, to split it into two parts.
    1.52   *
    1.53 @@ -196,7 +185,7 @@ efi_print(void)
    1.54   * These functions are utility functions for getting and
    1.55   * testing memory descriptors for allocating the xenheap area.
    1.56   */
    1.57 -static efi_memory_desc_t *
    1.58 +static efi_memory_desc_t * __init
    1.59  efi_get_md (unsigned long phys_addr)
    1.60  {
    1.61      void *efi_map_start, *efi_map_end, *p;
    1.62 @@ -215,7 +204,7 @@ efi_get_md (unsigned long phys_addr)
    1.63      return 0;
    1.64  }
    1.65  
    1.66 -static int
    1.67 +static int __init
    1.68  is_xenheap_usable_memory(efi_memory_desc_t *md)
    1.69  {
    1.70      if (!(md->attribute & EFI_MEMORY_WB))
    1.71 @@ -232,7 +221,7 @@ is_xenheap_usable_memory(efi_memory_desc
    1.72      return 0;
    1.73  }
    1.74  
    1.75 -static inline int
    1.76 +static inline int __init
    1.77  md_overlaps(efi_memory_desc_t *md, unsigned long phys_addr)
    1.78  {
    1.79      return (phys_addr - md->phys_addr < (md->num_pages << EFI_PAGE_SHIFT));