Merge branch 'linus' into cpumask-for-linus
Ingo Molnar [Mon, 30 Mar 2009 21:53:32 +0000 (23:53 +0200)]
Conflicts:
arch/x86/kernel/cpu/common.c

12 files changed:
1  2 
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/process.c
arch/x86/kernel/tlb_uv.c
kernel/sched.c
mm/vmscan.c

Simple merge
  #include <asm/uv/uv.h>
  #endif
  
- #include <asm/pgtable.h>
- #include <asm/processor.h>
- #include <asm/desc.h>
- #include <asm/atomic.h>
- #include <asm/proto.h>
- #include <asm/sections.h>
- #include <asm/setup.h>
- #include <asm/hypervisor.h>
- #include <asm/stackprotector.h>
  #include "cpu.h"
  
 -#ifdef CONFIG_X86_64
 -
  /* all of these masks are initialized in setup_cpu_local_masks() */
- cpumask_var_t cpu_callin_mask;
- cpumask_var_t cpu_callout_mask;
  cpumask_var_t cpu_initialized_mask;
+ cpumask_var_t cpu_callout_mask;
+ cpumask_var_t cpu_callin_mask;
  
  /* representing cpus for which sibling maps can be computed */
  cpumask_var_t cpu_sibling_setup_mask;
@@@ -58,7 -60,17 +58,7 @@@ void __init setup_cpu_local_masks(void
        alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);
  }
  
- static struct cpu_dev *this_cpu __cpuinitdata;
 -#else /* CONFIG_X86_32 */
 -
 -cpumask_t cpu_sibling_setup_map;
 -cpumask_t cpu_callout_map;
 -cpumask_t cpu_initialized;
 -cpumask_t cpu_callin_map;
 -
 -#endif /* CONFIG_X86_32 */
 -
 -
+ static const struct cpu_dev *this_cpu __cpuinitdata;
  
  DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
  #ifdef CONFIG_X86_64
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc mm/vmscan.c
Simple merge