This patch is against 2.5.71, and brings x86_64 into line with the new sysfs API.