2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Henrique de Moraes Holschuh <[email protected]> [ upstream commit fc6e756894b703952fd277a1f98a5d93e7ba847a ] Change the code so that it will use the correct size for keymap entries. Do it in a way that makes it harder to screw it up in the future. Reported-by: Jaime Velasco Juan <[email protected]> Signed-off-by: Henrique de Moraes Holschuh <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- drivers/platform/x86/thinkpad_acpi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: linux-2.6.35.y/drivers/platform/x86/thinkpad_acpi.c =================================================================== --- linux-2.6.35.y.orig/drivers/platform/x86/thinkpad_acpi.c 2011-03-29 23:02:58.202346167 -0700 +++ linux-2.6.35.y/drivers/platform/x86/thinkpad_acpi.c 2011-03-29 23:02:58.223345630 -0700 @@ -3093,7 +3093,8 @@ TPACPI_Q_IBM('1', 'D', TPACPI_HK_Q_INIMASK), /* X22, X23, X24 */ }; -typedef u16 tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN]; +typedef u16 tpacpi_keymap_entry_t; +typedef tpacpi_keymap_entry_t tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN]; static int __init hotkey_init(struct ibm_init_struct *iibm) { @@ -3230,7 +3231,7 @@ }; #define TPACPI_HOTKEY_MAP_SIZE sizeof(tpacpi_keymap_t) -#define TPACPI_HOTKEY_MAP_TYPESIZE sizeof(tpacpi_keymap_t[0]) +#define TPACPI_HOTKEY_MAP_TYPESIZE sizeof(tpacpi_keymap_entry_t) int res, i; int status; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
