The patch titled
mm: k8_northbridges[] build fix
has been added to the -mm tree. Its filename is
x86-conform-l3-cache-index-disable-to-linux-standards-build-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm: k8_northbridges[] build fix
From: William Irwin <wli@xxxxxxxxxxxxxxxxx>
k8_northbridges[] isn't a defined symbol unless arch/x86/kernel/k8.c is
compiled, which is conditional on CONFIG_K8_NB. This patch resolves
the link error by making the sysfs access to the k8 northbridge
conditional on CONFIG_K8_NB in like fashion to the k8_northbridges[]
array itself. The issue was encountered on a 32-bit build with the
processor family specified as CONFIG_MCORE2=y.
The link error was introduced in
x86-conform-l3-cache-index-disable-to-linux-standards.patch
Signed-off-by: William Irwin <wli@xxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Eric Lammerts <eric@xxxxxxxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/intel_cacheinfo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/x86/kernel/cpu/intel_cacheinfo.c~x86-conform-l3-cache-index-disable-to-linux-standards-build-fix arch/x86/kernel/cpu/intel_cacheinfo.c
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c~x86-conform-l3-cache-index-disable-to-linux-standards-build-fix
+++ a/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -613,7 +613,7 @@ static int __cpuinit detect_cache_attrib
return retval;
}
-#ifdef CONFIG_SYSFS
+#if defined(CONFIG_SYSFS) && defined(CONFIG_K8_NB)
#include <linux/kobject.h>
#include <linux/sysfs.h>
@@ -986,4 +986,4 @@ static int __cpuinit cache_sysfs_init(vo
device_initcall(cache_sysfs_init);
-#endif
+#endif /* defined(CONFIG_SYSFS) && defined(CONFIG_K8_NB) */
_
Patches currently in -mm which might be from wli@xxxxxxxxxxxxxxxxx are
x86-conform-l3-cache-index-disable-to-linux-standards-build-fix.patch
epoll-keyed-wakeups-v2-add-__wake_up_locked_key-and-__wake_up_sync_key.patch
epoll-keyed-wakeups-v2-introduce-new-_poll-wakeup-macros.patch
epoll-keyed-wakeups-v2-make-sockets-use-keyed-wakeups.patch
epoll-keyed-wakeups-v2-teach-epoll-about-hints-coming-with-the-wakeup-key.patch
epoll-keyed-wakeups-v2-teach-epoll-about-hints-coming-with-the-wakeup-key-update.patch
epoll-keyed-wakeups-v2-make-eventfd-use-keyed-wakeups.patch
epoll-keyed-wakeups-v2-make-tty-use-keyed-wakeups.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
