[PATCH] [2.6.24] Add PPC nvram ioctls to compat_ioctl
From: Olof Johansson <hidden>
Date: 2007-12-31 22:37:59
Also in:
lkml
Subsystem:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
Fix the following console warning when running 'nvsetenv', and makes
setting of new variables work again:
ioctl32(nvsetenv:4022): Unknown cmd fd(3) cmd(20007043){t:'p';sz:0}
arg(00000003) on /dev/nvram
That's the IOC_NVRAM_SYNC call.
Signed-off-by: Olof Johansson <redacted>
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index e8b7c3a..7be6765 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c@@ -113,6 +113,10 @@ #include <asm/fbio.h> #endif +#ifdef CONFIG_PPC +#include <asm/nvram.h> +#endif + static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *f) {
@@ -2859,6 +2863,13 @@ IGNORE_IOCTL(FBIOGETCMAP32) IGNORE_IOCTL(FBIOSCURSOR32) IGNORE_IOCTL(FBIOGCURSOR32) #endif + +#ifdef CONFIG_PPC +/* PPC-specific NVRAM IOCTLs */ +COMPATIBLE_IOCTL(OBSOLETE_PMAC_NVRAM_GET_OFFSET) +COMPATIBLE_IOCTL(IOC_NVRAM_GET_OFFSET) +COMPATIBLE_IOCTL(IOC_NVRAM_SYNC) +#endif }; #define IOCTL_HASHSIZE 256