diff options
author | Peter Volkov <pva@gentoo.org> | 2010-03-05 13:37:58 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2010-03-05 13:37:58 +0000 |
commit | 4b11099480b360bad500e2dc9c2672641873d8c2 (patch) | |
tree | 2cc1cda7ef45892d390ab353978e5d20341cd05e /sys-kernel/openvz-sources/files | |
parent | Non-maintainer commit: Version bumps for security bugs 307811, 300199, 238571. (diff) | |
download | gentoo-2-4b11099480b360bad500e2dc9c2672641873d8c2.tar.gz gentoo-2-4b11099480b360bad500e2dc9c2672641873d8c2.tar.bz2 gentoo-2-4b11099480b360bad500e2dc9c2672641873d8c2.zip |
Fixed quite common build issue, thank Jeff Mitchell for report.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/openvz-sources/files')
-rw-r--r-- | sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.068.3-build-fix.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.068.3-build-fix.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.068.3-build-fix.patch new file mode 100644 index 000000000000..ce1e7305f4ad --- /dev/null +++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.068.3-build-fix.patch @@ -0,0 +1,24 @@ +x86,amd_detect_cmp: Dont forget to retrieve cpu number + +In non-NUMA case we have to retrieve cpu number in a sake +of HT compatibility. + +Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> +--- + arch/x86_64/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: linux-2.6.18-ovz/arch/x86_64/kernel/setup.c +===================================================================== +--- linux-2.6.18-ovz.orig/arch/x86_64/kernel/setup.c ++++ linux-2.6.18-ovz/arch/x86_64/kernel/setup.c +@@ -857,8 +857,8 @@ static void __init amd_detect_cmp(struct + { + #ifdef CONFIG_SMP + unsigned bits; +-#ifdef CONFIG_NUMA + int cpu = smp_processor_id(); ++#ifdef CONFIG_NUMA + int node = 0; + unsigned apicid = hard_smp_processor_id(); + #endif |