diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-24 23:22:17 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-28 21:04:55 +1000 |
| commit | 1269277a5e7c6d7ae1852e648a8bcdb78035e9fa (patch) | |
| tree | 77208bc4494519f6df0dc55834c6ceaac74643b6 /drivers/input/serio | |
| parent | f749edae5ebd339eaf22508572233600f717424f (diff) | |
| download | blackbird-op-linux-1269277a5e7c6d7ae1852e648a8bcdb78035e9fa.tar.gz blackbird-op-linux-1269277a5e7c6d7ae1852e648a8bcdb78035e9fa.zip | |
[PATCH] powerpc: Use check_legacy_ioport() on ppc32 too.
Some people report that we die on some Macs when we are expecting to
catch machine checks after poking at some random I/O address. I'd seen
it happen on my dual G4 with serial ports until we fixed those to use
OF, but now other users are reporting it with i8042.
This expands the use of check_legacy_ioport() to avoid that situation
even on 32-bit kernels.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h index 9a9221644250..cc21914fbc72 100644 --- a/drivers/input/serio/i8042-io.h +++ b/drivers/input/serio/i8042-io.h @@ -67,14 +67,14 @@ static inline int i8042_platform_init(void) * On some platforms touching the i8042 data register region can do really * bad things. Because of this the region is always reserved on such boxes. */ -#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64) +#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC_MERGE) if (!request_region(I8042_DATA_REG, 16, "i8042")) return -EBUSY; #endif i8042_reset = 1; -#if defined(CONFIG_PPC64) +#if defined(CONFIG_PPC_MERGE) if (check_legacy_ioport(I8042_DATA_REG)) return -EBUSY; if (!request_region(I8042_DATA_REG, 16, "i8042")) |
