commit 67e26e41 upstream.

Extends the fix in f2f9a2cb to also
workaround permission issues noticed by people using AGP systems.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>