linux-kernel - linux-next: manual merge of the tip tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140312221828.da7bffd214e9749a5652ff22@kernel.org>
Date:	Wed, 12 Mar 2014 22:18:28 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Bjorn Helgaas <bhelgaas@...gle.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the tip tree with the pci tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in arch/x86/include/asm/topology.h between commit 25453e9e521382 ("x86/PCI: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node()") from the pci tree and commit 36fc5500bb1907bea7e ("sched: Remove unused mc_capable() and smt_capable()") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).


diff --cc arch/x86/include/asm/topology.h
index c840571afa4e,9bcc724cafdd..000000000000
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@@ -131,13 -131,19 +131,7 @@@ static inline void arch_fix_phys_packag
  }
  
  struct pci_bus;
 +int x86_pci_root_bus_node(int bus);
  void x86_pci_root_bus_resources(int bus, struct list_head *resources);
  
- #ifdef CONFIG_SMP
- #define mc_capable()  ((boot_cpu_data.x86_max_cores > 1) && \
-                       (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids))
- #define smt_capable()                 (smp_num_siblings > 1)
 -#ifdef CONFIG_NUMA
 -extern int get_mp_bus_to_node(int busnum);
 -extern void set_mp_bus_to_node(int busnum, int node);
 -#else
 -static inline int get_mp_bus_to_node(int busnum)
 -{
 -      return 0;
 -}
 -static inline void set_mp_bus_to_node(int busnum, int node)
 -{
 -}
--#endif
--
  #endif /* _ASM_X86_TOPOLOGY_H */

Content of type "application/pgp-signature" skipped