Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix build breakage
+4
arch/ia64/kernel/smpboot.c
+4
arch/ia64/kernel/smpboot.c
···
390
391
fix_b0_for_bsp();
392
393
/*
394
* numa_node_id() works after this.
395
*/
396
set_numa_node(cpu_to_node_map[cpuid]);
397
set_numa_mem(local_memory_node(cpu_to_node_map[cpuid]));
398
399
ipi_call_lock_irq();
400
spin_lock(&vector_lock);
···
640
{
641
cpu_set(smp_processor_id(), cpu_online_map);
642
cpu_set(smp_processor_id(), cpu_callin_map);
643
set_numa_node(cpu_to_node_map[smp_processor_id()]);
644
per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
645
paravirt_post_smp_prepare_boot_cpu();
646
}
···
390
391
fix_b0_for_bsp();
392
393
+
#ifdef CONFIG_NUMA
394
/*
395
* numa_node_id() works after this.
396
*/
397
set_numa_node(cpu_to_node_map[cpuid]);
398
set_numa_mem(local_memory_node(cpu_to_node_map[cpuid]));
399
+
#endif
400
401
ipi_call_lock_irq();
402
spin_lock(&vector_lock);
···
638
{
639
cpu_set(smp_processor_id(), cpu_online_map);
640
cpu_set(smp_processor_id(), cpu_callin_map);
641
+
#ifdef CONFIG_NUMA
642
set_numa_node(cpu_to_node_map[smp_processor_id()]);
643
+
#endif
644
per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
645
paravirt_post_smp_prepare_boot_cpu();
646
}
+17
arch/ia64/mm/numa.c
+17
arch/ia64/mm/numa.c
···
17
#include <linux/init.h>
18
#include <linux/bootmem.h>
19
#include <linux/module.h>
20
#include <asm/mmzone.h>
21
#include <asm/numa.h>
22
···
50
51
return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
52
}
53
54
#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
55
/*
···
17
#include <linux/init.h>
18
#include <linux/bootmem.h>
19
#include <linux/module.h>
20
+
#include <linux/random.h>
21
#include <asm/mmzone.h>
22
#include <asm/numa.h>
23
···
49
50
return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
51
}
52
+
53
+
/*
54
+
* Return the bit number of a random bit set in the nodemask.
55
+
* (returns -1 if nodemask is empty)
56
+
*/
57
+
int __node_random(const nodemask_t *maskp)
58
+
{
59
+
int w, bit = -1;
60
+
61
+
w = nodes_weight(*maskp);
62
+
if (w)
63
+
bit = bitmap_ord_to_pos(maskp->bits,
64
+
get_random_int() % w, MAX_NUMNODES);
65
+
return bit;
66
+
}
67
+
EXPORT_SYMBOL(__node_random);
68
69
#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
70
/*