linux-next: manual merge of the rr tree with the cpus4096 tree

linux-next: manual merge of the rr tree with the cpus4096 tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got conflicts in
arch/x86/include/asm/topology.h between commits
23c5c9c66263311de1295b42382e5bc1e7c36c47 ("cpumask: remove
cpu_coregroup_map: x86") and 4f0628963c86d2f97b8cb9acc024a7fe288a6a57
("cpumask: use new cpumask functions throughout x86") from the cpus4096
tree and commit 673089d95b0414f80ccf1bbf3fe9280653a47d07
("cpumask:remove-node_to_first_cpu") from the rr tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/x86/include/asm/topology.h
index e3f4198,a1315a9..0000000
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@@ -157,44 -192,33 +157,32 @@@ extern int __node_distance(int, int)
  
  #else /* !CONFIG_NUMA */
  
 -#define numa_node_id()		0
 -#define	cpu_to_node(cpu)	0
 -#define	early_cpu_to_node(cpu)	0
 +static inline int numa_node_id(void)
 +{
 +	return 0;
 +}
 +
 +static inline int cpu_to_node(int cpu)
 +{
 +	return 0;
 +}
  
 -static inline const cpumask_t *cpumask_of_node(int node)
 +static inline int early_cpu_to_node(int cpu)
  {
 -	return &cpu_online_map;
 +	return 0;
  }
 -static inline cpumask_t node_to_cpumask(int node)
 +
 +static inline const struct cpumask *cpumask_of_node(int node)
  {
 -	return cpu_online_map;
 +	return cpu_online_mask;
  }
- static inline int node_to_first_cpu(int node)
- {
- 	return cpumask_first(cpu_online_mask);
- }
  
 -/*
 - * Replace default node_to_cpumask_ptr with optimized version
 - * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
 - */
 -#define node_to_cpumask_ptr(v, node)		\
 -		const cpumask_t *v = cpumask_of_node(node)
 +static inline void setup_node_to_cpumask_map(void) { }
  
 -#define node_to_cpumask_ptr_next(v, node)	\
 -			   v = cpumask_of_node(node)
  #endif
  
  #include <asm-generic/topology.h>
  
- #ifdef CONFIG_NUMA
- /* Returns the number of the first CPU on Node 'node'. */
- static inline int node_to_first_cpu(int node)
- {
- 	return cpumask_first(cpumask_of_node(node));
- }
- #endif
- 
 -extern cpumask_t cpu_coregroup_map(int cpu);
  extern const struct cpumask *cpu_coregroup_mask(int cpu);
  
  #ifdef ENABLE_TOPO_DEFINES

linux-next: manual merge of the rr tree with the cpus4096 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
drivers/oprofile/buffer_sync.c between commit
4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 ("cpumask: modifiy oprofile
initialization") from the cpus4096 tree and commit
d6d66104b6a06bc0bb541ac59aff59fad46ad466 ("oprofile: Thou shalt not call
__exit functions from __init functions") from the rr tree.

The former just removed the code that the latter was modifying, so I used
the former version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the rr tree with the cpus4096 tree

[Robert Richter]

On 31.03.09 13:39:53, Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> drivers/oprofile/buffer_sync.c between commit
> 4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 ("cpumask: modifiy oprofile
> initialization") from the cpus4096 tree and commit
> d6d66104b6a06bc0bb541ac59aff59fad46ad466 ("oprofile: Thou shalt not call
> __exit functions from __init functions") from the rr tree.
> 
> The former just removed the code that the latter was modifying, so I used
> the former version.

Rusty,

please revert d6d66104b6a06bc0bb541ac59aff59fad46ad466. The
tip/cpus4096 branch has been pulled incompletely. Patch
4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 fixes the section mismatch.

Ingo,

will you send a pull request for tip/cpus4096? Otherwise the patch
should be added to the urgent branch or so.

Thanks,

-Robert

-- 
Advanced Micro Devices, Inc.
Operating System Research Center
email: robert.richter@amd.com

Re: linux-next: manual merge of the rr tree with the cpus4096 tree

[Ingo Molnar]

* Robert Richter <robert.richter@amd.com> wrote:

> On 31.03.09 13:39:53, Stephen Rothwell wrote:
> > Hi Rusty,
> > 
> > Today's linux-next merge of the rr tree got a conflict in
> > drivers/oprofile/buffer_sync.c between commit
> > 4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 ("cpumask: modifiy oprofile
> > initialization") from the cpus4096 tree and commit
> > d6d66104b6a06bc0bb541ac59aff59fad46ad466 ("oprofile: Thou shalt not call
> > __exit functions from __init functions") from the rr tree.
> > 
> > The former just removed the code that the latter was modifying, so I used
> > the former version.
> 
> Rusty,
> 
> please revert d6d66104b6a06bc0bb541ac59aff59fad46ad466. The
> tip/cpus4096 branch has been pulled incompletely. Patch
> 4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 fixes the section mismatch.
> 
> Ingo,
> 
> will you send a pull request for tip/cpus4096? Otherwise the patch
> should be added to the urgent branch or so.

It's going via Rusty this cycle - the main cpumask magician! :-)

	Ingo