Sony Vaio SZ3XVP

I've been glad to see the recent activity on Vaio support, as I have an SZ3XVP with Fedora 6 x86_64 installed. It seems the sonypi module is disabled as it "doesn't work in 64-bit" (according to a bug report I've seen).

Which module is expected to work with this module - sonypi or sony_acpi? Is it true that sonypi needs to be cleaned up for 64-bit installations? I'm quite happy to test, though I was initially unsure which patches in the -mm kernel tree to apply.

Adam