The patch titled
Fix compilation of mm/hugetlb.c when !CONFIG_SYS
has been removed from the -mm tree. Its filename was
hugetlb-new-sysfs-interface-fix.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Fix compilation of mm/hugetlb.c when !CONFIG_SYS
From: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
Building without CONFIG_SYS yields:
mm/hugetlb.c: In function 'hugetlb_exit':
mm/hugetlb.c:1234: error: 'hstate_kobjs' undeclared (first use in this function)
mm/hugetlb.c:1234: error: (Each undeclared identifier is reported only once
mm/hugetlb.c:1234: error: for each function it appears in.)
mm/hugetlb.c:1237: error: 'hugepages_kobj' undeclared (first use in this function)
The declaration of hstate_kobjs is guarded by CONFIG_SYS so likewise
guard the _exit function.
Signed-off-by: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
Cc: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/hugetlb.c~hugetlb-new-sysfs-interface-fix mm/hugetlb.c
--- a/mm/hugetlb.c~hugetlb-new-sysfs-interface-fix
+++ a/mm/hugetlb.c
@@ -1130,6 +1130,7 @@ static int __init hugetlb_init(void)
}
module_init(hugetlb_init);
+#ifdef CONFIG_SYSFS
static void __exit hugetlb_exit(void)
{
struct hstate *h;
@@ -1141,6 +1142,7 @@ static void __exit hugetlb_exit(void)
kobject_put(hugepages_kobj);
}
module_exit(hugetlb_exit);
+#endif
/* Should be called on processing a hugepagesz=... option */
void __init hugetlb_add_hstate(unsigned order)
_
Patches currently in -mm which might be from tony@xxxxxxxxxxxxxxxxxx are
hugetlb-new-sysfs-interface-fix.patch
drivers-video-aty-radeon_basec-notify-user-if-sysfs_create_bin_file-failed.patch
drivers-video-aty-radeon_basec-notify-user-if-sysfs_create_bin_file-failed-checkpatch-fixes.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
