Subject: linux-next: manual merge of the sfi tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 3 Sep 2009 19:34:44 +1000

Hi all,

Today's linux-next merge of the sfi tree got a conflict in
arch/x86/kernel/setup.c between commit
b3f1b617f49447df6c3f5fac9c225aaea8b724ea ("x86: Move get/find_smp_config
to x86_init_ops") from the tip tree and commit
efafc8b213e67ed148a5b53ade29ee7b48af907d ("x86: add arch-specific SFI
support") from the sfi tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/x86/kernel/setup.c
index a55f660,d784ea2..0000000
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -984,7 -990,10 +985,9 @@@ void __init setup_arch(char **cmdline_p
  	 * Read APIC and some other early information from ACPI tables.
  	 */
  	acpi_boot_init();
+ 
+ 	sfi_init();
  
 -#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
  	/*
  	 * get boot-time SMP configuration:
  	 */