lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/urgent' into x86/pat

Browse Source 
Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

	 arch/x86/mm/pat.c
	 arch/x86/mm/ioremap.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin
2009-08-26 17:17:51 -07:00
parent d886c73cd4 3e0e1e9c5a
commit b855192c08
1990 changed files with 49510 additions and 28185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/smp.c
View File

@@ -57,7 +57,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_BAD;
break;
#ifdef CONFIG_CPU_HOTPLUG
#ifdef CONFIG_HOTPLUG_CPU
case CPU_UP_CANCELED:
case CPU_UP_CANCELED_FROZEN: