diff options
| author | Zwane Mwaikambo <zwane@infradead.org> | 2007-02-05 16:45:06 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-03-09 10:50:29 -0800 |
| commit | 327da22cbc18e6c5b7e2cab04aa6315b59cbd0fa (patch) | |
| tree | 1a487111e2bb279ab020974898cf21e2085866ab /arch/i386/kernel | |
| parent | 3f2464089071468e293df838c4bcec24c920f28a (diff) | |
Fix MTRR compat ioctl
The MTRR compat code wasn't calling the lowlevel MTRR setup due to a switch
block not handling the compat case.
Before:
(WW) I810(0): Failed to set up write-combining range (0xd0000000,0x10000000)
After:
reg00: base=0x00000000 ( 0MB), size=1024MB: write-back, count=1
reg01: base=0x40000000 (1024MB), size= 512MB: write-back, count=1
reg02: base=0x5f700000 (1527MB), size= 1MB: uncachable, count=1
reg03: base=0x5f800000 (1528MB), size= 8MB: uncachable, count=1
reg04: base=0xd0000000 (3328MB), size= 256MB: write-combining, count=1
Signed-off-by: Zwane Mwaikambo <zwane@infradead.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/cpu/mtrr/if.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/arch/i386/kernel/cpu/mtrr/if.c b/arch/i386/kernel/cpu/mtrr/if.c index 5ae1705eafa..590d99e93af 100644 --- a/arch/i386/kernel/cpu/mtrr/if.c +++ b/arch/i386/kernel/cpu/mtrr/if.c @@ -158,8 +158,9 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) struct mtrr_sentry sentry; struct mtrr_gentry gentry; void __user *arg = (void __user *) __arg; + unsigned int compat_cmd = cmd; - switch (cmd) { + switch (compat_cmd) { case MTRRIOC_ADD_ENTRY: case MTRRIOC_SET_ENTRY: case MTRRIOC_DEL_ENTRY: @@ -177,14 +178,20 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) return -EFAULT; break; #ifdef CONFIG_COMPAT - case MTRRIOC32_ADD_ENTRY: - case MTRRIOC32_SET_ENTRY: - case MTRRIOC32_DEL_ENTRY: - case MTRRIOC32_KILL_ENTRY: - case MTRRIOC32_ADD_PAGE_ENTRY: - case MTRRIOC32_SET_PAGE_ENTRY: - case MTRRIOC32_DEL_PAGE_ENTRY: - case MTRRIOC32_KILL_PAGE_ENTRY: { +#define MTRR_COMPAT_OP(op, type)\ + case MTRRIOC32_##op: \ + cmd = MTRRIOC_##op; \ + goto compat_get_##type + + MTRR_COMPAT_OP(ADD_ENTRY, sentry); + MTRR_COMPAT_OP(SET_ENTRY, sentry); + MTRR_COMPAT_OP(DEL_ENTRY, sentry); + MTRR_COMPAT_OP(KILL_ENTRY, sentry); + MTRR_COMPAT_OP(ADD_PAGE_ENTRY, sentry); + MTRR_COMPAT_OP(SET_PAGE_ENTRY, sentry); + MTRR_COMPAT_OP(DEL_PAGE_ENTRY, sentry); + MTRR_COMPAT_OP(KILL_PAGE_ENTRY, sentry); +compat_get_sentry: { struct mtrr_sentry32 __user *s32 = (struct mtrr_sentry32 __user *)__arg; err = get_user(sentry.base, &s32->base); err |= get_user(sentry.size, &s32->size); @@ -193,8 +200,9 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) return err; break; } - case MTRRIOC32_GET_ENTRY: - case MTRRIOC32_GET_PAGE_ENTRY: { + MTRR_COMPAT_OP(GET_ENTRY, gentry); + MTRR_COMPAT_OP(GET_PAGE_ENTRY, gentry); +compat_get_gentry: { struct mtrr_gentry32 __user *g32 = (struct mtrr_gentry32 __user *)__arg; err = get_user(gentry.regnum, &g32->regnum); err |= get_user(gentry.base, &g32->base); @@ -204,6 +212,7 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) return err; break; } +#undef MTRR_COMPAT_OP #endif } @@ -287,7 +296,7 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) if (err) return err; - switch(cmd) { + switch(compat_cmd) { case MTRRIOC_GET_ENTRY: case MTRRIOC_GET_PAGE_ENTRY: if (copy_to_user(arg, &gentry, sizeof gentry)) |