Yep, the attached patch fixes NFS on both x86 and x86-64.