Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · c0f4d6d4b1 - Gogs

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: prevent stale state of c1e_mask across CPU offline/online, fix

Linus Torvalds 17 years ago

parent

1126388609 1eda81495a

commit

c0f4d6d4b1

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/x86/kernel/process_32.c
							 
								View File
							
				@@ -55,6 +55,7 @@
			
				 #include <asm/tlbflush.h>
			
				 #include <asm/cpu.h>
			
				 #include <asm/kdebug.h>
			
				+#include <asm/idle.h>
			
				 asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");