[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>
This commit is contained in:

committed by
Paul Mackerras

parent
f749edae5e
commit
1269277a5e
@@ -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"))
|
||||
|
Reference in New Issue
Block a user