admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	drivers/macintosh/adbhid.c
This commit is contained in:
Dmitry Torokhov
2007-10-12 21:27:47 -04:00
parent b11d2127c4 2b9e0aae1d
commit b981d8b3f5
7628 changed files with 537075 additions and 239356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/evdev.c
View File

@@ -312,7 +312,7 @@ struct input_event_compat {
#elif defined(CONFIG_S390)
# define COMPAT_TEST test_thread_flag(TIF_31BIT)
#elif defined(CONFIG_MIPS)
# define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR)
# define COMPAT_TEST test_thread_flag(TIF_32BIT_ADDR)
#else
# define COMPAT_TEST test_thread_flag(TIF_32BIT)
#endif